Added @username to the message sent from Discord

xeropresence · Nov 13, 2019 · dddef2d · dddef2d
1 parent a975573
commit dddef2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/DFAssist/Helpers/DiscordHelper.cs b/DFAssist/Helpers/DiscordHelper.cs
@@ -13,28 +13,30 @@ protected override void OnSendNotification(string title, string message, string
                 return;
             }
 
-            if(string.IsNullOrWhiteSpace(MainControl.DiscordUsernameTextBox.Text))
+            var username = MainControl.DiscordUsernameTextBox.Text;
+            if(string.IsNullOrWhiteSpace(username))
             {
                 Logger.Write("UI: Specify a Username for the Discord settings", LogLevel.Warn);
                 return;
             }
 
-            if(string.IsNullOrWhiteSpace(MainControl.DiscordWebhookTextBox.Text))
+            var webhookUrl = MainControl.DiscordWebhookTextBox.Text;
+            if(string.IsNullOrWhiteSpace(webhookUrl))
             {
                 Logger.Write("UI: Specify a valid Webhook URL for the Discord settings", LogLevel.Warn);
                 return;
             }
 
             Logger.Write("UI: Sending Discord Notification...", LogLevel.Debug);
 
-            var content = $"{title}\n>>>>> {message}";
+            var content = $"@{username} | {title}\n>>>>> {message}";
             if(!string.IsNullOrWhiteSpace(testing))
                 content += $" [{testing}]";
 
-            var webhook = new Webhook(MainControl.DiscordWebhookTextBox.Text);
+            var webhook = new Webhook(webhookUrl);
             var webHookObj = new WebhookObject
             {
-                username = MainControl.DiscordUsernameTextBox.Text,
+                username = username,
                 content = content
             };
 

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -35,12 +35,12 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("2.2.3")]
+[assembly: AssemblyVersion("2.2.4")]
 
 // By default, the "Product version" shown in the file properties window is
 // the same as the value specified for AssemblyFileVersionAttribute.
 // Set AssemblyInformationalVersionAttribute to be the same as
 // AssemblyVersionAttribute so that the "Product version" in the file
 // properties window matches the version displayed in the GAC shell extension.
-[assembly: AssemblyInformationalVersion("2.2.3")] // a.k.a. "Product version"
+[assembly: AssemblyInformationalVersion("2.2.4")] // a.k.a. "Product version"