diff options
| author | Mishio595 <[email protected]> | 2018-07-24 17:19:22 -0600 |
|---|---|---|
| committer | Mishio595 <[email protected]> | 2018-07-24 17:19:22 -0600 |
| commit | cd3c3ececb24a7da4a4c99543cac5127f092a10a (patch) | |
| tree | ad20f6506579f47c64b8b5e06325cdd1c8f30f57 /src/model | |
| parent | Fallback to default-command if passed sub-command is wrong (diff) | |
| download | serenity-cd3c3ececb24a7da4a4c99543cac5127f092a10a.tar.xz serenity-cd3c3ececb24a7da4a4c99543cac5127f092a10a.zip | |
EventHandler::message_update with cache feature sends old message if available
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/event.rs | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/src/model/event.rs b/src/model/event.rs index c4d13ff..ff4cceb 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -848,41 +848,48 @@ pub struct MessageUpdateEvent { #[cfg(feature = "cache")] impl CacheUpdate for MessageUpdateEvent { - type Output = (); + type Output = Message; fn update(&mut self, cache: &mut Cache) -> Option<Self::Output> { - let messages = cache.messages.get_mut(&self.channel_id)?; - let message = messages.get_mut(&self.id)?; + if let Some(messages) = cache.messages.get_mut(&self.channel_id) { + if let Some(message) = messages.get_mut(&self.id) { + let item = message.clone(); - if let Some(attachments) = self.attachments.clone() { - message.attachments = attachments; - } + if let Some(attachments) = self.attachments.clone() { + message.attachments = attachments; + } - if let Some(content) = self.content.clone() { - message.content = content; - } + if let Some(content) = self.content.clone() { + message.content = content; + } - if let Some(edited_timestamp) = self.edited_timestamp { - message.edited_timestamp = Some(edited_timestamp); - } + if let Some(edited_timestamp) = self.edited_timestamp { + message.edited_timestamp = Some(edited_timestamp); + } - if let Some(mentions) = self.mentions.clone() { - message.mentions = mentions; - } + if let Some(mentions) = self.mentions.clone() { + message.mentions = mentions; + } - if let Some(mention_everyone) = self.mention_everyone { - message.mention_everyone = mention_everyone; - } + if let Some(mention_everyone) = self.mention_everyone { + message.mention_everyone = mention_everyone; + } - if let Some(mention_roles) = self.mention_roles.clone() { - message.mention_roles = mention_roles; - } + if let Some(mention_roles) = self.mention_roles.clone() { + message.mention_roles = mention_roles; + } - if let Some(pinned) = self.pinned { - message.pinned = pinned; - } + if let Some(pinned) = self.pinned { + message.pinned = pinned; + } - None + Some(item) + } else { + None + } + } else { + None + } } } |