Merge branch 'dev' of https://github.com/ScriptedEvents/ScriptedEventsReloaded into dev

Author: Elektryk-Andrzej

Code/MethodSystem/Methods/DiscordMethods/DeleteDiscordMessageMethod.cs

@@ -0,0 +1,48 @@
+using JetBrains.Annotations;
+using MEC;
+using SER.Code.ArgumentSystem.Arguments;
+using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers.Exceptions;
+using SER.Code.MethodSystem.BaseMethods.Synchronous;
+using SER.Code.MethodSystem.MethodDescriptors;
+using SER.Code.MethodSystem.Methods.HTTPMethods;
+
+namespace SER.Code.MethodSystem.Methods.DiscordMethods;
+
+[UsedImplicitly]
+public class DeleteDiscordMessageMethod : SynchronousMethod, ICanError
+{
+    public override string Description => "Deletes a message sent by a discord webhook (with that same webhook).";
+
+    public string[] ErrorReasons =>
+    [
+        ..HTTPPostMethod.HttpErrorReasons,
+        "Message ID must not be empty.",
+        "Provided URL is not a valid webhook URL."
+    ];
+
+    public override Argument[] ExpectedArguments { get; } =
+    [
+        new TextArgument("webhook url"),
+        new TextArgument("message id")
+        {
+            Description = "You can get it by right-clicking on a message and clicking \"Copy message ID\""
+        }
+    ];
+
+    public override void Execute()
+    {
+        var webhookUrl = Args.GetText("webhook url");
+        var messageId = Args.GetText("message id");
+        
+        if (messageId.IsEmpty())
+            throw new ScriptRuntimeError(this, ErrorReasons[^2]);
+        
+        if (!webhookUrl.StartsWith("https://discord.com/api/webhooks/"))
+            throw new ScriptRuntimeError(this, ErrorReasons.Last());
+        
+        var messageURL = webhookUrl + "/messages/" + messageId;
+
+        Timing.RunCoroutine(HTTPPostMethod.RequestSend(this, messageURL, null, "DELETE"));
+    }
+}

Code/MethodSystem/Methods/DiscordMethods/EditDiscordMessageMethod.cs

@@ -24,7 +24,10 @@ public class EditDiscordMessageMethod : SynchronousMethod, ICanError
     public override Argument[] ExpectedArguments { get; } =
     [
         new TextArgument("webhook url"),
-        new TextArgument("message id"),
+        new TextArgument("message id")
+        {
+            Description = "You can get it by right-clicking on a message and clicking \"Copy message ID\""
+        },
         new ReferenceArgument<DiscordMessageMethod.DMessage>("message object")
     ];
 

Code/MethodSystem/Methods/HTTPMethods/HTTPPostMethod.cs

@@ -40,13 +40,16 @@ public override void Execute()
         Timing.RunCoroutine(RequestSend(this, address, jsonData));
     }
 
-    public static IEnumerator<float> RequestSend(Method caller, string url, JObject jsonData, string method = "POST")
+    public static IEnumerator<float> RequestSend(Method caller, string url, JObject? jsonData, string method = "POST")
     {
-        using UnityWebRequest request = new UnityWebRequest(url, method);
-        byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData.ToString());
-        request.uploadHandler = new UploadHandlerRaw(bodyRaw);
-        request.downloadHandler = new DownloadHandlerBuffer();
-        request.SetRequestHeader("Content-Type", "application/json");
+        using var request = new UnityWebRequest(url, method);
+
+        if (jsonData is not null)
+        {
+            var bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData.ToString());
+            request.uploadHandler = new UploadHandlerRaw(bodyRaw);
+            request.SetRequestHeader("Content-Type", "application/json");   
+        }
 
         yield return Timing.WaitUntilDone(request.SendWebRequest());