Bump Discord.py to latest alpha and use BotBase from bot-core

bot/__init__.py

@@ -1,11 +1,10 @@
 import asyncio
 import os
-from functools import partial, partialmethod
 from typing import TYPE_CHECKING
 
-from discord.ext import commands
+from botcore.utils import apply_monkey_patches
 
-from bot import log, monkey_patches
+from bot import log
 
 if TYPE_CHECKING:
     from bot.bot import Bot
@@ -16,16 +15,6 @@
 if os.name == "nt":
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
-monkey_patches.patch_typing()
-
-# This patches any convertors that use PartialMessage, but not the PartialMessageConverter itself
-# as library objects are made by this mapping.
-# https://github.com/Rapptz/discord.py/blob/1a4e73d59932cdbe7bf2c281f25e32529fc7ae1f/discord/ext/commands/converter.py#L984-L1004
-commands.converter.PartialMessageConverter = monkey_patches.FixedPartialMessageConverter
-
-# Monkey-patch discord.py decorators to use the Command subclass which supports root aliases.
-# Must be patched before any cogs are added.
-commands.command = partial(commands.command, cls=monkey_patches.Command)
-commands.GroupMixin.command = partialmethod(commands.GroupMixin.command, cls=monkey_patches.Command)
+apply_monkey_patches()
 
 instance: "Bot" = None  # Global Bot instance.

bot/__main__.py

@@ -1,16 +1,80 @@
+import asyncio
+
 import aiohttp
+import discord
+from async_rediscache import RedisSession
+from botcore import StartupError
+from botcore.site_api import APIClient
+from discord.ext import commands
 
 import bot
 from bot import constants
-from bot.bot import Bot, StartupError
+from bot.bot import Bot
 from bot.log import get_logger, setup_sentry
 
 setup_sentry()
+LOCALHOST = "127.0.0.1"
+
+
+async def _create_redis_session() -> RedisSession:
+    """Create and connect to a redis session."""
+    redis_session = RedisSession(
+        address=(constants.Redis.host, constants.Redis.port),
+        password=constants.Redis.password,
+        minsize=1,
+        maxsize=20,
+        use_fakeredis=constants.Redis.use_fakeredis,
+        global_namespace="bot",
+    )
+    try:
+        await redis_session.connect()
+    except OSError as e:
+        raise StartupError(e)
+    return redis_session
+
+
+async def main() -> None:
+    """Entry async method for starting the bot."""
+    statsd_url = constants.Stats.statsd_host
+    if constants.DEBUG_MODE:
+        # Since statsd is UDP, there are no errors for sending to a down port.
+        # For this reason, setting the statsd host to 127.0.0.1 for development
+        # will effectively disable stats.
+        statsd_url = LOCALHOST
+
+    allowed_roles = list({discord.Object(id_) for id_ in constants.MODERATION_ROLES})
+    intents = discord.Intents.all()
+    intents.presences = False
+    intents.dm_typing = False
+    intents.dm_reactions = False
+    intents.invites = False
+    intents.webhooks = False
+    intents.integrations = False
+
+    async with aiohttp.ClientSession() as session:
+        bot.instance = Bot(
+            guild_id=constants.Guild.id,
+            http_session=session,
+            redis_session=await _create_redis_session(),
+            statsd_url=statsd_url,
+            command_prefix=commands.when_mentioned_or(constants.Bot.prefix),
+            activity=discord.Game(name=f"Commands: {constants.Bot.prefix}help"),
+            case_insensitive=True,
+            max_messages=10_000,
+            allowed_mentions=discord.AllowedMentions(everyone=False, roles=allowed_roles),
+            intents=intents,
+            allowed_roles=list({discord.Object(id_) for id_ in constants.MODERATION_ROLES}),
+            api_client=APIClient(
+                site_api_url=f"{constants.URLs.site_api_schema}{constants.URLs.site_api}",
+                site_api_token=constants.Keys.site_api,
+            ),
+        )
+        async with bot.instance as _bot:
+            await _bot.start(constants.Bot.token)
+
 
 try:
-    bot.instance = Bot.create()
-    bot.instance.load_extensions()
-    bot.instance.run(constants.Bot.token)
+    asyncio.run(main())
 except StartupError as e:
     message = "Unknown Startup Error Occurred."
     if isinstance(e.exception, (aiohttp.ClientConnectorError, aiohttp.ServerDisconnectedError)):