Merge branch 'development'

CHANGELOG.md

@@ -6,15 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
+# v3.8.2
+
+### Fixed
+
+- Retry with `null-discrim` if channel could not be created. ([GH #2934](https://github.com/kyb3r/modmail/issues/2934))
+- Fix update notifications.
+- Retrieve user from Discord API if user has left the server, resolving issues in `?block`. ([GH #2935](https://github.com/kyb3r/modmail/issues/2935), [PR #2936](https://github.com/kyb3r/modmail/pull/2936))
+- IDs in `<member>` commands work now.
+
 # v3.8.1
 
 ### Fixed
 
-- Additional image uploads now render properly. ([PR #2933](https://github.com/kyb3r/modmail/pull/2933)))
+- Additional image uploads now render properly. ([PR #2933](https://github.com/kyb3r/modmail/pull/2933))
 - `confirm_thread_creation` no longer raises unnecessary errors. ([GH #2931](https://github.com/kyb3r/modmail/issues/2931), [PR #2933](https://github.com/kyb3r/modmail/pull/2933))
 - Autotriggers no longer sends attachments back. ([GH #2932](https://github.com/kyb3r/modmail/issues/2932))
 
-
 # v3.8.0
 
 ### Added

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.8.1"
+__version__ = "3.8.2"
 
 
 import asyncio
@@ -1153,7 +1153,7 @@ async def on_typing(self, channel, user, _):
 
     async def handle_reaction_events(self, payload):
         user = self.get_user(payload.user_id)
-        if user.bot:
+        if user is None or user.bot:
             return
 
         channel = self.get_channel(payload.channel_id)
@@ -1519,7 +1519,7 @@ async def autoupdate(self):
                     )
                     logger.info("Bot has been updated.")
                     channel = self.log_channel
-                    if self.bot.config["update_notifications"]:
+                    if self.config["update_notifications"]:
                         await channel.send(embed=embed)
             else:
                 try:
@@ -1548,7 +1548,7 @@ async def autoupdate(self):
                         embed.set_footer(
                             text=f"Updating Modmail v{self.version} " f"-> v{latest.version}"
                         )
-                        if self.bot.config["update_notifications"]:
+                        if self.config["update_notifications"]:
                             await channel.send(embed=embed)
                     else:
                         embed = discord.Embed(
@@ -1559,7 +1559,7 @@ async def autoupdate(self):
                         embed.set_footer(
                             text=f"Updating Modmail v{self.version} " f"-> v{latest.version}"
                         )
-                        if self.bot.config["update_notifications"]:
+                        if self.config["update_notifications"]:
                             await channel.send(embed=embed)
                     await self.logout()
 

cogs/modmail.py

@@ -680,7 +680,7 @@ async def logs(self, ctx, *, user: User = None):
             thread = ctx.thread
             if not thread:
                 raise commands.MissingRequiredArgument(SimpleNamespace(name="member"))
-            user = thread.recipient
+            user = thread.recipient or await self.bot.fetch_user(thread.id)
 
         default_avatar = "https://cdn.discordapp.com/embed/avatars/0.png"
         icon_url = getattr(user, "avatar_url", default_avatar)

core/thread.py

@@ -125,18 +125,27 @@ async def setup(self, *, creator=None, category=None, initial_message=None):
                 overwrites=overwrites,
                 reason="Creating a thread channel.",
             )
-        except discord.HTTPException as e:  # Failed to create due to missing perms.
-            logger.critical("An error occurred while creating a thread.", exc_info=True)
-            self.manager.cache.pop(self.id)
-
-            embed = discord.Embed(color=self.bot.error_color)
-            embed.title = "Error while trying to create a thread."
-            embed.description = str(e)
-            embed.add_field(name="Recipient", value=recipient.mention)
-
-            if self.bot.log_channel is not None:
-                await self.bot.log_channel.send(embed=embed)
-            return
+        except discord.HTTPException as e:
+            # try again but null-discrim (name could be banned)
+            try:
+                channel = await self.bot.modmail_guild.create_text_channel(
+                    name=format_channel_name(recipient, self.bot.modmail_guild, force_null=True),
+                    category=category,
+                    overwrites=overwrites,
+                    reason="Creating a thread channel.",
+                )
+            except discord.HTTPException as e:  # Failed to create due to missing perms.
+                logger.critical("An error occurred while creating a thread.", exc_info=True)
+                self.manager.cache.pop(self.id)
+
+                embed = discord.Embed(color=self.bot.error_color)
+                embed.title = "Error while trying to create a thread."
+                embed.description = str(e)
+                embed.add_field(name="Recipient", value=recipient.mention)
+
+                if self.bot.log_channel is not None:
+                    await self.bot.log_channel.send(embed=embed)
+                return
 
         self._channel = channel
 

core/utils.py

@@ -47,7 +47,7 @@ def strtobool(val):
         raise
 
 
-class User(commands.IDConverter):
+class User(commands.MemberConverter):
     """
     A custom discord.py `Converter` that
     supports `Member`, `User`, and string ID's.
@@ -339,9 +339,12 @@ def escape_code_block(text):
     return re.sub(r"```", "`\u200b``", text)
 
 
-def format_channel_name(author, guild, exclude_channel=None):
+def format_channel_name(author, guild, exclude_channel=None, force_null=False):
     """Sanitises a username for use with text channel names"""
     name = author.name.lower()
+    if force_null:
+        name = "null"
+
     name = new_name = (
         "".join(l for l in name if l not in string.punctuation and l.isprintable()) or "null"
     ) + f"-{author.discriminator}"