fix conflict

discord/__init__.py

@@ -13,11 +13,7 @@ __title__ = 'discord'
 __author__ = 'Rapptz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015-present Rapptz'
-<<<<<<< HEAD
-__version__ = '1.7.1.7'
-=======
-__version__ = '2.0.0.7a'
->>>>>>> 523e35e4f3c3c49d4e471359f9fb559242bbecc8
+__version__ = '1.7.3.7'
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
@@ -63,10 +59,6 @@ from .interactions import *
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro enhanced releaselevel serial')
 
-<<<<<<< HEAD
-version_info = VersionInfo(major=1, minor=7, micro=1, enhanced=7, releaselevel='final', serial=0)
-=======
-version_info = VersionInfo(major=2, minor=0, micro=0, enhanced=7, releaselevel='alpha', serial=0)
->>>>>>> 523e35e4f3c3c49d4e471359f9fb559242bbecc8
+version_info = VersionInfo(major=1, minor=7, micro=3, enhanced=7, releaselevel='final', serial=0)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

discord/channel.py

@@ -1262,6 +1262,7 @@ class DMChannel(discord.abc.Messageable, Hashable):
         """
 
         base = Permissions.text()
+        base.read_messages = True
         base.send_tts_messages = False
         base.manage_messages = False
         return base
@@ -1435,6 +1436,7 @@ class GroupChannel(discord.abc.Messageable, Hashable):
         """
 
         base = Permissions.text()
+        base.read_messages = True
         base.send_tts_messages = False
         base.manage_messages = False
         base.mention_everyone = True

discord/enums.py

@@ -368,6 +368,8 @@ class AuditLogAction(Enum):
             return 'webhook'
         elif v < 70:
             return 'emoji'
+        elif v == 73:
+            return 'channel'
         elif v < 80:
             return 'message'
         elif v < 90:

discord/message.py

@@ -1111,8 +1111,10 @@ class Message(Hashable):
 
         Publishes this message to your announcement channel.
 
+        You must have the :attr:`~Permissions.send_messages` permission to do this.
+
         If the message is not your own then the :attr:`~Permissions.manage_messages`
-        permission is needed.
+        permission is also needed.
 
         Raises
         -------

discord/sticker.py

@@ -76,7 +76,7 @@ class Sticker(Hashable):
         self.id = int(data['id'])
         self.name = data['name']
         self.description = data['description']
-        self.pack_id = int(data['pack_id'])
+        self.pack_id = int(data.get('pack_id', 0))
         self.format = try_enum(StickerType, data['format_type'])
         self.image = data['asset']
 

docs/api.rst

@@ -267,7 +267,7 @@ to handle it, which defaults to print a traceback and ignoring the exception.
 
     If you want exception to propagate out of the :class:`Client` class
     you can define an ``on_error`` handler consisting of a single empty
-    :ref:`py:raise`.  Exceptions raised by ``on_error`` will not be
+    :ref:`raise statement <py:raise>`. Exceptions raised by ``on_error`` will not be
     handled in any way by :class:`Client`.
 
     .. note::
@@ -834,7 +834,7 @@ to handle it, which defaults to print a traceback and ignoring the exception.
     :type member: :class:`Member`
     :param before: The voice state prior to the changes.
     :type before: :class:`VoiceState`
-    :param after: The voice state after to the changes.
+    :param after: The voice state after the changes.
     :type after: :class:`VoiceState`
 
 .. function:: on_member_ban(guild, user)

docs/whats_new.rst

@@ -11,6 +11,29 @@ Changelog
 This page keeps a detailed human friendly rendering of what's new and changed
 in specific versions.
 
+.. _vp1p7p3:
+
+v1.7.3
+--------
+
+Bug Fixes
+~~~~~~~~~~
+
+- Fix a crash involving guild uploaded stickers
+- Fix :meth:`DMChannel.permissions_for` not having :attr:`Permissions.read_messages` set.
+
+.. _vp1p7p2:
+
+v1.7.2
+-------
+
+Bug Fixes
+~~~~~~~~~~~
+
+- Fix ``fail_if_not_exists`` causing certain message references to not be usable within :meth:`abc.Messageable.send` and :meth:`Message.reply` (:issue:`6726`)
+- Fix :meth:`Guild.chunk` hanging when the user left the guild. (:issue:`6730`)
+- Fix loop sleeping after final iteration rather than before (:issue:`6744`)
+
 .. _vp1p7p1:
 
 v1.7.1