mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-09-08 19:03:03 +00:00
Code Issues Projects Releases Wiki Activity

Redesign bulk delete events

Browse Source 
Change `parse_message_delete_bulk` to not dispatch individual
`message_delete` events, and instead `bulk_message_delete`. Also make
`raw_bulk_message` delete and `raw_message_delete` have message
objects attached.

Fixes #1807
This commit is contained in:
Vexs
2019-03-23 21:46:05 -05:00
committed by Rapptz
parent be227ebcf0
commit 9591b00dcf
3 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
discord/raw_models.py
View File

@ -35,14 +35,16 @@ class RawMessageDeleteEvent:
The guild ID where the deletion took place, if applicable.
message_id: :class:`int`
The message ID that got deleted.
cached_message: Optional[:class:`Message`]
The cached message, if found in the internal message cache.
"""
__slots__ = ('message_id', 'channel_id', 'guild_id')
__slots__ = ('message_id', 'channel_id', 'guild_id', 'cached_message')
def __init__(self, data):
self.message_id = int(data['id'])
self.channel_id = int(data['channel_id'])
self.cached_message = None
try:
self.guild_id = int(data['guild_id'])
except KeyError:
@ -59,13 +61,16 @@ class RawBulkMessageDeleteEvent:
The channel ID where the message got deleted.
guild_id: Optional[:class:`int`]
The guild ID where the message got deleted, if applicable.
cached_messages: List[:class:`Message`]
The cached messages, if found in the internal message cache.
"""
__slots__ = ('message_ids', 'channel_id', 'guild_id')
__slots__ = ('message_ids', 'channel_id', 'guild_id', 'cached_messages')
def __init__(self, data):
self.message_ids = {int(x) for x in data.get('ids', [])}
self.channel_id = int(data['channel_id'])
self.cached_messages = []
try:
self.guild_id = int(data['guild_id'])

15
discord/state.py
View File

@ -366,21 +366,22 @@ class ConnectionState:
def parse_message_delete(self, data):
raw = RawMessageDeleteEvent(data)
self.dispatch('raw_message_delete', raw)
found = self._get_message(raw.message_id)
raw.cached_message = found
self.dispatch('raw_message_delete', raw)
if found is not None:
self.dispatch('message_delete', found)
self._messages.remove(found)
def parse_message_delete_bulk(self, data):
raw = RawBulkMessageDeleteEvent(data)
found_messages = [message for message in self._messages if message.id in raw.message_ids]
raw.cached_messages = found_messages
self.dispatch('raw_bulk_message_delete', raw)
to_be_deleted = [message for message in self._messages if message.id in raw.message_ids]
for msg in to_be_deleted:
self.dispatch('message_delete', msg)
self._messages.remove(msg)
if found_messages:
self.dispatch('bulk_message_delete', found_messages)
for msg in found_messages:
self._messages.remove(msg)
def parse_message_update(self, data):
raw = RawMessageUpdateEvent(data)