Minor refactor

Forms/FormArcPluginInfo.cs

@@ -7,6 +7,7 @@ namespace PlenBotLogUploader;
 
 public partial class FormArcPluginInfo : Form
 {
+    // fields
     private readonly ArcDpsComponentHelperClass infoItem;
 
     internal FormArcPluginInfo(ArcDpsComponentHelperClass infoItem)

Forms/FormArcPluginManager.cs

@@ -16,9 +16,9 @@ namespace PlenBotLogUploader;
 
 public partial class FormArcPluginManager : Form
 {
+    // fields
     private readonly List<ArcDpsComponent> componentsToUpdate = [];
     private readonly HttpClientController httpController = new();
-    // fields
     private readonly FormMain mainLink;
     private int gw2Instances;
     private bool updateManual;

Forms/FormCustomName.cs

@@ -8,7 +8,6 @@ namespace PlenBotLogUploader;
 
 public partial class FormCustomName : Form
 {
-
     // constants
     private const string generateOAuthUrl = "https://twitchapps.com/tmi/";
     // fields

Forms/FormDiscordWebhooks.cs

@@ -18,8 +18,8 @@ namespace PlenBotLogUploader;
 
 public partial class FormDiscordWebhooks : Form
 {
-    private readonly Dictionary<int, DiscordWebhookData> allWebhooks;
     // fields
+    private readonly Dictionary<int, DiscordWebhookData> allWebhooks;
     private readonly FormMain mainLink;
     private readonly TableVisibleBorders tableBorders = TableVisibleBorders.HEADER_ONLY;
     private readonly CellStyle tableCellCenterAlign = new(CellHorizontalAlignment.Center);

Forms/FormEditAleevaIntegration.cs

@@ -16,15 +16,14 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditAleevaIntegration : Form
 {
+    // fields
     private readonly FormAleevaIntegrations aleevaLink;
     private readonly List<AleevaChannel> aleevaServerChannels = [];
     private readonly List<AleevaServer> aleevaServers = [];
     private readonly HttpClientController controller;
     private readonly AleevaIntegration data;
-    // fields
     private readonly FormMain mainLink;
     private string selectedChannel;
-
     private string selectedServer;
     private Team selectedTeam = Teams.Teams.All.Count > 0 ? Teams.Teams.All[0] : null;
 

Forms/FormEditBossData.cs

@@ -10,9 +10,8 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditBossData : Form
 {
-    private readonly BossData data;
-
     // fields
+    private readonly BossData data;
     private readonly FormBossData editLink;
     private BossType bossTypeSwitch = BossType.None;
 

Forms/FormEditDiscordWebhook.cs

@@ -12,8 +12,8 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditDiscordWebhook : Form
 {
-    private readonly DiscordWebhookData data;
     // fields
+    private readonly DiscordWebhookData data;
     private readonly FormDiscordWebhooks discordPingLink;
     private readonly int reservedId;
 

Forms/FormEditDpsReportUserToken.cs

@@ -10,13 +10,12 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditDpsReportUserToken : Form
 {
-
     // constants
     private const string dpsReportUserTokenUrl = "https://dps.report/getUserToken";
-    private readonly HttpClientController httpClientController;
+    private readonly ApplicationSettingsUploadUserToken data;
     // fields
+    private readonly HttpClientController httpClientController;
     private readonly FormDpsReportSettings settingsLink;
-    private ApplicationSettingsUploadUserToken data;
 
     internal FormEditDpsReportUserToken(FormDpsReportSettings settingsLink, HttpClientController httpClientController, ApplicationSettingsUploadUserToken data = null)
     {
@@ -44,13 +43,12 @@ private void FormEditDPSReportUserToken_FormClosing(object sender, FormClosingEv
         }
         if (data is null)
         {
-            data = new ApplicationSettingsUploadUserToken
+            ApplicationSettings.Current.Upload.DpsReportUserTokens.Add(new ApplicationSettingsUploadUserToken
             {
                 Active = false,
                 Name = textBoxName.Text,
                 UserToken = textBoxUserToken.Text,
-            };
-            ApplicationSettings.Current.Upload.DpsReportUserTokens.Add(data);
+            });
         }
         else
         {

Forms/FormEditGw2Api.cs

@@ -10,6 +10,7 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditGw2Api : Form
 {
+    // fields
     private readonly FormGw2Api gw2ApiLink;
     private readonly HttpClientController httpClientController = new();
     private ApplicationSettingsGw2Api data;

Forms/FormEditPing.cs

@@ -7,9 +7,9 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditPing : Form
 {
+    // fields
     private readonly bool addNew;
     private readonly PingConfiguration config;
-    // fields
     private readonly FormPings pingLink;
     private readonly int reservedId;
 

Forms/FormEditTeamCondition.cs

@@ -9,7 +9,6 @@ namespace PlenBotLogUploader;
 
 public partial class FormEditTeamCondition : Form
 {
-
     internal FormEditTeamCondition(Team teamData, TeamCondition data)
     {
         Team = teamData;

Forms/FormEditTwitchCommand.cs

@@ -8,10 +8,10 @@ namespace PlenBotLogUploader.Forms;
 
 public partial class FormEditTwitchCommand : Form
 {
-    // consts
+    // constants
     private const string variableListLink = "https://github.com/Plenyx/PlenBotLogUploader/blob/main/Twitch/TwitchResponseVariables.md";
-    private readonly TwitchCommand data;
     // fields
+    private readonly TwitchCommand data;
     private readonly FormTwitchCommands editLink;
 
     internal FormEditTwitchCommand(FormTwitchCommands editLink, TwitchCommand data)

Forms/FormGw2Api.cs

@@ -13,6 +13,7 @@ namespace PlenBotLogUploader;
 
 public partial class FormGw2Api : Form
 {
+    // fields
     private readonly FormMain mainLink;
 
     internal FormGw2Api(FormMain mainLink)

Forms/FormGw2Bot.cs

@@ -19,7 +19,10 @@ namespace PlenBotLogUploader;
 
 public partial class FormGw2Bot : Form
 {
+    // constants
     private const string gw2BotApiBaseUrl = "https://api.gw2bot.info/v1";
+
+    // fields
     private readonly HttpClientController controller = new();
     private readonly FormMain mainLink;
 

Forms/FormMain.cs

@@ -30,11 +30,12 @@ namespace PlenBotLogUploader;
 
 public partial class FormMain : Form
 {
-
     // constants
     private const int minFileSize = 8192;
     private const string plenBotVersionFileUrl = "https://raw.githubusercontent.com/Plenyx/PlenBotLogUploader/master/VERSION";
     private const string plenBotDownloadName = "PlenBotLogUploader.exe";
+
+    // fields
     private readonly FormAleevaIntegrations aleevaLink;
     private readonly List<string> allSessionLogs = [];
     private readonly FormArcPluginManager arcPluginManagerLink;
@@ -73,8 +74,6 @@ public partial class FormMain : Form
         { "%channel%", "" },
     };
     private readonly FormTwitchCommands twitchCommandsLink;
-
-    // fields
     private readonly FormTwitchNameSetup twitchNameLink;
     private readonly Dictionary<string, int> uploadFailCounters = [];
     private readonly ArcLogsChangeObserver watcher;

Forms/FormPings.cs

@@ -16,10 +16,8 @@ namespace PlenBotLogUploader;
 
 public partial class FormPings : Form
 {
-    // properties
-    private static readonly string PingJsonFileLocation = $@"{ApplicationSettings.LocalDir}\remote_pings.json";
-
     // fields
+    private static readonly string PingJsonFileLocation = $@"{ApplicationSettings.LocalDir}\remote_pings.json";
     private readonly FormMain mainLink;
     private int settingsIdsKey;
 

Forms/FormTeams.cs

@@ -12,9 +12,9 @@ namespace PlenBotLogUploader;
 
 public partial class FormTeams : Form
 {
+    // fields
     private readonly Dictionary<int, Team> allTeams;
     private readonly Dictionary<int, DiscordWebhookData> allWebhooks = DiscordWebhooks.All;
-    // fields
     private int teamIdsKey;
 
     internal FormTeams()

Forms/FormTwitchNameSetup.cs

@@ -8,8 +8,9 @@ namespace PlenBotLogUploader;
 
 public partial class FormTwitchNameSetup : Form
 {
-
+    // constants
     private const string twitchTvSeparator = "twitch.tv/";
+
     // fields
     private readonly FormMain mainLink;