Merge branch 'main' into dev

Author: Elektryk-Andrzej

Code/ArgumentSystem/BaseArguments/Argument.cs

@@ -6,6 +6,8 @@ public abstract class Argument(string name)
 {
     public string Name { get; } = name;
 
+    public bool IsRequired => DefaultValue is null;
+    
     /// <summary>
     /// Allows for this argument to get an unlimited amount of values of this type
     /// Every value after this argument also counts towards this one.

Code/ContextSystem/Contexter.cs

@@ -48,9 +48,9 @@ private static Result TryAddResult(
         Stack<StatementContext> statementStack, 
         List<Context> contexts
     ) {
-        Result rs = $"Invalid context {context} in line {lineNum}.";
+        Result rs = $"Invalid context {context}";
 
-        Log.Debug($"Trying to add context {context} in line {lineNum}");
+        Log.Debug($"Trying to add context {context}");
 
         switch (context)
         {

Code/ContextSystem/Contexts/MethodContext.cs

@@ -53,9 +53,12 @@ public override TryAddTokenRes TryAddToken(BaseToken token)
 
     public override Result VerifyCurrentState()
     {
-        return Result.Assert(_providedArguments >= Method.ExpectedArguments.Count(arg => arg.DefaultValue is null),
+        return Result.Assert(_providedArguments >= Method.ExpectedArguments.Count(arg => arg.IsRequired),
             $"Method '{Method.Name}' is missing required arguments: " +
-            $"{", ".Join(Method.ExpectedArguments.Skip(_providedArguments).Select(arg => arg.Name))}");
+            $"{", ".Join(Method.ExpectedArguments
+                .Skip(_providedArguments)
+                .Where(arg => arg.IsRequired)
+                .Select(arg => arg.Name))}");
     }
 
     protected override IEnumerator<float> Execute()

Code/MethodSystem/Methods/DiscordMethods/SendDiscordMessageMethod.cs

@@ -0,0 +1,51 @@
+using JetBrains.Annotations;
+using MEC;
+using Newtonsoft.Json.Linq;
+using SER.Code.ArgumentSystem.Arguments;
+using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers.Extensions;
+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 SendDiscordMessageMethod : SynchronousMethod, ICanError
+{
+    public override string Description => "Sends a message using a discord webhook.";
+
+    public string[] ErrorReasons => HTTPPostMethod.HttpErrorReasons;
+
+    public override Argument[] ExpectedArguments { get; } =
+    [
+        new TextArgument("webhook url"),
+        new TextArgument("message content"),
+        new TextArgument("webhook name")
+        {
+            DefaultValue = new(null, "default")
+        },
+        new TextArgument("avatar url")
+        {
+            DefaultValue = new(null, "default")
+        }
+    ];
+
+    public override void Execute()
+    {
+        var webhookUrl = Args.GetText("webhook url");
+        var messageContent = Args.GetText("message content");
+        var webhookName = Args.GetText("webhook name").MaybeNull();
+        var avatarUrl = Args.GetText("avatar url").MaybeNull();
+        
+        JObject json = new()
+        {
+            ["content"] = messageContent
+        };
+
+        if (webhookName != null) json["username"] = webhookName;
+        if (avatarUrl != null) json["avatar_url"] = avatarUrl;
+
+        Timing.RunCoroutine(HTTPPostMethod.SendPost(this, webhookUrl, json.ToString()));
+    }
+}

Code/MethodSystem/Methods/GeneralVariableMethods/GlobalVariableMethod.cs

@@ -21,17 +21,12 @@ public class GlobalVariableMethod : SynchronousMethod, ICanError
 
     public override Argument[] ExpectedArguments { get; } =
     [
-        new TokenArgument<VariableToken>("variable to make global")
+        new VariableArgument("variable to make global")
     ];
 
     public override void Execute()
     {
-        var variableToken = Args.GetToken<VariableToken>("variable to make global");
-        if (variableToken.TryGetVariable().HasErrored(out var error, out var variable))
-        {
-            throw new ScriptRuntimeError(this, error);
-        }
-
+        var variable = Args.GetVariable("variable to make global");
         VariableIndex.GlobalVariables.RemoveAll(existingVar => existingVar.Name == variable.Name);
         VariableIndex.GlobalVariables.Add(variable);
     }

Code/MethodSystem/Methods/HTTPMethods/HTTPPostMethod.cs

@@ -3,7 +3,9 @@
 using Newtonsoft.Json.Linq;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.Helpers.Exceptions;
+using SER.Code.MethodSystem.BaseMethods;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.MethodDescriptors;
 using UnityEngine.Networking;
@@ -21,23 +23,25 @@ public class HTTPPostMethod : SynchronousMethod, ICanError
         new TextArgument("address"),
         new ReferenceArgument<JObject>("json data to post")
     ];
-
-    public string[] ErrorReasons =>
+    
+    public static string[] HttpErrorReasons { get; } =
     [
         nameof(UnityWebRequest.Result.ConnectionError),
         nameof(UnityWebRequest.Result.DataProcessingError),
         nameof(UnityWebRequest.Result.ProtocolError)
     ];
-    
+
+    public string[] ErrorReasons => HttpErrorReasons;
+
     public override void Execute()
     {
         var address = Args.GetText("address");
         var jsonData = Args.GetReference<JObject>("json data to post");
 
-        Timing.RunCoroutine(SendPost(address, jsonData.ToString()));
+        Timing.RunCoroutine(SendPost(this, address, jsonData.ToString()));
     }
 
-    private IEnumerator<float> SendPost(string url, string jsonData)
+    public static IEnumerator<float> SendPost(Method caller, string url, string jsonData)
     {
         using UnityWebRequest request = new UnityWebRequest(url, "POST");
         byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData);
@@ -47,10 +51,11 @@ private IEnumerator<float> SendPost(string url, string jsonData)
 
         yield return Timing.WaitUntilDone(request.SendWebRequest());
 
+        Log.Signal($"{request.error} error");
         if (request.result != UnityWebRequest.Result.Success)
         {
             throw new ScriptRuntimeError(
-                this, 
+                caller, 
                 $"Address {url} has returned {request.result} ({request.responseCode}): {request.error}"
             );
         }