Merge pull request #31 from Amino-NET-Group/patch/fix-some-issues

Patch/fix some issues

Author: FabioGaming

Amino.NET/Amino.NET.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>1.5.2</Version>
+    <Version>1.7.0</Version>
     <Authors>FabioTheFox</Authors>
     <Company>FabiDev</Company>
     <Description>An unofficial C# wrapper for Aminos REST API for making amino bots and tools</Description>

Amino.NET/Client.cs

@@ -317,7 +317,7 @@ public Task logout()
                 };
                 RestClient client = new RestClient(helpers.BaseUrl);
                 RestRequest request = new RestRequest("/g/s/auth/logout");
-                request.AddJsonBody(data);
+                request.AddJsonBody(JsonConvert.SerializeObject(data));
                 request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(JsonConvert.SerializeObject(data)));
                 request.AddHeaders(headers);
                 var response = client.ExecutePost(request);
@@ -2265,27 +2265,11 @@ public Objects.Message send_message(string message, string chatId, Types.Message
             }
             message = message.Replace("<$", "").Replace("$>", "");
             JObject data = new JObject();
-            JObject attachementSub = new JObject();
-            JObject extensionSub = new JObject();
-            JObject extensionSuBArray = new JObject();
             data.Add("type", (int)messageType);
             data.Add("content", message);
             data.Add("clientRefId", helpers.GetTimestamp() / 10 % 1000000000);
             data.Add("timestamp", helpers.GetTimestamp() * 1000);
-            attachementSub.Add("objectId", null);
-            attachementSub.Add("objectType", null);
-            attachementSub.Add("link", null);
-            attachementSub.Add("title", null);
-            attachementSub.Add("content", null);
-            attachementSub.Add("mediaList", null);
-            extensionSuBArray.Add("link", null);
-            extensionSuBArray.Add("mediaType", 100);
-            extensionSuBArray.Add("mediaUploadValue", null);
-            extensionSuBArray.Add("mediaUploadValueContentType", "image/jpg");
-            extensionSub.Add("mentionedArray", new JArray(mentions));
-            extensionSub.Add("linkSnippetList", new JArray(extensionSuBArray));
-            data.Add("attachedObject", attachementSub);
-            data.Add("extensions", extensionSub);
+            data.Add("extensions", new JObject() { { "mentionedArray", new JArray(mentions) } });
             if (replyTo != null) { data.Add("replyMessageId", replyTo); }
 
             RestClient client = new RestClient(helpers.BaseUrl);
@@ -2310,26 +2294,10 @@ public Objects.Message send_message(string message, string chatId, Types.Message
         public Task send_file_message(string chatId, byte[] file, Types.upload_File_Types fileType)
         {
             JObject data = new JObject();
-            JObject attachementSub = new JObject();
-            JObject extensionSub = new JObject();
-            JObject extensionSuBArray = new JObject();
             data.Add("clientRefId", helpers.GetTimestamp() / 10 % 1000000000);
             data.Add("timestamp", helpers.GetTimestamp() * 1000);
             data.Add("content", null);
             data.Add("type", 0);
-            attachementSub.Add("objectId", null);
-            attachementSub.Add("objectType", null);
-            attachementSub.Add("link", null);
-            attachementSub.Add("title", null);
-            attachementSub.Add("content", null);
-            attachementSub.Add("mediaList", null);
-            extensionSuBArray.Add("link", null);
-            extensionSuBArray.Add("mediaType", 100);
-            extensionSuBArray.Add("mediaUploadValue", null);
-            extensionSuBArray.Add("mediaUploadValueContentType", "image/jpg");
-            extensionSub.Add("linkSnippetList", new JArray(extensionSuBArray));
-            data.Add("attachedObject", attachementSub);
-            data.Add("extensions", extensionSub);
 
             switch (fileType)
             {
@@ -2344,6 +2312,7 @@ public Task send_file_message(string chatId, byte[] file, Types.upload_File_Type
                     data.Add("enableUhqEnabled", true);
                     break;
                 case Types.upload_File_Types.Audio:
+                    data.Remove("type");
                     data.Add("type", 2);
                     data.Add("mediaType", 110);
                     break;

Amino.NET/SubClient.cs

@@ -118,7 +118,7 @@ public Task generate_invite_code(int duration = 0, bool force = true)
             data.Add("timestamp", helpers.GetTimestamp() * 1000);
             request.AddJsonBody(JsonConvert.SerializeObject(data));
             request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(JsonConvert.SerializeObject(data)));
-            var response = client.ExecuteGet(request);
+            var response = client.ExecutePost(request);
             if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
             if (debug) { Trace.WriteLine(response.Content); }
             return Task.CompletedTask;
@@ -1194,6 +1194,7 @@ public Task send_file_message(string chatId, byte[] file, Types.upload_File_Type
                     data.Add("enableUhqEnabled", true);
                     break;
                 case Types.upload_File_Types.Audio:
+                    data.Remove("type");
                     data.Add("type", 2);
                     data.Add("mediaType", 110);
                     break;