From e14f36c46097e1270b5921873c533162fb8d38a0 Mon Sep 17 00:00:00 2001
From: 0b10000 <zerob10000@tutanota.com>
Date: Thu, 16 Feb 2023 22:29:05 -0500
Subject: [PATCH] feat!: bump versions + add custom webhook name/avatar

---
 Config.cs        | 6 ++++++
 EventHandlers.cs | 1 -
 KillLogs.csproj  | 2 +-
 LogManager.cs    | 9 +++++++--
 Plugin.cs        | 8 +++++++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Config.cs b/Config.cs
index c9e74bc..4987bd4 100644
--- a/Config.cs
+++ b/Config.cs
@@ -39,6 +39,12 @@ public class Config : IConfig
         [Description("Duration (in seconds) of how long the kill notification should last.")]
         public float NotifyHintDuration { get; set; } = 10;
 
+        [Description("The name to use for the webhook.")]
+        public string WebhookName { get; set; } = "Kill Logs";
+
+        [Description("The URL to use for the webhook avatar.")]
+        public string WebhookAvatarUrl { get; set; } = "https://via.placeholder.com/150.png";
+        
         public bool Debug { get; set; } = false;
         
     }
diff --git a/EventHandlers.cs b/EventHandlers.cs
index ab9b1df..1f67f84 100644
--- a/EventHandlers.cs
+++ b/EventHandlers.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Exiled.API.Features;
-using Exiled.Events.EventArgs;
 using Exiled.Events.EventArgs.Player;
 using Exiled.Events.EventArgs.Server;
 using Exiled.Permissions.Extensions;
diff --git a/KillLogs.csproj b/KillLogs.csproj
index 6ea8d98..afbad7b 100644
--- a/KillLogs.csproj
+++ b/KillLogs.csproj
@@ -55,7 +55,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="DSharp4Webhook" Version="2.0.1" />
-        <PackageReference Include="EXILED" Version="6.0.0-beta.20" />
+        <PackageReference Include="EXILED" Version="6.0.0-beta.26" />
     </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/LogManager.cs b/LogManager.cs
index b7000ee..06b4bb5 100644
--- a/LogManager.cs
+++ b/LogManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Text;
 using Exiled.API.Features;
-using Exiled.Events.EventArgs;
 using Exiled.Events.EventArgs.Player;
 using KillLogs.Enums;
 
@@ -48,7 +47,13 @@ public void ReportKill(DyingEventArgs ev, LogReason reason, bool sendImmediately
 
         private void SendQueue()
         {
-            plugin.KillWebhook.SendMessage(_queue.ToString())
+            plugin.MessageBuilder.Reset();
+            plugin.MessageBuilder.AvatarUrl = plugin.Config.WebhookAvatarUrl;
+            plugin.MessageBuilder.Username = plugin.Config.WebhookName;
+            plugin.MessageBuilder.Append(_queue.ToString());
+            var message = plugin.MessageBuilder.Build();
+            
+            plugin.KillWebhook.SendMessage(message)
                 .Queue(() => Log.Debug($"Sent queue of length {_queue.Length}"));
 
             _queue.Clear();
diff --git a/Plugin.cs b/Plugin.cs
index 9828ce1..8f71136 100644
--- a/Plugin.cs
+++ b/Plugin.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using DSharp4Webhook.Core;
+using DSharp4Webhook.Core.Constructor;
 using Exiled.API.Features;
 using MapEvents = Exiled.Events.Handlers.Map;
 using PlayerEvents = Exiled.Events.Handlers.Player;
@@ -19,7 +20,7 @@ public class Plugin : Plugin<Config>
         public override string Author => "0b10000";
         public override string Name => "KillLogs";
         public override string Prefix => "KillLogs";
-        public override Version Version { get; } = new(4, 0, 0);
+        public override Version Version { get; } = new(5, 0, 0);
         public override Version RequiredExiledVersion { get; } = new(6, 0, 0);
 
         private EventHandlers EventHandlers { get; set; }
@@ -30,6 +31,8 @@ public class Plugin : Plugin<Config>
         private WebhookProvider WebhookProvider { get; set; }
         internal IWebhook KillWebhook { get; set; }
         
+        internal MessageBuilder MessageBuilder { get; set; }
+        
         internal List<Player> PlayersToNotify { get; set; }
 
         public override void OnEnabled()
@@ -42,6 +45,9 @@ public override void OnEnabled()
 
             WebhookProvider = new WebhookProvider("0b10000.kill_logs");
             WebhookProvider.AllowedMention = AllowedMention.ROLES;
+
+            MessageBuilder = ConstructorProvider.GetMessageBuilder();
+            
             KillWebhook = WebhookProvider.CreateWebhook(Config.DiscordWebhookUrl);
 
             PlayerEvents.Dying += EventHandlers.OnDying;