Merge branch 'main' into Enforce-image-processing-concurrency

18 files changed, 130 insertions, 174 deletions

diff --git a/bot/resources/easter/april_fools_vids.json b/bot/resources/easter/april_fools_vids.json
index b2cbd07b..e1e8c70a 100644
--- a/bot/resources/easter/april_fools_vids.json
+++ b/bot/resources/easter/april_fools_vids.json
@@ -1,133 +1,130 @@
-{
-  "google": [
-    {
-      "title": "Introducing Bad Joke Detector",
-      "link": "https://youtu.be/OYcv406J_J4"
-    },
-    {
-      "title": "Introducing Google Cloud Hummus API - Find your Hummus!",
-      "link": "https://youtu.be/0_5X6N6DHyk"
-    },
-    {
-      "title": "Introducing Google Play for Pets",
-      "link": "https://youtu.be/UmJ2NBHXTqo"
-    },
-    {
-      "title": "Haptic Helpers: bringing you to your senses",
-      "link": "https://youtu.be/3MA6_21nka8"
-    },
-    {
-      "title": "Introducing Google Wind",
-      "link": "https://youtu.be/QAwL0O5nXe0"
-    },
-    {
-      "title": "Experience YouTube in #SnoopaVision",
-      "link": "https://youtu.be/DPEJB-FCItk"
-    },
-    {
-      "title": "Introducing the self-driving bicycle in the Netherlands",
-      "link": "https://youtu.be/LSZPNwZex9s"
-    },
-    {
-      "title": "Android Developer Story: The Guardian goes galactic with Android and Google Play",
-      "link": "https://youtu.be/dFrgNiweQDk"
-    },
-    {
-      "title": "Introducing new delivery technology from Google Express",
-      "link": "https://youtu.be/F0F6SnbqUcE"
-    },
-    {
-      "title": "Google Cardboard Plastic",
-      "link": "https://youtu.be/VkOuShXpoKc"
-    },
-    {
-      "title": "Google Photos: Search your photos by emoji",
-      "link": "https://youtu.be/HQtGFBbwKEk"
-    },
-    {
-      "title": "Introducing Google Actual Cloud Platform",
-      "link": "https://youtu.be/Cp10_PygJ4o"
-    },
-    {
-      "title": "Introducing Dial-Up mode",
-      "link": "https://youtu.be/XTTtkisylQw"
-    },
-    {
-      "title": "Smartbox by Inbox: the mailbox of tomorrow, today",
-      "link": "https://youtu.be/hydLZJXG3Tk"
-    },
-    {
-      "title": "Introducing Coffee to the Home",
-      "link": "https://youtu.be/U2JBFlW--UU"
-    },
-    {
-      "title": "Chrome for Android and iOS: Emojify the Web",
-      "link": "https://youtu.be/G3NXNnoGr3Y"
-    },
-    {
-      "title": "Google Maps: Pokémon Challenge",
-      "link": "https://youtu.be/4YMD6xELI_k"
-    },
-    {
-      "title": "Introducing Google Fiber to the Pole",
-      "link": "https://youtu.be/qcgWRpQP6ds"
-    },
-    {
-      "title": "Introducing Gmail Blue",
-      "link": "https://youtu.be/Zr4JwPb99qU"
-    },
-    {
-      "title": "Introducing Google Nose",
-      "link": "https://youtu.be/VFbYadm_mrw"
-    },
-    {
-      "title": "Explore Treasure Mode with Google Maps",
-      "link": "https://youtu.be/_qFFHC0eIUc"
-    },
-    {
-      "title": "YouTube's ready to select a winner",
-      "link": "https://youtu.be/H542nLTTbu0"
-    },
-    {
-      "title": "A word about Gmail Tap",
-      "link": "https://youtu.be/Je7Xq9tdCJc"
-    },
-    {
-      "title": "Introducing the Google Fiber Bar",
-      "link": "https://youtu.be/re0VRK6ouwI"
-    },
-    {
-      "title": "Introducing Gmail Tap",
-      "link": "https://youtu.be/1KhZKNZO8mQ"
-    },
-    {
-      "title": "Chrome Multitask Mode",
-      "link": "https://youtu.be/UiLSiqyDf4Y"
-    },
-    {
-      "title": "Google Maps 8-bit for NES",
-      "link": "https://youtu.be/rznYifPHxDg"
-    },
-    {
-      "title": "Being a Google Autocompleter",
-      "link": "https://youtu.be/blB_X38YSxQ"
-    },
-    {
-      "title": "Introducing Gmail Motion",
-      "link": "https://youtu.be/Bu927_ul_X0"
-    },
-    {
-      "title": "Introducing GeForce GTX G-Assist",
-      "link": "https://youtu.be/smM-Wdk2RLQ"
-    },
-    {
-      "title": "The Hovering Mouse - Project McFly | Razer",
-      "link": "https://youtu.be/IlCx5gjAmqI"
-    },
-    {
-      "title": "Be the Machine | Project Venom v2",
-      "link": "https://youtu.be/j8UJE7DoyJ8"
-    }
-  ]
-
-}
+[
+  {
+    "url": "https://youtu.be/OYcv406J_J4",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/0_5X6N6DHyk",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/UmJ2NBHXTqo",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/3MA6_21nka8",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/QAwL0O5nXe0",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/DPEJB-FCItk",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/LSZPNwZex9s",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/dFrgNiweQDk",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/F0F6SnbqUcE",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/VkOuShXpoKc",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/HQtGFBbwKEk",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/Cp10_PygJ4o",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/XTTtkisylQw",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/hydLZJXG3Tk",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/U2JBFlW--UU",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/G3NXNnoGr3Y",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/4YMD6xELI_k",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/qcgWRpQP6ds",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/Zr4JwPb99qU",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/VFbYadm_mrw",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/_qFFHC0eIUc",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/H542nLTTbu0",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/Je7Xq9tdCJc",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/re0VRK6ouwI",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/1KhZKNZO8mQ",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/UiLSiqyDf4Y",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/rznYifPHxDg",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/blB_X38YSxQ",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/Bu927_ul_X0",
+    "channel": "google"
+  },
+  {
+    "url": "https://youtu.be/smM-Wdk2RLQ",
+    "channel": "nvidia"
+  },
+  {
+    "url": "https://youtu.be/IlCx5gjAmqI",
+    "channel": "razer"
+  },
+  {
+    "url": "https://youtu.be/j8UJE7DoyJ8",
+    "channel": "razer"
+  }
+]
diff --git a/bot/resources/halloween/spookysounds/109710__tomlija__horror-gate.mp3 b/bot/resources/halloween/spookysounds/109710__tomlija__horror-gate.mp3
deleted file mode 100644
index 495f2bd1..00000000
--- a/bot/resources/halloween/spookysounds/109710__tomlija__horror-gate.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/126113__klankbeeld__laugh.mp3 b/bot/resources/halloween/spookysounds/126113__klankbeeld__laugh.mp3
deleted file mode 100644
index 538feabc..00000000
--- a/bot/resources/halloween/spookysounds/126113__klankbeeld__laugh.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/133674__klankbeeld__horror-laugh-original-132802-nanakisan-evil-laugh-08.mp3 b/bot/resources/halloween/spookysounds/133674__klankbeeld__horror-laugh-original-132802-nanakisan-evil-laugh-08.mp3
deleted file mode 100644
index 17f66698..00000000
--- a/bot/resources/halloween/spookysounds/133674__klankbeeld__horror-laugh-original-132802-nanakisan-evil-laugh-08.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/14570__oscillator__ghost-fx.mp3 b/bot/resources/halloween/spookysounds/14570__oscillator__ghost-fx.mp3
deleted file mode 100644
index 5670657c..00000000
--- a/bot/resources/halloween/spookysounds/14570__oscillator__ghost-fx.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/168650__0xmusex0__doorcreak.mp3 b/bot/resources/halloween/spookysounds/168650__0xmusex0__doorcreak.mp3
deleted file mode 100644
index 42f9e9fd..00000000
--- a/bot/resources/halloween/spookysounds/168650__0xmusex0__doorcreak.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/171078__klankbeeld__horror-scream-woman-long.mp3 b/bot/resources/halloween/spookysounds/171078__klankbeeld__horror-scream-woman-long.mp3
deleted file mode 100644
index 1cdb0f4d..00000000
--- a/bot/resources/halloween/spookysounds/171078__klankbeeld__horror-scream-woman-long.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/193812__geoneo0__four-voices-whispering-6.mp3 b/bot/resources/halloween/spookysounds/193812__geoneo0__four-voices-whispering-6.mp3
deleted file mode 100644
index 89150d57..00000000
--- a/bot/resources/halloween/spookysounds/193812__geoneo0__four-voices-whispering-6.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/237282__devilfish101__frantic-violin-screech.mp3 b/bot/resources/halloween/spookysounds/237282__devilfish101__frantic-violin-screech.mp3
deleted file mode 100644
index b5f85f8d..00000000
--- a/bot/resources/halloween/spookysounds/237282__devilfish101__frantic-violin-screech.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/249686__cylon8472__cthulhu-growl.mp3 b/bot/resources/halloween/spookysounds/249686__cylon8472__cthulhu-growl.mp3
deleted file mode 100644
index d141f68e..00000000
--- a/bot/resources/halloween/spookysounds/249686__cylon8472__cthulhu-growl.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/35716__analogchill__scream.mp3 b/bot/resources/halloween/spookysounds/35716__analogchill__scream.mp3
deleted file mode 100644
index a0614b53..00000000
--- a/bot/resources/halloween/spookysounds/35716__analogchill__scream.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/413315__inspectorj__something-evil-approaches-a.mp3 b/bot/resources/halloween/spookysounds/413315__inspectorj__something-evil-approaches-a.mp3
deleted file mode 100644
index 38374316..00000000
--- a/bot/resources/halloween/spookysounds/413315__inspectorj__something-evil-approaches-a.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/60571__gabemiller74__breathofdeath.mp3 b/bot/resources/halloween/spookysounds/60571__gabemiller74__breathofdeath.mp3
deleted file mode 100644
index f769d9d8..00000000
--- a/bot/resources/halloween/spookysounds/60571__gabemiller74__breathofdeath.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/Female_Monster_Growls_.mp3 b/bot/resources/halloween/spookysounds/Female_Monster_Growls_.mp3
deleted file mode 100644
index 8b04f0f5..00000000
--- a/bot/resources/halloween/spookysounds/Female_Monster_Growls_.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/Male_Zombie_Roar_.mp3 b/bot/resources/halloween/spookysounds/Male_Zombie_Roar_.mp3
deleted file mode 100644
index 964d685e..00000000
--- a/bot/resources/halloween/spookysounds/Male_Zombie_Roar_.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/Monster_Alien_Growl_Calm_.mp3 b/bot/resources/halloween/spookysounds/Monster_Alien_Growl_Calm_.mp3
deleted file mode 100644
index 9e643773..00000000
--- a/bot/resources/halloween/spookysounds/Monster_Alien_Growl_Calm_.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/Monster_Alien_Grunt_Hiss_.mp3 b/bot/resources/halloween/spookysounds/Monster_Alien_Grunt_Hiss_.mp3
deleted file mode 100644
index ad99cf76..00000000
--- a/bot/resources/halloween/spookysounds/Monster_Alien_Grunt_Hiss_.mp3
+++ /dev/null
diff --git a/bot/resources/halloween/spookysounds/sources.txt b/bot/resources/halloween/spookysounds/sources.txt
deleted file mode 100644
index 7df03c2e..00000000
--- a/bot/resources/halloween/spookysounds/sources.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Female_Monster_Growls_
-Male_Zombie_Roar_
-Monster_Alien_Growl_Calm_
-Monster_Alien_Grunt_Hiss_
-https://www.youtube.com/audiolibrary/soundeffects
-
-413315__inspectorj__something-evil-approaches-a
-https://freesound.org/people/InspectorJ/sounds/413315/
-
-133674__klankbeeld__horror-laugh-original-132802-nanakisan-evil-laugh-08
-https://freesound.org/people/klankbeeld/sounds/133674/
-
-35716__analogchill__scream
-https://freesound.org/people/analogchill/sounds/35716/
-
-249686__cylon8472__cthulhu-growl
-https://freesound.org/people/cylon8472/sounds/249686/
-
-126113__klankbeeld__laugh
-https://freesound.org/people/klankbeeld/sounds/126113/
-
-14570__oscillator__ghost-fx
-https://freesound.org/people/oscillator/sounds/14570/
-
-60571__gabemiller74__breathofdeath
-https://freesound.org/people/gabemiller74/sounds/60571/
-
-168650__0xmusex0__doorcreak
-https://freesound.org/people/0XMUSEX0/sounds/168650/
-
-193812__geoneo0__four-voices-whispering-6
-https://freesound.org/people/geoneo0/sounds/193812/
-
-109710__tomlija__horror-gate
-https://freesound.org/people/Tomlija/sounds/109710/
-
-171078__klankbeeld__horror-scream-woman-long
-https://freesound.org/people/klankbeeld/sounds/171078/
-
-237282__devilfish101__frantic-violin-screech
-https://freesound.org/people/devilfish101/sounds/237282/