From a9b1417806b6dcec77ffe5a1e64764803f69a8f5 Mon Sep 17 00:00:00 2001
From: holl0wstar <theholl0wstar@gmail.com>
Date: Mon, 25 Sep 2023 00:44:25 -0300
Subject: [PATCH] Remove _patch_json and modify _post_json to support an
 optional patch argument.

---
 evennia/server/portal/discord.py | 47 ++------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/evennia/server/portal/discord.py b/evennia/server/portal/discord.py
index df4d721a5..751057f37 100644
--- a/evennia/server/portal/discord.py
+++ b/evennia/server/portal/discord.py
@@ -352,41 +352,9 @@ class DiscordClient(WebSocketClientProtocol, _BASE_SESSION_CLASS):
         """
         url = f"{DISCORD_API_BASE_URL}/{url}"
         body = FileBodyProducer(BytesIO(json.dumps(data).encode("utf-8")))
+        is_patch_request = kwargs.pop('patch', False)
         d = _AGENT.request(
-            b"POST",
-            url.encode("utf-8"),
-            Headers(
-                {
-                    "User-Agent": [DISCORD_USER_AGENT],
-                    "Authorization": [f"Bot {DISCORD_BOT_TOKEN}"],
-                    "Content-Type": ["application/json"],
-                }
-            ),
-            body,
-        )
-
-        def cbResponse(response):
-            if response.code == 200:
-                d = readBody(response)
-                d.addCallback(self.post_response)
-                return d
-            elif should_retry(response.code):
-                delay(300, self._post_json, url, data, **kwargs)
-
-        d.addCallback(cbResponse)
-
-    def _patch_json(self, url, data, **kwargs):
-        """
-        Post JSON data to a REST API endpoint
-
-        Args:
-            url (str) - The API path which is being posted to
-            data (dict) - Content to be sent
-        """
-        url = f"{DISCORD_API_BASE_URL}/{url}"
-        body = FileBodyProducer(BytesIO(json.dumps(data).encode("utf-8")))
-        d = _AGENT.request(
-            b"PATCH",
+            b"PATCH" if is_patch_request else b"POST",
             url.encode("utf-8"),
             Headers(
                 {
@@ -528,17 +496,8 @@ class DiscordClient(WebSocketClientProtocol, _BASE_SESSION_CLASS):
         """
 
         data = {"nick": text}
-        self._patch_json(f"guilds/{guild_id}/members/{user_id}", data)
-
-    def send_roles(self, current_roles, role, guild_id, user_id, **kwargs):
-        """
-        Assign the user a role on a Discord server.
-        Use with session.msg(roles=(current_roles, role, guild_id, user_id))
-        """
-
-        data = {"roles": current_roles.append(role)}
         data.update(kwargs)
-        self._post_json(f"guilds/{guild_id}/members/{user_id}", data)
+        self._post_json(f"guilds/{guild_id}/members/{user_id}", data, patch=True)
 
     def send_default(self, *args, **kwargs):
         """