From c4ef1e4174be831b2aab64ce8a30c488f5e44d89 Mon Sep 17 00:00:00 2001
From: Plenyx <Plenyx@users.noreply.github.com>
Date: Wed, 22 May 2019 00:18:33 +0200
Subject: [PATCH] Build n. 37

---
 Forms/FormArcVersions.Designer.cs      | 61 ++++++++++++--------
 Forms/FormCustomName.Designer.cs       | 80 +++++++++++++++-----------
 Forms/FormCustomName.resx              | 20 +++----
 Forms/FormDiscordWebhooks.cs           | 19 +++---
 Forms/FormMain.cs                      | 41 ++++---------
 Forms/FormPings.cs                     | 28 ++++++---
 MAKE-CUSTOM-REMOTE-SERVER-README.md    |  2 +-
 Tools/HttpClientController.cs          |  5 +-
 TwitchIRCClient/IrcChangedEventArgs.cs |  2 +-
 TwitchIRCClient/IrcMessageEventArgs.cs |  2 +-
 TwitchIRCClient/IrcStates.cs           |  2 +-
 TwitchIRCClient/TwitchIrcClient.cs     | 20 ++-----
 VERSION                                |  2 +-
 13 files changed, 144 insertions(+), 140 deletions(-)

diff --git a/Forms/FormArcVersions.Designer.cs b/Forms/FormArcVersions.Designer.cs
index de38bb1..88ce89f 100644
--- a/Forms/FormArcVersions.Designer.cs
+++ b/Forms/FormArcVersions.Designer.cs
@@ -33,12 +33,13 @@ private void InitializeComponent()
             this.timerCheckNewArcversion = new System.Windows.Forms.Timer(this.components);
             this.buttonCheckNow = new System.Windows.Forms.Button();
             this.groupBoxUpdating = new System.Windows.Forms.GroupBox();
+            this.radioButtonUpdateAll = new System.Windows.Forms.RadioButton();
+            this.radioButtonDownloadAll = new System.Windows.Forms.RadioButton();
             this.labelInformation = new System.Windows.Forms.Label();
             this.buttonUpdate = new System.Windows.Forms.Button();
             this.groupBoxSettings = new System.Windows.Forms.GroupBox();
             this.buttonEnabler = new System.Windows.Forms.Button();
-            this.radioButtonDownloadAll = new System.Windows.Forms.RadioButton();
-            this.radioButtonUpdateAll = new System.Windows.Forms.RadioButton();
+            this.labelIssues = new System.Windows.Forms.Label();
             this.groupBoxUpdating.SuspendLayout();
             this.groupBoxSettings.SuspendLayout();
             this.SuspendLayout();
@@ -82,6 +83,29 @@ private void InitializeComponent()
             this.groupBoxUpdating.TabStop = false;
             this.groupBoxUpdating.Text = "Update process";
             // 
+            // radioButtonUpdateAll
+            // 
+            this.radioButtonUpdateAll.AutoSize = true;
+            this.radioButtonUpdateAll.Checked = true;
+            this.radioButtonUpdateAll.Location = new System.Drawing.Point(139, 51);
+            this.radioButtonUpdateAll.Name = "radioButtonUpdateAll";
+            this.radioButtonUpdateAll.Size = new System.Drawing.Size(143, 17);
+            this.radioButtonUpdateAll.TabIndex = 3;
+            this.radioButtonUpdateAll.TabStop = true;
+            this.radioButtonUpdateAll.Text = "Update installed modules";
+            this.radioButtonUpdateAll.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonDownloadAll
+            // 
+            this.radioButtonDownloadAll.AutoSize = true;
+            this.radioButtonDownloadAll.Location = new System.Drawing.Point(6, 51);
+            this.radioButtonDownloadAll.Name = "radioButtonDownloadAll";
+            this.radioButtonDownloadAll.Size = new System.Drawing.Size(128, 17);
+            this.radioButtonDownloadAll.TabIndex = 2;
+            this.radioButtonDownloadAll.TabStop = true;
+            this.radioButtonDownloadAll.Text = "Download all modules";
+            this.radioButtonDownloadAll.UseVisualStyleBackColor = true;
+            // 
             // labelInformation
             // 
             this.labelInformation.Location = new System.Drawing.Point(3, 77);
@@ -124,34 +148,22 @@ private void InitializeComponent()
             this.buttonEnabler.UseVisualStyleBackColor = true;
             this.buttonEnabler.Click += new System.EventHandler(this.buttonEnabler_Click);
             // 
-            // radioButtonDownloadAll
-            // 
-            this.radioButtonDownloadAll.AutoSize = true;
-            this.radioButtonDownloadAll.Location = new System.Drawing.Point(6, 51);
-            this.radioButtonDownloadAll.Name = "radioButtonDownloadAll";
-            this.radioButtonDownloadAll.Size = new System.Drawing.Size(128, 17);
-            this.radioButtonDownloadAll.TabIndex = 2;
-            this.radioButtonDownloadAll.TabStop = true;
-            this.radioButtonDownloadAll.Text = "Download all modules";
-            this.radioButtonDownloadAll.UseVisualStyleBackColor = true;
-            // 
-            // radioButtonUpdateAll
+            // labelIssues
             // 
-            this.radioButtonUpdateAll.AutoSize = true;
-            this.radioButtonUpdateAll.Checked = true;
-            this.radioButtonUpdateAll.Location = new System.Drawing.Point(139, 51);
-            this.radioButtonUpdateAll.Name = "radioButtonUpdateAll";
-            this.radioButtonUpdateAll.Size = new System.Drawing.Size(143, 17);
-            this.radioButtonUpdateAll.TabIndex = 3;
-            this.radioButtonUpdateAll.TabStop = true;
-            this.radioButtonUpdateAll.Text = "Update installed modules";
-            this.radioButtonUpdateAll.UseVisualStyleBackColor = true;
+            this.labelIssues.Location = new System.Drawing.Point(12, 115);
+            this.labelIssues.Name = "labelIssues";
+            this.labelIssues.Size = new System.Drawing.Size(436, 37);
+            this.labelIssues.TabIndex = 4;
+            this.labelIssues.Text = "If you are experiencing issues with these settings please disable checking so you" +
+    " are not bothered by notifications and contact me on Discord or Github";
+            this.labelIssues.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // FormArcVersions
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(460, 118);
+            this.ClientSize = new System.Drawing.Size(460, 155);
+            this.Controls.Add(this.labelIssues);
             this.Controls.Add(this.groupBoxSettings);
             this.Controls.Add(this.groupBoxUpdating);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -182,5 +194,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label labelInformation;
         private System.Windows.Forms.RadioButton radioButtonUpdateAll;
         private System.Windows.Forms.RadioButton radioButtonDownloadAll;
+        private System.Windows.Forms.Label labelIssues;
     }
 }
\ No newline at end of file
diff --git a/Forms/FormCustomName.Designer.cs b/Forms/FormCustomName.Designer.cs
index 2f621c9..a60413f 100644
--- a/Forms/FormCustomName.Designer.cs
+++ b/Forms/FormCustomName.Designer.cs
@@ -28,14 +28,14 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormCustomName));
             this.checkBoxCustomNameEnable = new System.Windows.Forms.CheckBox();
             this.groupBoxCustomNameSettings = new System.Windows.Forms.GroupBox();
-            this.textBoxCustomName = new System.Windows.Forms.TextBox();
-            this.textBoxCustomOAuth = new System.Windows.Forms.TextBox();
-            this.labelCustomName = new System.Windows.Forms.Label();
-            this.labelCustomOAuth = new System.Windows.Forms.Label();
             this.linkLabelGetOAuth = new System.Windows.Forms.LinkLabel();
+            this.labelCustomOAuth = new System.Windows.Forms.Label();
+            this.labelCustomName = new System.Windows.Forms.Label();
+            this.textBoxCustomOAuth = new System.Windows.Forms.TextBox();
+            this.textBoxCustomName = new System.Windows.Forms.TextBox();
+            this.labelInformation = new System.Windows.Forms.Label();
             this.groupBoxCustomNameSettings.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -65,20 +65,26 @@ private void InitializeComponent()
             this.groupBoxCustomNameSettings.TabStop = false;
             this.groupBoxCustomNameSettings.Text = "Custom name settings";
             // 
-            // textBoxCustomName
+            // linkLabelGetOAuth
             // 
-            this.textBoxCustomName.Location = new System.Drawing.Point(6, 32);
-            this.textBoxCustomName.Name = "textBoxCustomName";
-            this.textBoxCustomName.Size = new System.Drawing.Size(254, 20);
-            this.textBoxCustomName.TabIndex = 0;
+            this.linkLabelGetOAuth.AutoSize = true;
+            this.linkLabelGetOAuth.Location = new System.Drawing.Point(170, 55);
+            this.linkLabelGetOAuth.Name = "linkLabelGetOAuth";
+            this.linkLabelGetOAuth.Size = new System.Drawing.Size(90, 13);
+            this.linkLabelGetOAuth.TabIndex = 4;
+            this.linkLabelGetOAuth.TabStop = true;
+            this.linkLabelGetOAuth.Text = "Generate OAuth2";
+            this.linkLabelGetOAuth.VisitedLinkColor = System.Drawing.Color.Blue;
+            this.linkLabelGetOAuth.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelGetOAuth_LinkClicked);
             // 
-            // textBoxCustomOAuth
+            // labelCustomOAuth
             // 
-            this.textBoxCustomOAuth.Location = new System.Drawing.Point(6, 71);
-            this.textBoxCustomOAuth.Name = "textBoxCustomOAuth";
-            this.textBoxCustomOAuth.PasswordChar = '*';
-            this.textBoxCustomOAuth.Size = new System.Drawing.Size(254, 20);
-            this.textBoxCustomOAuth.TabIndex = 1;
+            this.labelCustomOAuth.AutoSize = true;
+            this.labelCustomOAuth.Location = new System.Drawing.Point(6, 55);
+            this.labelCustomOAuth.Name = "labelCustomOAuth";
+            this.labelCustomOAuth.Size = new System.Drawing.Size(94, 13);
+            this.labelCustomOAuth.TabIndex = 3;
+            this.labelCustomOAuth.Text = "OAuth2 password:";
             // 
             // labelCustomName
             // 
@@ -89,36 +95,39 @@ private void InitializeComponent()
             this.labelCustomName.TabIndex = 2;
             this.labelCustomName.Text = "Custom name:";
             // 
-            // labelCustomOAuth
+            // textBoxCustomOAuth
             // 
-            this.labelCustomOAuth.AutoSize = true;
-            this.labelCustomOAuth.Location = new System.Drawing.Point(6, 55);
-            this.labelCustomOAuth.Name = "labelCustomOAuth";
-            this.labelCustomOAuth.Size = new System.Drawing.Size(94, 13);
-            this.labelCustomOAuth.TabIndex = 3;
-            this.labelCustomOAuth.Text = "OAuth2 password:";
+            this.textBoxCustomOAuth.Location = new System.Drawing.Point(6, 71);
+            this.textBoxCustomOAuth.Name = "textBoxCustomOAuth";
+            this.textBoxCustomOAuth.PasswordChar = '*';
+            this.textBoxCustomOAuth.Size = new System.Drawing.Size(254, 20);
+            this.textBoxCustomOAuth.TabIndex = 1;
             // 
-            // linkLabelGetOAuth
+            // textBoxCustomName
             // 
-            this.linkLabelGetOAuth.AutoSize = true;
-            this.linkLabelGetOAuth.Location = new System.Drawing.Point(170, 55);
-            this.linkLabelGetOAuth.Name = "linkLabelGetOAuth";
-            this.linkLabelGetOAuth.Size = new System.Drawing.Size(90, 13);
-            this.linkLabelGetOAuth.TabIndex = 4;
-            this.linkLabelGetOAuth.TabStop = true;
-            this.linkLabelGetOAuth.Text = "Generate OAuth2";
-            this.linkLabelGetOAuth.VisitedLinkColor = System.Drawing.Color.Blue;
-            this.linkLabelGetOAuth.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelGetOAuth_LinkClicked);
+            this.textBoxCustomName.Location = new System.Drawing.Point(6, 32);
+            this.textBoxCustomName.Name = "textBoxCustomName";
+            this.textBoxCustomName.Size = new System.Drawing.Size(254, 20);
+            this.textBoxCustomName.TabIndex = 0;
+            // 
+            // labelInformation
+            // 
+            this.labelInformation.Location = new System.Drawing.Point(12, 146);
+            this.labelInformation.Name = "labelInformation";
+            this.labelInformation.Size = new System.Drawing.Size(270, 26);
+            this.labelInformation.TabIndex = 2;
+            this.labelInformation.Text = "This feature requires a use of another Twitch account";
+            this.labelInformation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // FormCustomName
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(289, 146);
+            this.ClientSize = new System.Drawing.Size(289, 179);
+            this.Controls.Add(this.labelInformation);
             this.Controls.Add(this.groupBoxCustomNameSettings);
             this.Controls.Add(this.checkBoxCustomNameEnable);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormCustomName";
@@ -140,5 +149,6 @@ private void InitializeComponent()
         public System.Windows.Forms.TextBox textBoxCustomOAuth;
         public System.Windows.Forms.TextBox textBoxCustomName;
         private System.Windows.Forms.LinkLabel linkLabelGetOAuth;
+        private System.Windows.Forms.Label labelInformation;
     }
 }
\ No newline at end of file
diff --git a/Forms/FormCustomName.resx b/Forms/FormCustomName.resx
index b00f8bd..1af7de1 100644
--- a/Forms/FormCustomName.resx
+++ b/Forms/FormCustomName.resx
@@ -2,16 +2,16 @@
 <root>
   <!-- 
     Microsoft ResX Schema 
-
+    
     Version 2.0
-
+    
     The primary goals of this format is to allow a simple XML format 
     that is mostly human readable. The generation and parsing of the 
     various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,29 +26,29 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
+                
     There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
+    
     Each data row contains a name, and value. The row also contains a 
     type or mimetype. Type corresponds to a .NET class that support 
     text/value conversion through the TypeConverter architecture. 
     Classes that don't support this are serialized and stored with the 
     mimetype set.
-
+    
     The mimetype is used for serialized objects, and tells the 
     ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
+    
     Note - application/x-microsoft.net.object.binary.base64 is the format 
     that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/Forms/FormDiscordWebhooks.cs b/Forms/FormDiscordWebhooks.cs
index c0b1506..086e2fd 100644
--- a/Forms/FormDiscordWebhooks.cs
+++ b/Forms/FormDiscordWebhooks.cs
@@ -41,7 +41,7 @@ public FormDiscordWebhooks(FormMain mainLink)
                             string[] values = line.Split(new string[] { "<;>" }, StringSplitOptions.None);
                             int.TryParse(values[0], out int active);
                             int.TryParse(values[3], out int onlySuccess);
-                            // compatibility with older versions
+                            // compatibility with build < 32
                             int showPlayers = 1;
                             if (values.Count() > 4)
                             {
@@ -49,11 +49,11 @@ public FormDiscordWebhooks(FormMain mainLink)
                             }
                             AddWebhook(new DiscordWebhookData()
                             {
-                                Active = active == 1 ? true : false,
+                                Active = active == 1,
                                 Name = values[1],
                                 URL = values[2],
-                                OnlySuccess = onlySuccess == 1 ? true : false,
-                                ShowPlayers = showPlayers == 1 ? true : false
+                                OnlySuccess = onlySuccess == 1,
+                                ShowPlayers = showPlayers == 1
                             });
                         }
                     }
@@ -151,16 +151,15 @@ public async Task ExecuteAllActiveWebhooksAsync(DPSReportJSON reportJSON, Dictio
                 serialiser.RegisterConverters(new[] { new DiscordAPIJSONContentConverter() });
                 string jsonContentWithoutPlayers = serialiser.Serialize(discordContentWithoutPlayers);
                 string jsonContentWithPlayers = serialiser.Serialize(discordContentWithPlayers);
-                var count = AllWebhooks.Count;
                 foreach (var key in AllWebhooks.Keys)
                 {
-                    if (!AllWebhooks[key].Active || (AllWebhooks[key].OnlySuccess && !(reportJSON.Encounter.Success ?? false)))
+                    var webhook = AllWebhooks[key];
+                    if (!webhook.Active || (webhook.OnlySuccess && !(reportJSON.Encounter.Success ?? false)))
                     {
-                        count--;
                         continue;
                     }
-                    var uri = new Uri(AllWebhooks[key].URL);
-                    if (AllWebhooks[key].ShowPlayers)
+                    var uri = new Uri(webhook.URL);
+                    if (webhook.ShowPlayers)
                     {
                         using (var content = new StringContent(jsonContentWithPlayers, Encoding.UTF8, "application/json"))
                         {
@@ -175,7 +174,7 @@ public async Task ExecuteAllActiveWebhooksAsync(DPSReportJSON reportJSON, Dictio
                         }
                     }
                 }
-                if (count > 0)
+                if (AllWebhooks.Count > 0)
                 {
                     mainLink.AddToText(">:> All active webhooks successfully executed.");
                 }
diff --git a/Forms/FormMain.cs b/Forms/FormMain.cs
index a40dc76..8243af1 100644
--- a/Forms/FormMain.cs
+++ b/Forms/FormMain.cs
@@ -10,10 +10,10 @@
 using System.Collections.Generic;
 using System.Web.Script.Serialization;
 using Microsoft.Win32;
-using TwitchIRCClient;
 using PlenBotLogUploader.Tools;
 using PlenBotLogUploader.DPSReport;
 using PlenBotLogUploader.GW2Raidar;
+using PlenBotLogUploader.TwitchIRCClient;
 
 namespace PlenBotLogUploader
 {
@@ -52,7 +52,7 @@ public partial class FormMain : Form
 
         // constants
         private const int minFileSize = 12288;
-        private const int uploaderBuild = 36;
+        private const int uploaderBuild = 37;
         #endregion
 
         #region constructor
@@ -97,7 +97,7 @@ public FormMain()
                 }
                 ChannelName = RegistryController.GetRegistryValue("channel", "").ToLower();
                 firstTimeMinimise = RegistryController.GetRegistryValue("trayMinimiseFirst", 1) == 1;
-                if (!string.IsNullOrEmpty(ChannelName))
+                if (ChannelName != "")
                 {
                     twitchNameLink.textBoxChannelUrl.Text = $"https://twitch.tv/{ChannelName}/";
                 }
@@ -397,7 +397,7 @@ private void LogsScan(string directory)
             UpdateLogCount();
         }
 
-        protected async void NewBuildCheckAsync(bool showBaloonOnly = false)
+        protected async void NewBuildCheckAsync()
         {
             try
             {
@@ -406,36 +406,17 @@ protected async void NewBuildCheckAsync(bool showBaloonOnly = false)
                 {
                     if (currentversion > uploaderBuild)
                     {
-                        buttonUpdateNow.Invoke((Action)delegate () { buttonUpdateNow.Visible = true; });
-                        AddToText($">>> New build available (build n. {response})");
-                        AddToText("https://github.com/Plenyx/PlenBotLogUploader/releases/");
-                        if (StartedMinimised || showBaloonOnly)
+                        if (buttonUpdateNow.InvokeRequired)
                         {
-                            ShowBalloon("New build available for the uploader", $"If you want to begin the update process, use the \"Update uploader\" button.\nThe latest build is build n. {response}.", 8500);
+                            buttonUpdateNow.Invoke((Action)delegate () { buttonUpdateNow.Visible = true; });
                         }
                         else
                         {
-                            DialogResult result = MessageBox.Show("Do you want to download the newest version?", $"New build available for the uploader (build n. {response})", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
-                            if (result == DialogResult.Yes)
-                            {
-                                if (RegistryController.GetRegistryValue("firstUpdate", 0) == 0)
-                                {
-                                    MessageBox.Show("The folder with the current location of this executable is going to be opened.\nYou can update the bot by simple overwriting the previous executable.\nThe application will now close.", $"Ease of installation", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                                    RegistryController.SetRegistryValue("firstUpdate", 1);
-                                }
-                                Process.Start("https://github.com/Plenyx/PlenBotLogUploader/releases/");
-                                Process.Start($"{LocalDir}");
-                                if (InvokeRequired)
-                                {
-                                    // invokes the function on the main thread
-                                    Invoke((Action)delegate () { ExitApp(); });
-                                }
-                                else
-                                {
-                                    ExitApp();
-                                }
-                            }
+                            buttonUpdateNow.Visible = true;
                         }
+                        AddToText($">>> New build available (build n. {response})");
+                        AddToText("https://github.com/Plenyx/PlenBotLogUploader/releases/");
+                        ShowBalloon("New build available for the uploader", $"If you want to begin the update process, use the \"Update uploader\" button.\nThe latest build is build n. {response}.", 8500);
                     }
                     else
                     {
@@ -1103,7 +1084,7 @@ private void TimerCheckUpdate_Tick(object sender, EventArgs e)
         {
             timerCheckUpdate.Stop();
             timerCheckUpdate.Enabled = false;
-            Task.Run(() => NewBuildCheckAsync(true));
+            Task.Run(() => NewBuildCheckAsync());
         }
         #endregion
     }
diff --git a/Forms/FormPings.cs b/Forms/FormPings.cs
index 27f9360..c0dd0f7 100644
--- a/Forms/FormPings.cs
+++ b/Forms/FormPings.cs
@@ -44,8 +44,21 @@ public FormPings(FormMain mainLink)
                             {
                                 method = 0;
                             }
-                            var auth = new PingAuthentication() { Active = authActive == 1, UseAsAuth = useAsAuth == 1, AuthName = values[6], AuthToken = values[7] };
-                            AddPing(new PingConfiguration() { Active = active == 1 ? true : false, Name = values[1], URL = values[2], Method = (PingMethod)method, Authentication = auth });
+                            var auth = new PingAuthentication()
+                            {
+                                Active = authActive == 1,
+                                UseAsAuth = useAsAuth == 1,
+                                AuthName = values[6],
+                                AuthToken = values[7]
+                            };
+                            AddPing(new PingConfiguration()
+                            {
+                                Active = active == 1,
+                                Name = values[1],
+                                URL = values[2],
+                                Method = (PingMethod)method,
+                                Authentication = auth
+                            });
                         }
                     }
                 }
@@ -73,11 +86,12 @@ private async void FormPings_FormClosing(object sender, FormClosingEventArgs e)
                 await writer.WriteLineAsync("## Edit the contents of this file at your own risk, use the application interface instead.");
                 foreach (int key in AllPings.Keys)
                 {
-                    string active = AllPings[key].Active ? "1" : "0";
-                    string method = ((int)AllPings[key].Method).ToString();
-                    string authActive = AllPings[key].Authentication.Active ? "1" : "0";
-                    string useAsAuth = AllPings[key].Authentication.UseAsAuth ? "1" : "0";
-                    await writer.WriteLineAsync($"{active}<;>{AllPings[key].Name}<;>{AllPings[key].URL}<;>{method}<;>{authActive}<;>{useAsAuth}<;>{AllPings[key].Authentication.AuthName}<;>{AllPings[key].Authentication.AuthToken}");
+                    var ping = AllPings[key];
+                    string active = ping.Active ? "1" : "0";
+                    string method = ((int)ping.Method).ToString();
+                    string authActive = ping.Authentication.Active ? "1" : "0";
+                    string useAsAuth = ping.Authentication.UseAsAuth ? "1" : "0";
+                    await writer.WriteLineAsync($"{active}<;>{ping.Name}<;>{ping.URL}<;>{method}<;>{authActive}<;>{useAsAuth}<;>{ping.Authentication.AuthName}<;>{ping.Authentication.AuthToken}");
                 }
             }
         }
diff --git a/MAKE-CUSTOM-REMOTE-SERVER-README.md b/MAKE-CUSTOM-REMOTE-SERVER-README.md
index 8a810fa..9873516 100644
--- a/MAKE-CUSTOM-REMOTE-SERVER-README.md
+++ b/MAKE-CUSTOM-REMOTE-SERVER-README.md
@@ -22,7 +22,7 @@ You can only have one of the structures marked with ***!*** in the response.
 For a successful ping test the status code needs to be either 200 or 201.
 
 ## Pinging logs
-To ping logs themselves you need to implement response that would react to either GET or POST requests.
+To ping logs themselves you need to implement response that would react to either GET, DELETE, PUT or POST method requests.
 
 You need to implement JSON respond structure found in PlenyxAPI/PlenyxAPIPingResponse.cs.
 
diff --git a/Tools/HttpClientController.cs b/Tools/HttpClientController.cs
index b4d1605..c970422 100644
--- a/Tools/HttpClientController.cs
+++ b/Tools/HttpClientController.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace PlenBotLogUploader.Tools
@@ -28,7 +25,7 @@ public async Task<bool> DownloadFileAsync(string url, string destination)
                 {
                     using (var response = await responseMessage.Content.ReadAsStreamAsync())
                     {
-                        using (var stream = new FileStream(@destination, FileMode.Create, FileAccess.Write))
+                        using (var stream = File.Create(@destination))
                         {
                             await response.CopyToAsync(stream);
                         }
diff --git a/TwitchIRCClient/IrcChangedEventArgs.cs b/TwitchIRCClient/IrcChangedEventArgs.cs
index f7735df..7ffe01e 100644
--- a/TwitchIRCClient/IrcChangedEventArgs.cs
+++ b/TwitchIRCClient/IrcChangedEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TwitchIRCClient
+namespace PlenBotLogUploader.TwitchIRCClient
 {
     public class IrcChangedEventArgs : EventArgs
     {
diff --git a/TwitchIRCClient/IrcMessageEventArgs.cs b/TwitchIRCClient/IrcMessageEventArgs.cs
index c684917..540b935 100644
--- a/TwitchIRCClient/IrcMessageEventArgs.cs
+++ b/TwitchIRCClient/IrcMessageEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TwitchIRCClient
+namespace PlenBotLogUploader.TwitchIRCClient
 {
     public class IrcMessageEventArgs : EventArgs
     {
diff --git a/TwitchIRCClient/IrcStates.cs b/TwitchIRCClient/IrcStates.cs
index c0e2ed0..cb5d736 100644
--- a/TwitchIRCClient/IrcStates.cs
+++ b/TwitchIRCClient/IrcStates.cs
@@ -1,4 +1,4 @@
-namespace TwitchIRCClient
+namespace PlenBotLogUploader.TwitchIRCClient
 {
     public enum IrcStates
     {
diff --git a/TwitchIRCClient/TwitchIrcClient.cs b/TwitchIRCClient/TwitchIrcClient.cs
index eaef6b6..930572c 100644
--- a/TwitchIRCClient/TwitchIrcClient.cs
+++ b/TwitchIRCClient/TwitchIrcClient.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Collections.Generic;
 
-namespace TwitchIRCClient
+namespace PlenBotLogUploader.TwitchIRCClient
 {
     class TwitchIrcClient : IDisposable
     {
@@ -21,38 +21,28 @@ class TwitchIrcClient : IDisposable
         // private
         private readonly string userName;
         private readonly string password;
-        private readonly string serverIp;
-        private readonly int serverPort;
         private TcpClient tcpClient;
         private StreamReader inputStream;
         private StreamWriter outputStream;
 
+        // constants
+        private const string serverIp = "irc.chat.twitch.tv";
+        private const int serverPort = 6667;
+
         public TwitchIrcClient(string userName, string password)
         {
             this.userName = userName;
             this.password = password;
-            serverIp = "irc.chat.twitch.tv";
-            serverPort = 6667;
         }
 
         public TwitchIrcClient(string userName, string password, string channelName)
         {
             this.userName = userName;
             this.password = password;
-            serverIp = "irc.chat.twitch.tv";
-            serverPort = 6667;
             LastChannelName = channelName.ToLower();
             ChannelNames.Add(LastChannelName);
         }
 
-        public TwitchIrcClient(string userName, string password, string ip, int port)
-        {
-            this.userName = userName;
-            this.password = password;
-            serverIp = ip;
-            serverPort = port;
-        }
-
         public void BeginConnection()
         {
             tcpClient = new TcpClient(serverIp, serverPort);
diff --git a/VERSION b/VERSION
index dce6588..7c09198 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-36
\ No newline at end of file
+37
\ No newline at end of file