move to disnake, add basic forum support and adapt to various minor changes

Author: AEnterprise

GearBot/Bot/GearBot.py

@@ -3,7 +3,7 @@
 from asyncio import Queue
 from collections import deque
 
-from discord.ext.commands import AutoShardedBot
+from disnake.ext.commands import AutoShardedBot
 from prometheus_client import CollectorRegistry
 
 from Bot import TheRealGearBot

GearBot/Bot/TheRealGearBot.py

@@ -12,13 +12,13 @@
 
 import aiohttp
 import aioredis
-import discord
+import disnake
 import sentry_sdk
 from aiohttp import ClientOSError, ServerDisconnectedError
-from discord import Activity, Embed, Colour, Message, TextChannel, Forbidden, ConnectionClosed, Guild, NotFound
-from discord.abc import PrivateChannel
-from discord.ext import commands
-from discord.ext.commands import UnexpectedQuoteError, ExtensionAlreadyLoaded, InvalidEndOfQuotedStringError
+from disnake import Activity, Embed, Colour, Message, TextChannel, Forbidden, ConnectionClosed, Guild, NotFound
+from disnake.abc import PrivateChannel
+from disnake.ext import commands
+from disnake.ext.commands import UnexpectedQuoteError, ExtensionAlreadyLoaded, InvalidEndOfQuotedStringError
 
 from Util import Configuration, GearbotLogging, Emoji, Pages, Utils, Translator, InfractionUtils, MessageUtils, \
     server_info, DashConfig

GearBot/Cogs/Admin.py

@@ -6,9 +6,9 @@
 import datetime
 from time import time
 
-import discord
-from discord.ext import commands, tasks
-from discord.utils import time_snowflake
+import disnake
+from disnake.ext import commands, tasks
+from disnake.utils import time_snowflake
 
 from Bot.TheRealGearBot import fill_cache
 from Cogs.BaseCog import BaseCog
@@ -54,7 +54,7 @@ async def upgrade(self, ctx):
     @commands.command()
     async def setstatus(self, ctx, type:int, *, status:str):
         """Sets a playing/streaming/listening/watching status"""
-        await self.bot.change_presence(activity=discord.Activity(name=status, type=type))
+        await self.bot.change_presence(activity=disnake.Activity(name=status, type=type))
         await ctx.send("Status updated")
 
     @commands.command()
@@ -129,7 +129,7 @@ async def post_info(self, ctx, name):
         with open(f"{name}.txt", "r") as file:
             pages = Pages.paginate("".join(file.readlines()), 500, 2000)
             await ctx.channel.purge(limit=len(pages) + 2)
-            await ctx.send(file=discord.File(f"{name}.png"))
+            await ctx.send(file=disnake.File(f"{name}.png"))
             for page in pages:
                 await ctx.send(page)
 
@@ -196,7 +196,7 @@ async def thread_migration(self, ctx):
                                 current.update(use_threads=False, use_private_threads=False)
                                 if not current.is_empty():
                                     await category.set_permissions(role, reason='thread release migration',overwrite=current)
-                            except discord.Forbidden:
+                            except disnake.Forbidden:
                                 await asyncio.sleep(0.1)
 
                     # sleep a bit so we have time to receive the update events
@@ -210,7 +210,7 @@ async def thread_migration(self, ctx):
                                     current.update(use_threads=False, use_private_threads=False)
                                     if not current.is_empty():
                                         await channel.set_permissions(role, reason='thread release migration',overwrite=current)
-                                except discord.Forbidden:
+                                except disnake.Forbidden:
                                     pass
         await MessageUtils.send_to(ctx, 'YES', 'Thread migration completed!', translate=False)
 

GearBot/Cogs/AntiRaid.py

@@ -2,8 +2,8 @@
 import time
 import datetime
 
-import discord
-from discord.ext import commands
+import disnake
+from disnake.ext import commands
 
 from Cogs.BaseCog import BaseCog
 from Util import Configuration, GearbotLogging, MessageUtils
@@ -23,7 +23,7 @@ def __init__(self, bot):
         }
 
     @commands.Cog.listener()
-    async def on_member_join(self, member: discord.Member):
+    async def on_member_join(self, member: disnake.Member):
         raid_settings = Configuration.get_var(member.guild.id, "RAID_HANDLING")
         if not raid_settings["ENABLED"]:
             return

GearBot/Cogs/AntiSpam.py

@@ -4,19 +4,19 @@
 from asyncio import CancelledError
 import hashlib
 
-import discord
+import disnake
 import emoji
 
 import time
 from collections import deque
 
-from discord import Object, Forbidden, NotFound, RawMessageDeleteEvent
-from discord.channel import TextChannel
-from discord.ext import commands
-from discord.guild import Guild
-from discord.member import Member
-from discord.message import Message
-from discord.utils import snowflake_time
+from disnake import Object, Forbidden, NotFound, RawMessageDeleteEvent
+from disnake.channel import TextChannel
+from disnake.ext import commands
+from disnake.guild import Guild
+from disnake.member import Member
+from disnake.message import Message
+from disnake.utils import snowflake_time
 
 from Bot import TheRealGearBot
 from Cogs.BaseCog import BaseCog
@@ -455,7 +455,7 @@ async def on_raw_message_delete(self, data: RawMessageDeleteEvent):
 
 
 
-    async def handle_failed_ping(self, message: discord.Message, amount):
+    async def handle_failed_ping(self, message: disnake.Message, amount):
         if self.is_exempt(message.guild.id, message.author) or message.author.bot or message.webhook_id is not None:
             return  # don't action except users
         buckets = Configuration.get_var(message.guild.id, "ANTI_SPAM", "BUCKETS", [])

GearBot/Cogs/BCVersionChecker.py

@@ -6,9 +6,9 @@
 from concurrent.futures import CancelledError
 
 import aiohttp
-import discord
-from discord import Embed, File
-from discord.ext import commands
+import disnake
+from disnake import Embed, File
+from disnake.ext import commands
 
 from Cogs.BaseCog import BaseCog
 from Util import GearbotLogging, VersionInfo, Permissioncheckers, Configuration, Utils, Emoji, Pages
@@ -52,7 +52,7 @@ async def latest(self, ctx:commands.Context, version=None):
                     latestBCCinfo = await self.getVersionDetails("BuildCraftCompat", latestBCC)
                     info = f"{info}\n\nBuildcraft Compat {latestBCC}:\n[Changelog](https://www.mod-buildcraft.com/pages/buildinfo/BuildCraftCompat/changelog/{latestBCC}.html) | [Blog]({latestBCCinfo['blog_entry'] if 'blog_entry' in latestBCCinfo else 'https://www.mod-buildcraft.com'}) | [Direct download]({latestBCCinfo['downloads']['main']})"
 
-                embed = discord.Embed(colour=discord.Colour(0x54d5ff), timestamp=datetime.datetime.utcfromtimestamp(time.time()),
+                embed = disnake.Embed(colour=disnake.Colour(0x54d5ff), timestamp=datetime.datetime.utcfromtimestamp(time.time()),
                                       description=info)
                 embed.set_author(name=f"BuildCraft releases for {version}", url="https://www.mod-buildcraft.com/pages/download.html", icon_url="https://i.imgur.com/YKGkDDZ.png")
                 await ctx.send(embed=embed)
@@ -81,21 +81,21 @@ async def cleancache(self, ctx):
     # @Permissioncheckers.devOnly()
     # async def request_testing(self, ctx:commands.Context, roleName):
     #     """Make a role pingable for announcements"""
-    #     role = discord.utils.find(lambda r: r.name == roleName, ctx.guild.roles)
+    #     role = disnake.utils.find(lambda r: r.name == roleName, ctx.guild.roles)
     #     if role is None:
     #         await ctx.send("Unable to find that role")
     #     else:
     #         await role.edit(mentionable=True)
     #         await ctx.send("Role is now mentionable and awaiting your announcement")
     #
-    #         def check(message:discord.Message):
+    #         def check(message:disnake.Message):
     #             return role in message.role_mentions
     #         until = datetime.datetime.now() + datetime.timedelta(minutes=1)
     #
     #         done = False
     #         while not done:
     #             try:
-    #                 message:discord.Message = await self.bot.wait_for('message', check=check, timeout=(until - datetime.datetime.now()).seconds)
+    #                 message:disnake.Message = await self.bot.wait_for('message', check=check, timeout=(until - datetime.datetime.now()).seconds)
     #                 if message.author == ctx.author:
     #                     await message.pin()
     #                     done = True
@@ -129,7 +129,7 @@ async def updater(cog:BCVersionChecker):
                     highestMC = VersionInfo.getLatest(cog.BC_VERSION_LIST.keys())
                     latestBC = VersionInfo.getLatest(cog.BC_VERSION_LIST[highestMC])
                     generalID = 309218657798455298
-                    channel:discord.TextChannel = cog.bot.get_channel(generalID)
+                    channel:disnake.TextChannel = cog.bot.get_channel(generalID)
                     old_latest = Configuration.get_persistent_var("latest_bc", "0.0.0")
                     Configuration.set_persistent_var("latest_bc", latestBC) # save already so we don't get stuck and keep trying over and over if something goes wrong
                     if channel is not None and latestBC != old_latest:
@@ -195,7 +195,7 @@ async def updater(cog:BCVersionChecker):
             cog.bot.errors = cog.bot.errors + 1
             GearbotLogging.error("Something went wrong in the BC version checker task")
             GearbotLogging.error(traceback.format_exc())
-            embed = discord.Embed(colour=discord.Colour(0xff0000),
+            embed = disnake.Embed(colour=disnake.Colour(0xff0000),
                                   timestamp=datetime.datetime.utcfromtimestamp(time.time()))
             embed.set_author(name="Something went wrong in the BC version checker task:")
             embed.add_field(name="Exception", value=str(ex))

GearBot/Cogs/BaseCog.py

@@ -1,4 +1,4 @@
-from discord.ext import commands
+from disnake.ext import commands
 
 from Bot.GearBot import GearBot
 from Util import Permissioncheckers

GearBot/Cogs/Basic.py

@@ -3,10 +3,10 @@
 import time
 import datetime
 
-import discord
-from discord import Embed
-from discord.ext import commands
-from discord.ext.commands import clean_content, BadArgument
+import disnake
+from disnake import Embed
+from disnake.ext import commands
+from disnake.ext.commands import clean_content, BadArgument
 
 from Cogs.BaseCog import BaseCog
 from Util import Configuration, Pages, HelpGenerator, Emoji, Translator, Utils, GearbotLogging, \
@@ -45,7 +45,7 @@ async def about(self, ctx):
         self_messages = str(self.bot.self_messages)
         total = str(sum(len(guild.members) for guild in self.bot.guilds))
         unique = str(len(self.bot.users))
-        embed = discord.Embed(colour=discord.Colour(0x00cea2),
+        embed = disnake.Embed(colour=disnake.Colour(0x00cea2),
                               timestamp=datetime.datetime.utcfromtimestamp(time.time()).replace(
                                   tzinfo=datetime.timezone.utc),
                               description=f"Stats for cluster {self.bot.cluster}\n" +
@@ -74,7 +74,7 @@ async def about(self, ctx):
 
         click_here = Translator.translate('click_here', ctx)
         embed.add_field(name=Translator.translate('support_server', ctx),
-                        value=f"[{click_here}](https://discord.gg/vddW3D9)")
+                        value=f"[{click_here}](https://disnake.gg/vddW3D9)")
         embed.add_field(name=Translator.translate('website', ctx), value=f"[{click_here}](https://gearbot.rocks)")
         embed.add_field(name=f"Github", value=f"[{click_here}](https://github.com/gearbot/GearBot)")
         embed.set_footer(text=self.bot.user.name, icon_url=self.bot.user.avatar.url)
@@ -110,7 +110,7 @@ async def quote(self, ctx: commands.Context, *, message: Message):
                     attachments = await LoggedAttachment.filter(message_id=message.id)
                     if len(attachments) == 1:
                         attachment = attachments[0]
-                    embed = discord.Embed(colour=discord.Color(0xd5fff),
+                    embed = disnake.Embed(colour=disnake.Color(0xd5fff),
                                           timestamp=message.created_at)
                     if message.content is None or message.content == "":
                         if attachment is not None:
@@ -122,7 +122,7 @@ async def quote(self, ctx: commands.Context, *, message: Message):
                                                 value=url)
                     else:
                         description = message.content
-                        embed = discord.Embed(colour=discord.Color(0xd5fff), description=description,
+                        embed = disnake.Embed(colour=disnake.Color(0xd5fff), description=description,
                                               timestamp=message.created_at)
                         embed.add_field(name="​",
                                         value=f"[Jump to message]({message.jump_url})")
@@ -185,7 +185,7 @@ async def self_role(self, ctx: commands.Context, *, role: str = None):
                             await ctx.author.add_roles(role)
                             await ctx.send(
                                 Translator.translate("role_joined", ctx, role_name=role.name, user=ctx.author))
-                    except discord.Forbidden:
+                    except disnake.Forbidden:
                         await ctx.send(
                             f"{Emoji.get_chat_emoji('NO')} {Translator.translate('role_too_high_add', ctx, role=role.name)}")
                 else:
@@ -213,7 +213,7 @@ async def uid(self, ctx, *, text: str):
             await MessageUtils.send_to(ctx, "NO", "no_uids_found")
 
     @commands.Cog.listener()
-    async def on_guild_role_delete(self, role: discord.Role):
+    async def on_guild_role_delete(self, role: disnake.Role):
         roles = Configuration.get_var(role.guild.id, "ROLES", "SELF_ROLES")
         if role.id in roles:
             roles.remove(role.id)

GearBot/Cogs/Censor.py

@@ -3,10 +3,10 @@
 from urllib import parse
 from urllib.parse import urlparse
 
-import discord
+import disnake
 import emoji
-from discord import DMChannel
-from discord.ext import commands
+from disnake import DMChannel
+from disnake.ext import commands
 
 from Cogs.BaseCog import BaseCog
 from Util import Configuration, GearbotLogging, Permissioncheckers, Utils, MessageUtils, Translator
@@ -23,7 +23,7 @@ def __init__(self, bot):
         self.regexes = dict()
 
     @commands.Cog.listener()
-    async def on_message(self, message: discord.Message):
+    async def on_message(self, message: disnake.Message):
         if message.guild is None or message.webhook_id is not None or message.channel is None or isinstance(message.channel, DMChannel) or not Configuration.get_var(message.channel.guild.id, "CENSORING", "ENABLED") or self.bot.user.id == message.author.id:
             return
         member = await Utils.get_member(self.bot, message.guild, message.author.id, fetch_if_missing=True)
@@ -36,7 +36,7 @@ async def on_message(self, message: discord.Message):
         await self.check_message(member, message.content, message.channel, message.id, False, reply, message.attachments)
 
     @commands.Cog.listener()
-    async def on_raw_message_edit(self, event: discord.RawMessageUpdateEvent):
+    async def on_raw_message_edit(self, event: disnake.RawMessageUpdateEvent):
         channel = self.bot.get_channel(int(event.data["channel_id"]))
         m = await MessageUtils.get_message_data(self.bot, event.message_id)
         reply = None
@@ -51,7 +51,7 @@ async def on_raw_message_edit(self, event: discord.RawMessageUpdateEvent):
             if (permissions.read_messages and permissions.read_message_history) or permissions.administrator:
                 try:
                     message = await channel.fetch_message(event.message_id)
-                except (discord.NotFound, discord.Forbidden): # we should never get forbidden, be we do, somehow
+                except (disnake.NotFound, disnake.Forbidden): # we should never get forbidden, be we do, somehow
                     return
                 else:
                     author_id = message.author.id
@@ -85,8 +85,8 @@ async def check_message(self, member, content, channel, message_id, edit, reply,
             codes = INVITE_MATCHER.findall(decoded_content)
             for code in codes:
                 try:
-                    invite: discord.Invite = await self.bot.fetch_invite(code)
-                except discord.NotFound:
+                    invite: disnake.Invite = await self.bot.fetch_invite(code)
+                except disnake.NotFound:
                     await self.censor_invite(member, message_id, channel, code, "INVALID INVITE", content, edit, reply, attachments)
                     return
                 if invite.guild is None:
@@ -163,8 +163,8 @@ async def censor_message(self, message_id, content, channel, member, bad, key=""
         if p.manage_messages or p.administrator:
             try:
                 self.bot.deleted_messages.append(message_id)
-                await channel.delete_messages([discord.Object(message_id)])
-            except discord.NotFound as ex:
+                await channel.delete_messages([disnake.Object(message_id)])
+            except disnake.NotFound as ex:
                 pass
             else:
                 GearbotLogging.log_key(channel.guild.id, f'censored_message{key}{e}', user=member, user_id=member.id,
@@ -173,7 +173,7 @@ async def censor_message(self, message_id, content, channel, member, bad, key=""
         else:
             GearbotLogging.log_key(channel.guild.id, f'censored_message_failed{key}{e}', user=member,
                                    user_id=member.id, message=clean_message, sequence=bad,
-                                   link='https://discord.com/channels/{0}/{1}/{2}'.format(channel.guild.id, channel.id, message_id),
+                                   link='https://disnake.com/channels/{0}/{1}/{2}'.format(channel.guild.id, channel.id, message_id),
                                    reply=reply_str, attachments=attachments_str)
         self.bot.dispatch("user_censored", messageholder(message_id, member, channel, channel.guild))
 
@@ -202,7 +202,7 @@ async def censor_invite(self, member, message_id, channel, code, server_name, co
         clean_message = Utils.trim_message(clean_message, 1600 - len(attachments_str) - len(reply_str))
         try:
             if channel.permissions_for(channel.guild.me).manage_messages:
-                await channel.delete_messages([discord.Object(message_id)])
+                await channel.delete_messages([disnake.Object(message_id)])
                 GearbotLogging.log_key(member.guild.id, f'censored_invite{e}', user=clean_name, code=code, message=clean_message,
                                        server_name=server_name, user_id=member.id,
                                        channel=channel.mention, attachments=attachments_str,
@@ -214,7 +214,7 @@ async def censor_invite(self, member, message_id, channel, code, server_name, co
                                        reply=reply_str)
                 if message_id in self.bot.deleted_messages:
                     self.bot.deleted_messages.remove(message_id)
-        except discord.NotFound:
+        except disnake.NotFound:
             # we failed? guess we lost the race, log anyways
             GearbotLogging.log_key(member.guild.id, f'invite_censor_fail{e}', user=clean_name, code=code,
                                    message=clean_message, server_name=server_name, user_id=member.id,