FOD Pride 2024 Badge + Minor Fixes (#530)

* tweaks, use /episodeinfo show selector for /quiz * fix for quiz * add pride badge and migration, plus Paradise City drop * bump version due to migration to v2.9.0
jp00p · Jun 1, 2024 · 709df10 · 709df10
1 parent 23fafc2
commit 709df10
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 91 deletions.
diff --git a/charts/agimus/Chart.yaml b/charts/agimus/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: agimus
 description: A helm chart for a discord bot that also runs a mysql db
 type: application
-version: v2.8.8
-appVersion: v2.8.8
+version: v2.9.0
+appVersion: v2.9.0
diff --git a/cogs/badge_tags.py b/cogs/badge_tags.py
@@ -167,11 +167,11 @@ async def callback(self, interaction:discord.Interaction):
 
 
 class TagBadgeView(discord.ui.View):
-  def __init__(self, cog, user_discord_id, badge_info):
+  def __init__(self, cog, user_discord_id, badge_info, associated_tags):
     super().__init__()
     self.cog = cog
     self.tag_ids = []
-    self.add_item(TagSelector(user_discord_id, badge_info))
+    self.add_item(TagSelector(user_discord_id, associated_tags))
     self.add_item(TagButton(user_discord_id, badge_info))
 
 
@@ -462,8 +462,9 @@ async def tag(self, ctx:discord.ApplicationContext, badge:str):
       return
 
     badge_info = await db_get_badge_info_by_name(badge)
+    associated_tags = await db_get_associated_badge_tags(ctx.author.id, badge_info['badge_filename'])
 
-    view = TagBadgeView(self, ctx.author.id, badge_info)
+    view = TagBadgeView(self, ctx.author.id, badge_info, associated_tags)
     embed = discord.Embed(
       title=badge,
       color=discord.Color.dark_purple()

diff --git a/cogs/quiz.py b/cogs/quiz.py
@@ -8,6 +8,22 @@
 
 command_config = config["commands"]["quiz start"]
 
+# Load JSON Data
+f = open(command_config["data"])
+info_data = json.load(f)
+f.close()
+
+show_choices = []
+show_keys = sorted(list(info_data.keys()), key=lambda k: info_data[k]['name'])
+for show_key in show_keys:
+  show_data = info_data[show_key]
+  if show_data["enabled"]:
+    show_choice = discord.OptionChoice(
+      name=show_data["name"],
+      value=show_key
+    )
+    show_choices.append(show_choice)
+
 class HintButton(discord.ui.Button):
   def __init__(self, cog):
     self.cog = cog
@@ -46,19 +62,8 @@ def __init__(self, bot):
 
     self.threshold = 72  # fuzz threshold
 
-    self.shows = command_config["parameters"][0]["allowed"]
-
   quiz = discord.SlashCommandGroup("quiz", "Commands for interacting with the Quiz Game")
 
-  shows = command_config["parameters"][0]["allowed"]
-  show_choices = []
-  for show in shows:
-    show_choice = discord.OptionChoice(
-      name=show["name"],
-      value=show["value"]
-    )
-    show_choices.append(show_choice)
-
   @quiz.command(
     name="start",
     description="Start a Quiz round"
@@ -186,8 +191,7 @@ async def quiz_start(self, ctx:discord.ApplicationContext, show:str):
     try:
       logger.info(f"{Fore.MAGENTA}Starting quiz!{Fore.RESET}")
       if not show:
-        s = random.choice(self.shows)
-        show = s["value"]
+        show = random.choice(show_keys)
 
       self.show = show
 

diff --git a/commands/sub_rosa.py b/commands/sub_rosa.py
@@ -19,7 +19,7 @@ async def reset(ctx:discord.ApplicationContext):
 
   previous_reset = await db_get_previous_reset()
   stats = await db_get_sub_rosa_stats()
-  total_watches = stats['total_watches']
+  total_watches = stats['total_watches'] + 1
   if total_watches >= 30 and total_watches < 40:
     total_watches = f"{total_watches}... *Thirties...*"
 
@@ -95,7 +95,7 @@ async def check(ctx:discord.ApplicationContext):
   days = lifespan.days
 
   embed = discord.Embed(
-    title=f"The Last Sub Rosa Watch Was...",
+    title=f"The Last Sub Rosa Watch...",
     description=f"was {days} {'Day' if days == 1 else 'Days'} ago... {get_emoji('beverly_horny_ghost_orgasm')}",
     color=discord.Color.dark_green()
   )

diff --git a/configuration.json b/configuration.json
@@ -339,7 +339,7 @@
       "channels": [
         "maquis-officers-club"
       ],
-      "crontab": "0 */12 * * *",
+      "crontab": "10 */6 * * *",
       "enabled": true
     },
     "hoodiversary": {
@@ -642,75 +642,8 @@
         "morns-nonstop-quiz"
       ],
       "enabled": true,
-      "data": null,
-      "parameters": [
-        {
-          "name": "show",
-          "allowed": [
-            {
-              "name": "Star Trek: The Original Series",
-              "value": "tos"
-            },
-            {
-              "name": "Star Trek: The Animated Series",
-              "value": "tas"
-            },
-            {
-              "name": "Star Trek: The Next Generation",
-              "value": "tng"
-            },
-            {
-              "name": "Star Trek: Deep Space Nine",
-              "value": "ds9"
-            },
-            {
-              "name": "Star Trek: Voyager",
-              "value": "voy"
-            },
-            {
-              "name": "Star Trek: Enterprise",
-              "value": "enterprise"
-            },
-            {
-              "name": "Star Trek: Discovery",
-              "value": "disco"
-            },
-            {
-              "name": "Star Trek: Picard",
-              "value": "picard"
-            },
-            {
-              "name": "Star Trek: Prodigy",
-              "value": "prodigy"
-            },
-            {
-              "name": "Star Trek: Strange New Worlds",
-              "value": "snw"
-            },
-            {
-              "name": "Star Trek: Lower Decks",
-              "value": "lowerdecks"
-            },
-            {
-              "name": "Friends",
-              "value": "friends"
-            },
-            {
-              "name": "Firefly",
-              "value": "firefly"
-            },
-            {
-              "name": "It's Always Sunny in Philadelphia",
-              "value": "sunny"
-            },
-            {
-              "name": "The Simpsons",
-              "value": "simpsons"
-            }
-          ],
-          "required": false
-        }
-      ]
+      "data": "data/info.json",
+      "parameters": []
     },
     "quiz report": {
       "channels": [

diff --git a/data/drops.json b/data/drops.json
@@ -464,6 +464,11 @@
     "description": "The Hunt For Red October Sean Connery",
     "url": "https://i.imgur.com/zGBAy0R.mp4"
   },
+  "Paradise City": {
+    "file": "data/drops/paradisecity.mp4",
+    "description": "Paradise City Streaming Syboktacular Share Your Pain Song Guns n Roses",
+    "url": "https://i.imgur.com/caeUN3A.mp4"
+  },
   "Photon Torpedos: Full Spread": {
     "file": "data/drops/photontorpedos.mp4",
     "description": "Photon Torpedos: Full Spread",

diff --git a/images/badges/FOD_Pride_2024.png b/images/badges/FOD_Pride_2024.png
diff --git a/migrations/v2.9.0.sql b/migrations/v2.9.0.sql
@@ -0,0 +1,2 @@
+INSERT INTO badge_info (badge_name, badge_filename, badge_url, quadrant, time_period, franchise, reference, special) VALUES ("FOD Pride 2024", "FOD_Pride_2024.png", "https://drunkshimoda.com/", "Alpha", "2100s", "The USS Hood", "Commemorating Pride Month 2024 on The USS Hood!", 1) ON DUPLICATE KEY UPDATE badge_name = badge_name;
+INSERT INTO badges (user_discord_id, badge_filename) SELECT discord_id, 'FOD_Pride_2024.png' FROM users;
diff --git a/tasks/channel_cleanup.py b/tasks/channel_cleanup.py
@@ -1,4 +1,3 @@
-import pytz
 from common import *
 
 def channel_cleanup_task(bot):