Extend submission timeout. Remove submission object on submission timeout. Also Let user know when it isn't their submission.

cogs/message_listener/__init__.py

@@ -2,6 +2,8 @@
 Defines cog for on message listener.
 """
 
+from datetime import date
+import random
 import re
 
 from nextcord.ext import commands
@@ -22,7 +24,19 @@ class SubmissionListener(commands.Cog, name="Message Listener"):
     @commands.Cog.listener()
     async def on_message(self, message: nextcord.Message):
         """Listener for message creation. Adds score and attachments to submission."""
+        # don't want to process any messages from bot.
+        if message.author.id == self.bot.user.id:
+            return
+
         guild_id = message.guild.id
+
+        # troll addition for friends birthday
+        if guild_id == 239758371358638080 and date.today() == date(2022, 7, 31):
+            # 5% chance to send the message
+            chance = random.randint(1, 20)
+            if chance == 1:
+                await message.channel.send("Happy Birthday Chris <@642330132958281750>")
+
         if message.author.id in submission_objects:
             message_id = submission_objects[message.author.id]["message_id"]
             submission_channel_id = highscores_data.get_guild_submission_channel(guild_id)

cogs/presence/__init__.py

@@ -16,7 +16,7 @@ class BotPresence(commands.Cog, name="Bot Presence"):
         self.bot = bot
 
     @commands.Cog.listener()
-    async def on_guild_join(self):
+    async def on_guild_join(self, guild: nextcord.Guild):  # pylint: disable=unused-argument
         """Listener for Guild Join. Updated presence on guild join."""
         await self.change_presence()
 

cogs/submission/submission_views.py

@@ -236,7 +236,7 @@ class SubmissionView(nextcord.ui.View):
         bot: commands.Bot,
         submission_user: int,
         *,
-        timeout: Optional[float] = 180,
+        timeout: Optional[float] = 300,
     ):
         super().__init__(timeout=timeout)
         self._submission_user = submission_user
@@ -264,4 +264,13 @@ class SubmissionView(nextcord.ui.View):
             self.add_item(SubmitButton(self._bot))
 
     async def interaction_check(self, interaction: nextcord.Interaction) -> bool:
-        return self._submission_user == interaction.user.id
+        check = self._submission_user == interaction.user.id
+
+        if not check:
+            await interaction.send("This is not your submission.", ephemeral=True)
+
+        return check
+
+    async def on_timeout(self) -> None:
+        # remove user from submission objects after time out. Allows user to start new submission.
+        submission_objects.pop(self._submission_user)

example_config/runescape_bosses.json

@@ -1,8 +1,8 @@
 {
     "tables": {
         "The Ambassador": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -21,8 +21,8 @@
             "Spooned Log"
         ],
         "Astellarn": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -42,8 +42,8 @@
             "Spooned Log"
         ],
         "Black Stone Dragon": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -65,8 +65,8 @@
             "Spooned Log"
         ],
         "Crassian Leviathan": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -160,8 +160,8 @@
             "Spooned Log"
         ],
         "Masuta the Ascended": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -193,15 +193,15 @@
             "Spooned Log"
         ],
         "The Sanctum Guardian": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
         ],
         "Seiryu the Azure Serpent": [
-            "Kill Count",
-            "Kill Time",
+            "Solo Kill Count",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"