Updates channel.move, bot.close, emoji changes

Author: Taaku18

bot.py

@@ -519,7 +519,7 @@ async def on_connect(self):
             await self.api.validate_database_connection()
         except Exception:
             logger.debug("Logging out due to failed database connection.")
-            return await self.logout()
+            return await self.close()
 
         logger.debug("Connected to gateway.")
         await self.config.refresh()
@@ -534,7 +534,7 @@ async def on_ready(self):
 
         if self.guild is None:
             logger.error("Logging out due to invalid GUILD_ID.")
-            return await self.logout()
+            return await self.close()
 
         logger.line()
         logger.debug("Client ready.")
@@ -640,7 +640,7 @@ async def convert_emoji(self, name: str) -> str:
         ctx = SimpleNamespace(bot=self, guild=self.modmail_guild)
         converter = commands.EmojiConverter()
 
-        if name not in UNICODE_EMOJI:
+        if name not in UNICODE_EMOJI['en']:
             try:
                 name = await converter.convert(ctx, name.strip(":"))
             except commands.BadArgument as e:
@@ -1607,7 +1607,7 @@ async def autoupdate(self):
                         embed.set_footer(text=f"Updating Modmail v{self.version} " f"-> v{latest.version}")
                         if self.config["update_notifications"]:
                             await channel.send(embed=embed)
-                    await self.logout()
+                    return await self.close()
 
     async def before_autoupdate(self):
         await self.wait_for_connected()

cogs/modmail.py

@@ -322,7 +322,8 @@ async def move(self, ctx, *, arguments):
             silent_words = ["silent", "silently"]
             silent = any(word in silent_words for word in options.split())
 
-        await thread.channel.edit(category=category, sync_permissions=True)
+        await thread.channel.move(category=category, end=True, sync_permissions=True,
+                                  reason=f"{ctx.author} moved this thread.")
 
         if self.bot.config["thread_move_notify"] and not silent:
             embed = discord.Embed(

cogs/utility.py

@@ -1990,7 +1990,7 @@ async def update(self, ctx, *, flag: str = ""):
                         )
 
                     await ctx.send(embed=embed)
-                    await self.bot.logout()
+                    return await self.bot.close()
                 else:
                     embed = discord.Embed(
                         title="Already up to date",

core/clients.py

@@ -377,9 +377,8 @@ def __init__(self, bot):
         except ConfigurationError as e:
             logger.critical(
                 "Your MongoDB CONNECTION_URI might be copied wrong, try re-copying from the source again. "
-                "Otherwise noted in the following message:"
+                "Otherwise noted in the following message:\n%s", e
             )
-            logger.critical(e)
             sys.exit(0)
 
         super().__init__(bot, db)