velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gateway: fix Request Guild Members

This commit is contained in:
Luna 2021-08-29 19:18:59 -03:00
parent eb88651424
commit 55f86393f8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
litecord/gateway/websocket.py
View File

@ -995,12 +995,14 @@ class GatewayWebsocket:
try: try:
guild_id = int(guild_id) guild_id = int(guild_id)
except (TypeError, ValueError): except (TypeError, ValueError):
log.warning("req guild members: {!r} is not an int", guild_id)
return return
limit = limit or 1000 limit = limit or 1000
exists = await self.storage.get_guild(guild_id) exists = await self.storage.get_guild(guild_id)
if not exists: if not exists:
log.warning("req guild members: {!r} is not a guild", guild_id)
return return
# limit user_ids to 1000 possible members, and try your best # limit user_ids to 1000 possible members, and try your best
@ -1010,6 +1012,9 @@ class GatewayWebsocket:
# ASSUMPTION: requesting user_ids means we don't do query. # ASSUMPTION: requesting user_ids means we don't do query.
if user_ids: if user_ids:
log.debug(
"req guild members: getting {} users in gid {}", len(user_ids), guild_id
)
members = await self.storage.get_member_multi(guild_id, user_ids) members = await self.storage.get_member_multi(guild_id, user_ids)
mids = [m["user"]["id"] for m in members] mids = [m["user"]["id"] for m in members]
@ -1035,14 +1040,14 @@ class GatewayWebsocket:
# we do not validate guild ids because it can either be a string # we do not validate guild ids because it can either be a string
# or a list of strings and cerberus does not validate that. # or a list of strings and cerberus does not validate that.
payload_copy = dict(payload) payload_copy_data = dict(payload["d"])
payload_copy["d"].pop("guild_id") payload_copy_data.pop("guild_id")
validate(payload_copy, REQ_GUILD_SCHEMA) validate({"op": 8, "d": payload_copy_data}, REQ_GUILD_SCHEMA)
data = payload["d"] data = payload["d"]
gids = data.get("guild_id") gids = data.get("guild_id")
# Discord actually sent this??
if gids is None: if gids is None:
log.warning("req guilds: invalid payload: no guild id")
return return
uids, query, limit, presences = ( uids, query, limit, presences = (