Support 'User (mention)' style mentions used by recent client updates (#171)

* Support 'User (mention)' style mentions.

* Remove conditional that should no longer be needed.

(from PR feedback)

disco/bot/bot.py

@@ -308,10 +308,9 @@ class Bot(LoggingClass):
                 if msg.guild:
                     member = msg.guild.get_member(self.client.state.me)
                     if member:
-                        # If nickname is set, filter both the normal and nick mentions
-                        if member.nick:
-                            content = content.replace(member.mention, '', 1)
+                        # Filter both the normal and nick mentions
                         content = content.replace(member.user.mention, '', 1)
+                        content = content.replace(member.user.mention_nickname, '', 1)
                 else:
                     content = content.replace(self.client.state.me.mention, '', 1)
             elif mention_everyone:

disco/types/user.py

@@ -44,6 +44,10 @@ class User(SlottedModel, with_equality('id'), with_hash('id')):
     def mention(self):
         return '<@{}>'.format(self.id)
 
+    @property
+    def mention_nickname(self):
+        return '<@!{}>'.format(self.id)
+
     def open_dm(self):
         return self.client.api.users_me_dms_create(self.id)