Rolled back discord.py version

The hack initially used to access discord slash commands when they were released no longer works in the most recent version of discord.py, so an earlier version is now used.

- Updated Dockerfile to python 3.11.2
- Added .dockerignore
- Refactored on_socket_response to reduce indentation

Author: 2kai2kai2

.dockerignore

@@ -0,0 +1,15 @@
+#Files created upon testing
+**\__pycache__
+**\.vscode
+**\venv
+
+#Build
+cpp\build
+cpp\*.egg-info
+
+#Discord specifics
+**\.env
+**\*.env
+
+#Extras
+**\tools

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.1
+FROM python:3.11.2
 ADD . .
 RUN pip3 install -r requirements.txt
 CMD python3 -u EU4Bot.py

EU4Bot.py

@@ -1496,142 +1496,143 @@ async def on_guild_remove(guild: discord.Guild):
 @client.event
 async def on_socket_response(msg: Dict):
     # This is not a publically listed event, but we can intercept it to catch interactions
-    if msg["op"] == 0 and msg["t"] == "INTERACTION_CREATE":
-        # This means it's an interaction.
-        # https://discord.com/developers/docs/interactions/slash-commands#interaction
-        interaction: Dict[str, Any] = msg["d"]
-        # Verify this is for us
-        if int(interaction["application_id"]) != (await client.application_info()).id or interaction["type"] != 2:
-            # Not sure if this'll ever happen, but we're recieving an interaction not for us.
-            return
-        commandname: str = interaction["data"]["name"]
-        responseurl = f"https://discord.com/api/v8/interactions/{interaction['id']}/{interaction['token']}/callback"
-
-        async def respond(content: str, hidden: bool = False):
-            responsejson = {
-                "type": 4,
-                "data": {
-                    "content": content,
-                    "flags": 64
-                }
+    if msg["op"] != 0 or msg["t"] != "INTERACTION_CREATE":
+        return
+    # This means it's an interaction.
+    # https://discord.com/developers/docs/interactions/slash-commands#interaction
+    interaction: Dict[str, Any] = msg["d"]
+    # Verify this is for us
+    if int(interaction["application_id"]) != (await client.application_info()).id or interaction["type"] != 2:
+        # Not sure if this'll ever happen, but we're recieving an interaction not for us.
+        return
+    commandname: str = interaction["data"]["name"]
+    responseurl = f"https://discord.com/api/v8/interactions/{interaction['id']}/{interaction['token']}/callback"
+
+    async def respond(content: str, hidden: bool = False):
+        responsejson = {
+            "type": 4,
+            "data": {
+                "content": content,
+                "flags": 64
             }
-            if hidden:
-                responsejson["data"]["flags"] = 64
-            await session.post(responseurl, json=responsejson)
-
-        async def guildRequired():
-            await respond("You must be in a guild to use this command.", True)
-
-        async def permissionDenied():
-            await respond("You do not have permission to use this command.", True)
-
-        authorid: int = int(interaction["member"]["user"]["id"]
-                            if "member" in interaction else interaction["user"]["id"])
-        guild: discord.Guild = None
-        if "guild_id" in interaction:
-            guild = await dLib.findGuild(interaction["guild_id"])
-
-        if commandname.lower() == "reservations":
-            if guild is None:
-                await guildRequired()
+        }
+        if hidden:
+            responsejson["data"]["flags"] = 64
+        await session.post(responseurl, json=responsejson)
+
+    async def guildRequired():
+        await respond("You must be in a guild to use this command.", True)
+
+    async def permissionDenied():
+        await respond("You do not have permission to use this command.", True)
+
+    authorid: int = int(interaction["member"]["user"]["id"]
+                        if "member" in interaction else interaction["user"]["id"])
+    guild: discord.Guild = None
+    if "guild_id" in interaction:
+        guild = await dLib.findGuild(interaction["guild_id"])
+
+    if commandname.lower() == "reservations":
+        if guild is None:
+            await guildRequired()
+            return
+        elif not await checkResAdmin(guild, authorid):
+            await permissionDenied()
+            return
+        for channel in controlledChannels:
+            if channel.interactChannel.id == int(interaction["channel_id"]):
+                await respond("This channel already contains a controlled channel.", True)
                 return
-            elif not await checkResAdmin(guild, authorid):
-                await permissionDenied()
+        await respond("Loading Reservation Channel...")
+        c = ReserveChannel(None, await dLib.findChannel(interaction["channel_id"]))
+        await c.updateText()
+        await c.updateImg()
+        controlledChannels.append(c)
+        await session.delete(f"https://discord.com/api/v8/webhooks/{interaction['application_id']}/{interaction['token']}/messages/@original")
+    elif commandname.lower() == "asireservations":
+        if guild is None:
+            await guildRequired()
+            return
+        elif not await checkResAdmin(guild, authorid):
+            await permissionDenied()
+            return
+        for channel in controlledChannels:
+            if channel.interactChannel.id == int(interaction["channel_id"]):
+                await respond("This channel already contains a controlled channel.", True)
                 return
-            for channel in controlledChannels:
-                if channel.interactChannel.id == int(interaction["channel_id"]):
-                    await respond("This channel already contains a controlled channel.", True)
-                    return
-            await respond("Loading Reservation Channel...")
-            c = ReserveChannel(None, await dLib.findChannel(interaction["channel_id"]))
-            await c.updateText()
-            await c.updateImg()
-            controlledChannels.append(c)
-            await session.delete(f"https://discord.com/api/v8/webhooks/{interaction['application_id']}/{interaction['token']}/messages/@original")
-        elif commandname.lower() == "asireservations":
-            if guild is None:
-                await guildRequired()
+        await respond("Loading ASI Reservation Channel...")
+        c = asiresChannel(None, await dLib.findChannel(interaction["channel_id"]))
+        await c.updateText()
+        controlledChannels.append(c)
+        await session.delete(f"https://discord.com/api/v8/webhooks/{interaction['application_id']}/{interaction['token']}/messages/@original")
+    elif commandname.lower() == "stats":
+        for channel in controlledChannels:
+            if channel.interactChannel.id == int(interaction["channel_id"]):
+                await respond("This channel already contains a controlled channel.", True)
                 return
-            elif not await checkResAdmin(guild, authorid):
+        await respond("Sent stats creation details to your DMs!", True)
+        c = await statsChannel(await dLib.findUser(authorid), await dLib.findChannel(interaction["channel_id"])).asyncInit()
+        if "options" in interaction["data"]:
+            for option in interaction["data"]["options"]:
+                if option["name"] == "skanderbeg":
+                    c.skanderbeg = option["value"]
+        else:
+            # Default if not specified
+            c.skanderbeg = False
+        controlledChannels.append(c)
+    elif commandname.lower() == "defaultban":
+        if guild is None:
+            await guildRequired()
+            return
+        subcommand: Dict[str, Any] = interaction["data"]["options"]
+        string = "Something went wrong."
+        if subcommand[0]["name"] == "add":
+            if not await checkResAdmin(guild, authorid):
                 await permissionDenied()
                 return
-            for channel in controlledChannels:
-                if channel.interactChannel.id == int(interaction["channel_id"]):
-                    await respond("This channel already contains a controlled channel.", True)
-                    return
-            await respond("Loading ASI Reservation Channel...")
-            c = asiresChannel(None, await dLib.findChannel(interaction["channel_id"]))
-            await c.updateText()
-            controlledChannels.append(c)
-            await session.delete(f"https://discord.com/api/v8/webhooks/{interaction['application_id']}/{interaction['token']}/messages/@original")
-        elif commandname.lower() == "stats":
-            for channel in controlledChannels:
-                if channel.interactChannel.id == int(interaction["channel_id"]):
-                    await respond("This channel already contains a controlled channel.", True)
-                    return
-            await respond("Sent stats creation details to your DMs!", True)
-            c = await statsChannel(await dLib.findUser(authorid), await dLib.findChannel(interaction["channel_id"])).asyncInit()
-            if "options" in interaction["data"]:
-                for option in interaction["data"]["options"]:
-                    if option["name"] == "skanderbeg":
-                        c.skanderbeg = option["value"]
+            tag: str = EU4Lib.country(subcommand[0]["options"][0]["value"])
+            if tag is None:
+                string = f"Could not find country named {subcommand[0]['options'][0]['value']}."
             else:
-                # Default if not specified
-                c.skanderbeg = False
-            controlledChannels.append(c)
-        elif commandname.lower() == "defaultban":
-            if guild is None:
-                await guildRequired()
-                return
-            subcommand: Dict[str, Any] = interaction["data"]["options"]
-            string = "Something went wrong."
-            if subcommand[0]["name"] == "add":
-                if not await checkResAdmin(guild, authorid):
-                    await permissionDenied()
-                    return
-                tag: str = EU4Lib.country(subcommand[0]["options"][0]["value"])
-                if tag is None:
-                    string = f"Could not find country named {subcommand[0]['options'][0]['value']}."
-                else:
-                    GuildManager.addBan(guild, tag)
-                    string = f"Adding {EU4Lib.tagToName(tag)} to default ban list."
-                    string += "\nNew default ban list: "
-                    banlist = GuildManager.getBan(guild)
-                    for listtag in banlist:
-                        string += f"{EU4Lib.tagToName(listtag)}{'' if listtag is banlist[-1] else ', '}"
-            elif subcommand[0]["name"] == "del":
-                if not await checkResAdmin(guild, authorid):
-                    await permissionDenied()
-                    return
-                tag: str = EU4Lib.country(subcommand[0]["options"][0]["value"])
-                if tag is None:
-                    string = f"Could not find country named {subcommand[0]['options'][0]['value']}."
-                if tag is not None:
-                    GuildManager.removeBan(guild, tag)
-                    string = f"Removing {EU4Lib.tagToName(tag)} from default ban list."
-                    string += "\nNew default ban list: "
-                    banlist = GuildManager.getBan(guild)
-                    for listtag in banlist:
-                        string += f"{EU4Lib.tagToName(listtag)}{'' if listtag is banlist[-1] else ', '}"
-            elif subcommand[0]["name"] == "list":
-                string = "Default ban list: "
+                GuildManager.addBan(guild, tag)
+                string = f"Adding {EU4Lib.tagToName(tag)} to default ban list."
+                string += "\nNew default ban list: "
                 banlist = GuildManager.getBan(guild)
-                for tag in banlist:
-                    string += EU4Lib.tagToName(tag) + \
-                        ("" if tag is banlist[-1] else ", ")
-            await respond(string, True)
-        elif commandname.lower() == "adminrank":
-            if guild is None:
-                await guildRequired()
-                return
-            elif not await checkResAdmin(guild, authorid):
+                for listtag in banlist:
+                    string += f"{EU4Lib.tagToName(listtag)}{'' if listtag is banlist[-1] else ', '}"
+        elif subcommand[0]["name"] == "del":
+            if not await checkResAdmin(guild, authorid):
                 await permissionDenied()
                 return
-            newRankID: int = int(interaction["data"]["options"][0]["value"])
-            GuildManager.setAdmin(guild, newRankID)
-            await respond(f"Admin rank set to <@&{newRankID}>.", True)
-        else:
-            await respond("The bot was unable to process this command. Please report with details to the developer.", True)
+            tag: str = EU4Lib.country(subcommand[0]["options"][0]["value"])
+            if tag is None:
+                string = f"Could not find country named {subcommand[0]['options'][0]['value']}."
+            if tag is not None:
+                GuildManager.removeBan(guild, tag)
+                string = f"Removing {EU4Lib.tagToName(tag)} from default ban list."
+                string += "\nNew default ban list: "
+                banlist = GuildManager.getBan(guild)
+                for listtag in banlist:
+                    string += f"{EU4Lib.tagToName(listtag)}{'' if listtag is banlist[-1] else ', '}"
+        elif subcommand[0]["name"] == "list":
+            string = "Default ban list: "
+            banlist = GuildManager.getBan(guild)
+            for tag in banlist:
+                string += EU4Lib.tagToName(tag) + \
+                    ("" if tag is banlist[-1] else ", ")
+        await respond(string, True)
+    elif commandname.lower() == "adminrank":
+        if guild is None:
+            await guildRequired()
+            return
+        elif not await checkResAdmin(guild, authorid):
+            await permissionDenied()
+            return
+        newRankID: int = int(interaction["data"]["options"][0]["value"])
+        GuildManager.setAdmin(guild, newRankID)
+        await respond(f"Admin rank set to <@&{newRankID}>.", True)
+    else:
+        await respond("The bot was unable to process this command. Please report with details to the developer.", True)
 
 
 client.run(token)

requirements.txt

@@ -1,6 +1,6 @@
 ./cpp
 aiohttp>=3.7.4
-discord.py>=1.7.1
+discord.py==1.7.3
 Pillow>=8.3.2
 pymongo[srv]>=3.11.3
 python-dateutil>=2.8.1