Drop and Clip Update #2 (#202)

* updated drops, now uses drop/clip description in autocomplete as well

* added a few clips

Co-authored-by: jp00p <asimovsghost@gmail.com>

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: v1.2.1
-appVersion: v1.2.1
+version: v1.2.2
+appVersion: v1.2.2

commands/clip.py

@@ -11,8 +11,14 @@
 f.close()
 
 async def clip_autocomplete(ctx:discord.AutocompleteContext):
-  clip_keys = clip_data.keys()
-  return [key for key in clip_keys if ctx.value.lower() in key.lower()]
+  results = []
+  for clip_key in clip_data.keys():
+    clip_info = clip_data[clip_key]
+    clip_description = clip_info["description"]
+    if ctx.value.lower() in clip_key.lower() or ctx.value.lower() in clip_description:
+      results.append(clip_key)
+
+  return results
 
 # Create drop Slash Command Group
 clip = bot.create_group("clip", "Clip Commands!")

commands/drop.py

@@ -11,9 +11,14 @@
 f.close()
 
 async def drop_autocomplete(ctx:discord.AutocompleteContext):
-  drop_keys = drop_data.keys()
-  return [key for key in drop_keys if ctx.value.lower() in key.lower()]
-  # return drop_data.keys()
+  results = []
+  for drop_key in drop_data.keys():
+    drop_info = drop_data[drop_key]
+    drop_description = drop_info["description"]
+    if ctx.value.lower() in drop_key.lower() or ctx.value.lower() in drop_description:
+      results.append(drop_key)
+
+  return results
 
 # Create drop Slash Command Group
 drop = bot.create_group("drop", "Drop Commands!")

data/clips.json

@@ -1,17 +1,27 @@
 {
+  "AGIMUS Reigns!": {
+    "file": "data/clips/agimusreigns.mp4",
+    "description": "AGIMUS reigns with this ship's materials I will produce a whole fleet of murder drones this planet nay this system will be mine you fool you trusted me",
+    "url": "https://i.imgur.com/uiacPCt.mp4"
+  },
+  "AGIMUS YESSS!": {
+    "file": "data/clips/agimusyes.mp4",
+    "description": "AGIMUS yes",
+    "url": "https://i.imgur.com/KxfDkTT.mp4"
+  },
   "Data - It Is Green!": {
     "file": "data/clips/dataitisgreen.mp4",
     "description": "Data it is green",
     "url": "https://i.imgur.com/d1bZLNC.mp4"
   },
   "Data - It Is Revolting!": {
     "file": "data/clips/dataitisrevolting.mp4",
-    "description": "Data it is its revolting green",
+    "description": "Data it is its revolting",
     "url": "https://i.imgur.com/I9mvDej.mp4"
   },
   "Data - Oh Shit!": {
     "file": "data/clips/dataohshit.mp4",
-    "description": "Data Ohhhh Shit!",
+    "description": "Data Ohhhh Shit",
     "url": "https://i.imgur.com/GH7Dy2J.mp4"
   },
   "Data - Yesss!": {
@@ -44,6 +54,11 @@
     "description": "Picard Damn You",
     "url": "https://i.imgur.com/vuDmv7F.mp4"
   },
+  "Picard - Get Off My Bridge": {
+    "file": "data/clips/picardgetoffmybridge.mp4",
+    "description": "Picard get off my bridge",
+    "url": "https://i.imgur.com/ZABuj44.mp4"
+  },
   "Picard - Engage!": {
     "file": "data/clips/picardengage.mp4",
     "description": "Picard Engage",

data/drops.json

@@ -21,9 +21,14 @@
   },
   "Ben's Gonna Talk About Africa": {
     "file": "data/drops/bensgonnatalkaboutafrica.mp4",
-    "description": "Ben is Ben's Going To Gonna Talk About Africa.",
+    "description": "Ben is Ben's Going To Gonna Talk About Africa song",
     "url": "https://i.imgur.com/UyqYbwe.mp4"
   },
+  "Buddy Husnock": {
+    "file": "data/drops/buddyhusnock.mp4",
+    "description": "Buddy Husnock Weezer Buddy Holly parody song",
+    "url": "https://i.imgur.com/jHNoqFg.mp4"
+  },
   "Bible Study": {
     "file": "data/drops/biblestudy.mp4",
     "description": "Bible Study. The way god wants it.",
@@ -174,6 +179,11 @@
     "description": "Madlibs",
     "url": "https://i.imgur.com/a3AAZ0r.mp4"
   },
+  "Man In The Mirror (Time Beam Version)": {
+    "file": "data/drops/maninthemirror.mp4",
+    "description": "Man In The Mirror time beam parody song",
+    "url": "https://i.imgur.com/dZV54k7.mp4"
+  },
   "Mayqueese": {
     "file": "data/drops/mayqueese.mp4",
     "description": "Mayqueese, Maquis",
@@ -244,6 +254,11 @@
     "description": "Raincheck Segment",
     "url": "https://i.imgur.com/UAXeJQ8.mp4"
   },
+  "Return of Dukat": {
+    "file": "data/drops/returnofdukat.mp4",
+    "description": "Return of Dukat song",
+    "url": "https://i.imgur.com/SmMridO.mp4"
+  },
   "Schismd": {
     "file": "data/drops/schismd.mp4",
     "description": "Schismd Schismed",