Modify 166aa70

Added missing checkbox checkmark if enabled Added polling every 30s Updated dependencies Code cleanup
Plenyx · Nov 11, 2023 · 911d777 · 911d777
1 parent 166aa70
commit 911d777
Show file tree

Hide file tree

Showing 16 changed files with 890 additions and 846 deletions.
diff --git a/Aleeva/AleevaIntegration.cs b/Aleeva/AleevaIntegration.cs
@@ -64,7 +64,7 @@ internal Team Team
 
         string IListViewItemInfo<AleevaIntegration>.NameToDisplay => Name;
 
-        string IListViewItemInfo<AleevaIntegration>.TextToDisplay => ((!string.IsNullOrWhiteSpace(Name)) ? Name : (!string.IsNullOrWhiteSpace(Channel) ? $"C{Channel}" : $"S{Server}"));
+        string IListViewItemInfo<AleevaIntegration>.TextToDisplay => (!string.IsNullOrWhiteSpace(Name)) ? Name : (!string.IsNullOrWhiteSpace(Channel) ? $"C{Channel}" : $"S{Server}");
 
         bool IListViewItemInfo<AleevaIntegration>.CheckedToDisplay => Active;
 

diff --git a/Forms/FormAleevaIntegrations.cs b/Forms/FormAleevaIntegrations.cs
@@ -46,19 +46,19 @@ internal void OnAuthoriseResult(object sender, EventArgs e)
             groupBoxAleevaStatus.Enabled = toggle;
             if (groupBoxAleevaStatus.InvokeRequired)
             {
-                groupBoxAleevaStatus.Invoke((Action)(() => groupBoxAleevaStatus.Text = (toggle) ? "Status: Aleeva successfully authorised" : "Status: Not authorised"));
+                groupBoxAleevaStatus.Invoke((Action)(() => groupBoxAleevaStatus.Text = toggle ? "Status: Aleeva successfully authorised" : "Status: Not authorised"));
             }
             else
             {
-                groupBoxAleevaStatus.Text = (toggle) ? "Status: Aleeva successfully authorised" : "Status: Not authorised";
+                groupBoxAleevaStatus.Text = toggle ? "Status: Aleeva successfully authorised" : "Status: Not authorised";
             }
             if (buttonGetBearerFromAccess.InvokeRequired)
             {
-                buttonGetBearerFromAccess.Invoke((Action)(() => buttonGetBearerFromAccess.Text = (toggle) ? "Deauthorise" : "Authorise"));
+                buttonGetBearerFromAccess.Invoke((Action)(() => buttonGetBearerFromAccess.Text = toggle ? "Deauthorise" : "Authorise"));
             }
             else
             {
-                buttonGetBearerFromAccess.Text = (toggle) ? "Deauthorise" : "Authorise";
+                buttonGetBearerFromAccess.Text = toggle ? "Deauthorise" : "Authorise";
             }
             if (textBoxAccessCode.InvokeRequired)
             {

diff --git a/Forms/FormArcPluginManager.cs b/Forms/FormArcPluginManager.cs
@@ -284,7 +284,7 @@ private void CheckBoxModuleEnabled_CheckedChanged(object sender, EventArgs e)
             ApplicationSettings.Current.Save();
             groupBoxModuleControls.Enabled = toggle;
             checkedListBoxArcDpsPlugins.Enabled = toggle;
-            if (Visible && toggle && (string.IsNullOrWhiteSpace(ApplicationSettings.Current.Gw2Location)))
+            if (Visible && toggle && string.IsNullOrWhiteSpace(ApplicationSettings.Current.Gw2Location))
             {
                 ButtonChangeGW2Location_Click(this, EventArgs.Empty);
             }

diff --git a/Forms/FormDiscordWebhooks.cs b/Forms/FormDiscordWebhooks.cs
@@ -443,15 +443,15 @@ internal async Task SendLogViaWebhooks(bool success, int bossId, BossData bossDa
                 if (!webhook.Active
                     || (webhook.SuccessFailToggle.Equals(DiscordWebhookDataSuccessToggle.OnSuccessOnly) && !success)
                     || (webhook.SuccessFailToggle.Equals(DiscordWebhookDataSuccessToggle.OnFailOnly) && success)
-                    || (webhook.BossesDisable.Contains(bossId))
+                    || webhook.BossesDisable.Contains(bossId)
                     || (!webhook.AllowUnknownBossIds && (bossData is null))
                     || (!webhook.Team.IsSatisfied(players)))
                 {
                     continue;
                 }
                 try
                 {
-                    var jsonToSend = (webhook.SummaryType) switch
+                    var jsonToSend = webhook.SummaryType switch
                     {
                         DiscordWebhookDataLogSummaryType.None => jsonContentNone,
                         DiscordWebhookDataLogSummaryType.SquadOnly => jsonContentSquad,

diff --git a/Forms/FormDpsReportSettings.cs b/Forms/FormDpsReportSettings.cs
@@ -64,11 +64,11 @@ private void CheckedListBoxUserTokens_DoubleClick(object sender, EventArgs e)
             checkedListBoxUserTokens.SelectedItem = null;
         }
 
-        private void ButtonAddUserToken_Click(object sender, EventArgs e) => (new FormEditDpsReportUserToken(this, mainLink.HttpClientController)).ShowDialog();
+        private void ButtonAddUserToken_Click(object sender, EventArgs e) => new FormEditDpsReportUserToken(this, mainLink.HttpClientController).ShowDialog();
 
-        private void ToolStripMenuItemAddUserToken_Click(object sender, EventArgs e) => (new FormEditDpsReportUserToken(this, mainLink.HttpClientController)).ShowDialog();
+        private void ToolStripMenuItemAddUserToken_Click(object sender, EventArgs e) => new FormEditDpsReportUserToken(this, mainLink.HttpClientController).ShowDialog();
 
-        private void ToolStripMenuItemEditUserToken_Click(object sender, EventArgs e) => (new FormEditDpsReportUserToken(this, mainLink.HttpClientController, (ApplicationSettingsUploadUserToken)checkedListBoxUserTokens.SelectedItem)).ShowDialog();
+        private void ToolStripMenuItemEditUserToken_Click(object sender, EventArgs e) => new FormEditDpsReportUserToken(this, mainLink.HttpClientController, (ApplicationSettingsUploadUserToken)checkedListBoxUserTokens.SelectedItem).ShowDialog();
 
         private void ToolStripMenuItemDeleteUserToken_Click(object sender, EventArgs e)
         {

diff --git a/Forms/FormEditAleevaIntegration.cs b/Forms/FormEditAleevaIntegration.cs
@@ -137,7 +137,7 @@ private async Task AleevaLoadServers()
                     aleevaServers.AddRange(servers);
                 }
                 AddServersToView();
-                comboBoxServer.Text = (!string.IsNullOrWhiteSpace(selectedServer) ? aleevaServers.Find(x => x.Id.Equals(selectedServer))?.ToString() : "");
+                comboBoxServer.Text = !string.IsNullOrWhiteSpace(selectedServer) ? aleevaServers.Find(x => x.Id.Equals(selectedServer))?.ToString() : "";
                 if (!string.IsNullOrWhiteSpace(selectedServer))
                 {
                     await AleevaLoadChannels(selectedServer);
@@ -186,7 +186,7 @@ private async Task AleevaLoadChannels(string serverId)
                     aleevaServerChannels.AddRange(channels);
                 }
                 AddChannelsToView();
-                comboBoxChannel.Text = (!string.IsNullOrWhiteSpace(selectedChannel) ? aleevaServerChannels.Find(x => x.Id.Equals(selectedChannel))?.ToString() : "");
+                comboBoxChannel.Text = !string.IsNullOrWhiteSpace(selectedChannel) ? aleevaServerChannels.Find(x => x.Id.Equals(selectedChannel))?.ToString() : "";
             }
             catch (Exception ex)
             {

diff --git a/Forms/FormEditGw2Api.cs b/Forms/FormEditGw2Api.cs
@@ -89,7 +89,7 @@ private async void TimerCheckToken_Tick(object sender, EventArgs e)
             timerCheckToken.Stop();
             timerCheckToken.Enabled = false;
             using var response = await httpClientController.GetAsync($"https://api.guildwars2.com/v2/tokeninfo?access_token={textBoxAPIKeyKey.Text}");
-            labelIsTokenValid.Text = (response.IsSuccessStatusCode) ? "Token is valid." : "Token is not valid.";
+            labelIsTokenValid.Text = response.IsSuccessStatusCode ? "Token is valid." : "Token is not valid.";
         }
     }
 }
diff --git a/Forms/FormEditPing.cs b/Forms/FormEditPing.cs
@@ -22,7 +22,7 @@ internal FormEditPing(FormPings pingLink, int reservedId, bool addNew, PingConfi
             this.addNew = addNew;
             InitializeComponent();
             Icon = Properties.Resources.AppIcon;
-            Text = (addNew) ? "Add a new ping configuration" : "Edit an existing ping configuration";
+            Text = addNew ? "Add a new ping configuration" : "Edit an existing ping configuration";
             textBoxName.Text = config?.Name ?? "";
             textBoxURL.Text = config?.Url ?? "";
             textBoxAuthName.Text = config?.Authentication.AuthName ?? "Bearer";

diff --git a/Forms/FormGw2Api.cs b/Forms/FormGw2Api.cs
@@ -55,9 +55,9 @@ private void ContextMenuStripEditAPIKeys_Opening(object sender, System.Component
             toolStripMenuItemRemoveKey.Enabled = !toggle;
         }
 
-        private void ToolStripMenuItemAddKey_Click(object sender, EventArgs e) => (new FormEditGw2Api(this, null)).ShowDialog();
+        private void ToolStripMenuItemAddKey_Click(object sender, EventArgs e) => new FormEditGw2Api(this, null).ShowDialog();
 
-        private void ToolStripMenuItemEditKey_Click(object sender, EventArgs e) => (new FormEditGw2Api(this, (ApplicationSettingsGw2Api)listBoxAPIKeys.SelectedItem)).ShowDialog();
+        private void ToolStripMenuItemEditKey_Click(object sender, EventArgs e) => new FormEditGw2Api(this, (ApplicationSettingsGw2Api)listBoxAPIKeys.SelectedItem).ShowDialog();
 
         private void ToolStripMenuItemRemoveKey_Click(object sender, EventArgs e)
         {
@@ -66,7 +66,7 @@ private void ToolStripMenuItemRemoveKey_Click(object sender, EventArgs e)
             RedrawList();
         }
 
-        private void ButtonAddAPIKey_Click(object sender, EventArgs e) => (new FormEditGw2Api(this, null)).ShowDialog();
+        private void ButtonAddAPIKey_Click(object sender, EventArgs e) => new FormEditGw2Api(this, null).ShowDialog();
 
         private void ButtonGetHardStuckCode_Click(object sender, EventArgs e)
         {
@@ -131,7 +131,7 @@ private void ButtonGetHardStuckCode_Click(object sender, EventArgs e)
 
         private void ButtonBuildCodeCompressionSettings_Click(object sender, EventArgs e)
         {
-            (new FormHsBuildCodeCompressionSettings()).ShowDialog();
+            new FormHsBuildCodeCompressionSettings().ShowDialog();
         }
     }
 }