Merge branch 'master' into staging/v1.0.0

README.md

@@ -4,7 +4,7 @@
 [![PyPI](https://img.shields.io/pypi/v/disco-py.svg)](https://pypi.python.org/pypi/disco-py/)
 [![TravisCI](https://img.shields.io/travis/b1naryth1ef/disco.svg)](https://travis-ci.org/b1naryth1ef/disco/)
 
-Disco is an extensive and extendable Python 2.x/3.x library for the [Discord API](https://discordapp.com/developers/docs/intro). Join the Official channel and chat [here](https://discord.gg/WMzzPec). Disco boasts the following major features:
+Disco is an extensive and extendable Python 2.x/3.x library for the [Discord API](https://discordapp.com/developers/docs/intro). Disco boasts the following major features:
 
 - Expressive, functional interface that gets out of the way
 - Built for high-performance and efficiency

disco/bot/bot.py

@@ -313,10 +313,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
+                        # Filter both the normal and nick mentions
-                        if member.nick:
-                            content = content.replace(member.mention, '', 1)
                         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

@@ -52,6 +52,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)
 

disco/util/serializer.py

@@ -21,8 +21,8 @@ class Serializer(object):
 
     @staticmethod
     def yaml():
-        from yaml import load, dump
+        from yaml import full_load, dump
-        return (load, dump)
+        return (full_load, dump)
 
     @staticmethod
     def pickle():

setup.py

@@ -32,6 +32,7 @@ setup(
     license='MIT',
     description='A Python library for Discord',
     long_description=readme,
+    long_description_content_type="text/markdown",
     include_package_data=True,
     install_requires=requirements,
     extras_require=extras_require,