Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove _patch_json and modify _post_json to support an optional patch argument.

Browse source
This commit is contained in:
holl0wstar 2023-09-25 00:44:25 -03:00
parent dbcd947b83
commit a9b1417806
1 changed files with 3 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

47
evennia/server/portal/discord.py
View file

@ -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):
"""