Fix build

2 files changed, 7 insertions, 7 deletions

diff --git a/src/model/channel.rs b/src/model/channel.rs
index 9478949..0c1013c 100644
--- a/src/model/channel.rs
+++ b/src/model/channel.rs
@@ -629,21 +629,21 @@ impl Message {
     /// names and everyone/here mentions cancelled.
     #[cfg(all(feature="cache", feature="methods"))]
     pub fn content_safe(&self) -> String {
-        let mut result = self.content;
+        let mut result = self.content.clone();
 
         // First replace all user mentions.
-        for u in self.mentions {
-            result = result.replace(u.mention(), u.distinct());
+        for u in &self.mentions {
+            result = result.replace(&u.mention(), &u.distinct());
         }
 
         // Then replace all role mentions.
-        for id in self.mention_roles {
+        for id in &self.mention_roles {
             let mention = id.mention();
 
             if let Some(role) = id.find() {
-                result = result.replace(mention, format!("@{}", role.name));
+                result = result.replace(&mention, &format!("@{}", role.name));
             } else {
-                result = result.replace(mention, "@deleted-role");
+                result = result.replace(&mention, "@deleted-role");
             }
         }
 
diff --git a/src/model/guild.rs b/src/model/guild.rs
index f28188f..a7a7edc 100644
--- a/src/model/guild.rs
+++ b/src/model/guild.rs
@@ -1082,7 +1082,7 @@ impl Member {
     /// Returns the DiscordTag of a Member, taking possible nickname into account.
     #[cfg(feature="methods")]
     pub fn distinct(&self) -> String {
-        format!("{}#{}", self.display_name(), self.discriminator)
+        format!("{}#{}", self.display_name(), self.user.discriminator)
     }
 
     /// Edits the member with the given data. See [`Context::edit_member`] for