Merge pull request #3 from python-discord/Bump-d.py-to-latest-master-branch-changes

Bump d.py to latest master branch changes

Author: ChrisLovering

Dockerfile

@@ -4,11 +4,6 @@ FROM python:3.9-slim
 ENV PIP_NO_CACHE_DIR=false \
     POETRY_VIRTUALENVS_CREATE=false
 
-# Git is required to install a pinned version of d.py master
-RUN apt-get update && apt-get install -y \
-    git \
-    && rm -rf /var/lib/apt/lists/*
-
 # Install poetry
 RUN pip install -U poetry
 

bot/bot.py

@@ -117,7 +117,7 @@ async def send_log(self, title: str, details: str = None) -> None:
                 return
 
         embed = Embed(description=details)
-        embed.set_author(name=title, icon_url=self.user.avatar.url)
+        embed.set_author(name=title, icon_url=self.user.display_avatar.url)
 
         await dev_log.send(embed=embed)
 

bot/exts/recruitment/nominations.py

@@ -14,7 +14,7 @@
 )
 
 # When nominations are posted manually, the Discord message box standarises the unicode emojis to :thumbsup:
-NOMINATION_ENDING_TEXT = "react 👍 for approval, or 👎 for disapproval*."
+NOMINATION_ENDING_TEXT = "react :+1: for approval, or :-1: for disapproval*."
 
 
 class Nominations(commands.Cog):

bot/utils/helpers.py

@@ -62,7 +62,10 @@ def predicate(message: discord.Message) -> bool:
             return thread
 
     logger.info("Message not found in either cache, fetching all threads...")
-    for thread in await channel.active_threads():
+    for thread in await channel.guild.active_threads():
+        if thread.parent != channel:
+            continue
+
         if await _check_first_message_referencing(thread, message_id):
             logger.info("Thread found in fetched threads!")
             return thread

config-default.yml

@@ -1,6 +1,6 @@
 bot:
     prefix:         "&"
-    token:          !ENV "BOT_TOKEN"
+    token: !ENV     "BOT_TOKEN"
     name:           "Thread Bot"
 
     stats:

poetry.lock

@@ -12,11 +12,12 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "^3.9.6"
-statsd = "^=3.3.0"
-"discord.py" = { git = "https://github.com/Rapptz/discord.py.git", branch = "master", rev = "1e17b7f"}
+statsd = "^3.3.0"
+"discord.py" = {url = "https://github.com/Rapptz/discord.py/archive/master.zip"}
 loguru = "^0.5.3"
-pyyaml = "^=5.4.1"
+pyyaml = "^5.4.1"
 more-itertools = "^8.8.0"
+aiodns = "^3.0.0"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^3.9.2"