From fd63334c82c7aeb338f61d39d1308a25929569ae Mon Sep 17 00:00:00 2001
From: "slicedlime (Mikael Hedberg)" <slicedlime@gmail.com>
Date: Fri, 20 Dec 2019 20:37:36 +0100
Subject: [PATCH] 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    | 5 ++---
 disco/types/user.py | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/disco/bot/bot.py b/disco/bot/bot.py
index 0679381..d8a3c1d 100644
--- a/disco/bot/bot.py
+++ b/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:
diff --git a/disco/types/user.py b/disco/types/user.py
index 63e9542..974233c 100644
--- a/disco/types/user.py
+++ b/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)