Revert "Old message on update (#368)"

This reverts commit 27ccf2c9c8ce785b54595eaabcebf86db07bf5bc.

1 files changed, 25 insertions, 32 deletions

diff --git a/src/model/event.rs b/src/model/event.rs
index 03905cf..191c98f 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -847,48 +847,41 @@ pub struct MessageUpdateEvent {
 
 #[cfg(feature = "cache")]
 impl CacheUpdate for MessageUpdateEvent {
-    type Output = Message;
+    type Output = ();
 
     fn update(&mut self, cache: &mut Cache) -> Option<Self::Output> {
-        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;
-                }
+        let messages = cache.messages.get_mut(&self.channel_id)?;
+        let message = messages.get_mut(&self.id)?;
 
-                if let Some(content) = self.content.clone() {
-                    message.content = content;
-                }
+        if let Some(attachments) = self.attachments.clone() {
+            message.attachments = attachments;
+        }
 
-                if let Some(edited_timestamp) = self.edited_timestamp {
-                    message.edited_timestamp = Some(edited_timestamp);
-                }
+        if let Some(content) = self.content.clone() {
+            message.content = content;
+        }
 
-                if let Some(mentions) = self.mentions.clone() {
-                    message.mentions = mentions;
-                }
+        if let Some(edited_timestamp) = self.edited_timestamp {
+            message.edited_timestamp = Some(edited_timestamp);
+        }
 
-                if let Some(mention_everyone) = self.mention_everyone {
-                    message.mention_everyone = mention_everyone;
-                }
+        if let Some(mentions) = self.mentions.clone() {
+            message.mentions = mentions;
+        }
 
-                if let Some(mention_roles) = self.mention_roles.clone() {
-                    message.mention_roles = mention_roles;
-                }
+        if let Some(mention_everyone) = self.mention_everyone {
+            message.mention_everyone = mention_everyone;
+        }
 
-                if let Some(pinned) = self.pinned {
-                    message.pinned = pinned;
-                }
+        if let Some(mention_roles) = self.mention_roles.clone() {
+            message.mention_roles = mention_roles;
+        }
 
-                Some(item)
-            } else {
-                None
-            }
-        } else {
-            None
+        if let Some(pinned) = self.pinned {
+            message.pinned = pinned;
         }
+
+        None
     }
 }