codey/discord-havoc
codey/discord-havoc
1
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

bugfix: sing

Browse Source
This commit is contained in:
codey 2025-03-16 08:11:40 -04:00
parent 97a548909e
commit fb8160a717
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogs/sing.py
View File

@ -159,7 +159,9 @@ class Sing(commands.Cog):
await ctx.respond("ERR: No search result") await ctx.respond("ERR: No search result")
return return
if isinstance(search_result[0], str):
if len(search_result) == 1 and\
isinstance(search_result[0][0], str):
return await ctx.send("ERR: No search result") # Error message from API return await ctx.send("ERR: No search result") # Error message from API
(search_result_artist, search_result_song, search_result_src, (search_result_artist, search_result_song, search_result_src,

7
util/sing_util.py
View File

@ -26,9 +26,11 @@ class Utility:
""" """
try: try:
if (not song or len(song) < 2) and not activity: if (not song or len(song) < 2) and not activity:
logging.critical("####1")
return False return False
if not song and activity: if not song and activity:
if not activity.name: if not activity.name:
logging.critical("####2")
return False # No valid activity found return False # No valid activity found
match activity.name.lower(): match activity.name.lower():
case "codey toons" | "cider" | "sonixd": case "codey toons" | "cider" | "sonixd":
@ -55,15 +57,18 @@ class Utility:
if not activity.details: if not activity.details:
song = str(activity.state) song = str(activity.state)
else: else:
search_artist = str(activity.state) search_artist = str(activity.state).rsplit("[", maxsplit=1)[0] # Strip genre
search_song = str(activity.details) search_song = str(activity.details)
song = f"{search_artist} : {search_song}" song = f"{search_artist} : {search_song}"
logging.critical(f"SEARCH: {search_artist} {search_song}")
case _: case _:
logging.critical("####3")
return False # Unsupported activity detected return False # Unsupported activity detected
search_split_by: str = ":" if not(song) or len(song.split(":")) > 1\ search_split_by: str = ":" if not(song) or len(song.split(":")) > 1\
else "-" # Support either : or - to separate artist/track else "-" # Support either : or - to separate artist/track
if not song: if not song:
logging.critical("####4")
return False return False
search_artist = song.split(search_split_by)[0].strip() search_artist = song.split(search_split_by)[0].strip()
search_song = "".join(song.split(search_split_by)[1:]).strip() search_song = "".join(song.split(search_split_by)[1:]).strip()