refactor: use aiohttp for requests

Add the -S option to the fast forward command.

commands/tools.py

@@ -1,7 +1,7 @@
 import re
 
+import aiohttp
 import disnake
-import requests
 
 import arguments
 import commands
@@ -31,8 +31,9 @@ async def lookup(message):
         return
 
     if args.application:
-        response = requests.get(
+        session = aiohttp.ClientSession()
-            f"https://discord.com/api/v9/applications/{args.id}/rpc"
+        response = await (
+            await session.get(f"https://discord.com/api/v9/applications/{args.id}/rpc")
         ).json()
         if "code" in response.keys():
             await utils.reply(message, "application not found!")

commands/voice/playback.py

@@ -2,6 +2,7 @@ import disnake_paginator
 
 import arguments
 import commands
+import sponsorblock
 import utils
 from constants import EMBED_COLOR
 from state import players
@@ -89,11 +90,19 @@ async def pause(message):
 async def fast_forward(message):
     tokens = commands.tokenize(message.content)
     parser = arguments.ArgumentParser(tokens[0], "fast forward audio playback")
-    parser.add_argument(
+    group = parser.add_mutually_exclusive_group(required=True)
-        "seconds",
+    group.add_argument(
+        "-s",
+        "--seconds",
         type=lambda v: arguments.range_type(v, min=0, max=300),
         help="the amount of seconds to fast forward",
     )
+    group.add_argument(
+        "-S",
+        "--sponsorblock",
+        action="store_true",
+        help="go to the end of the current sponsorblock segment",
+    )
     if not (args := await parser.parse_args(message, tokens)):
         return
 
@@ -104,8 +113,28 @@ async def fast_forward(message):
         await utils.reply(message, "nothing is playing!")
         return
 
+    seconds = args.seconds
+    if args.sponsorblock:
+        video = await sponsorblock.get_segments(
+            players[message.guild.id].current.player.id
+        )
+        if not video:
+            await utils.reply(
+                message, "no sponsorblock segments were found for this video!"
+            )
+            return
+
+        progress = message.guild.voice_client.source.original.progress
+        for segment in video["segments"]:
+            begin, end = map(float, segment["segment"])
+            if progress >= begin and progress < end:
+                seconds = end - message.guild.voice_client.source.original.progress
+        if not seconds:
+            await utils.reply(message, "no sponsorblock segment is currently playing!")
+            return
+
     message.guild.voice_client.pause()
-    message.guild.voice_client.source.original.fast_forward(args.seconds)
+    message.guild.voice_client.source.original.fast_forward(seconds)
     message.guild.voice_client.resume()
 
     await utils.add_check_reaction(message)

commands/voice/queue.py

@@ -22,7 +22,7 @@ async def queue_or_play(message, edited=False):
     parser = arguments.ArgumentParser(
         tokens[0], "queue a song, list the queue, or resume playback"
     )
-    parser.add_argument("query", nargs="?", help="yt-dlp URL or query to get song")
+    parser.add_argument("query", nargs="*", help="yt-dlp URL or query to get song")
     parser.add_argument(
         "-v",
         "--volume",
@@ -155,7 +155,7 @@ async def queue_or_play(message, edited=False):
         try:
             async with message.channel.typing():
                 player = await youtubedl.YTDLSource.from_url(
-                    query, loop=client.loop, stream=True
+                    " ".join(query), loop=client.loop, stream=True
                 )
                 player.volume = float(args.volume) / 100.0
         except Exception as e:

constants.py

@@ -36,10 +36,13 @@ RELOADABLE_MODULES = [
     "events",
     "extra",
     "fun",
+    "sponsorblock",
     "tasks",
     "utils",
     "voice",
     "youtubedl",
+    "yt_dlp",
+    "yt_dlp.version",
 ]
 PUBLIC_FLAGS = {
     1: "Discord Employee",

sponsorblock.py

@@ -0,0 +1,23 @@
+import hashlib
+
+import aiohttp
+
+from state import sponsorblock_cache
+
+
+async def get_segments(videoId: str):
+    if videoId in sponsorblock_cache:
+        return sponsorblock_cache[videoId]
+
+    hashPrefix = hashlib.sha256(videoId.encode()).hexdigest()[:4]
+    session = aiohttp.ClientSession()
+    response = await session.get(
+        f'https://sponsor.ajay.app/api/skipSegments/{hashPrefix}?categories=["music_offtopic"]'
+    )
+    if response.status == 200 and (
+        results := list(
+            filter(lambda v: videoId == v["videoID"], await response.json())
+        )
+    ):
+        sponsorblock_cache[videoId] = results[0]
+        return results[0]

state.py

@@ -15,4 +15,5 @@ idle_tracker = {"is_idle": False, "last_used": time.time()}
 kill = {"transcript": False}
 message_responses = LimitedSizeDict()
 players = {}
+sponsorblock_cache = LimitedSizeDict(size_limit=100)
 start_time = time.time()