Fix description not showing on posts, fix some suggested song links s…

…howing as None
stekc · Oct 9, 2024 · 55e0f8b · 55e0f8b
1 parent bc6175b
commit 55e0f8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/cogs/socials.py b/cogs/socials.py
@@ -583,7 +583,7 @@ async def fix_instagram(
         link = link.replace("www.", "")
         link = link.replace("instagram.com", self.config["instagram"]["url"])
 
-        if "/reel/" or "/reels/" in link:
+        if "/reel/" in link or "/reels/" in link:
             link = link.replace(
                 self.config["instagram"]["url"], "d." + self.config["instagram"]["url"]
             )

diff --git a/cogs/songs.py b/cogs/songs.py
@@ -45,7 +45,7 @@ async def callback(self, interaction: discord.Interaction):
         if suggested_songs:
             suggested_songs_str = "\n\n".join(
                 [
-                    f"**<:icons_music:1293362305886589010> {song['artist']} - {song['name']}**\n<:website:1290793095734100008> [[Apple Music]]({song['apple_music']}) [[Spotify]]({song['spotify']}) [[YouTube]]({song['youtube']})"
+                    f"**<:icons_music:1293362305886589010> {song['artist']} - {song['name']}**\n<:website:1290793095734100008> {song['links']}"
                     for song in suggested_songs
                 ]
             )
@@ -106,13 +106,22 @@ async def suggested_songs(self, artist: str, track: str):
                     spotify_url = await self.lastfm_to_spotify(track["url"])
                     if spotify_url:
                         links = await self.get_song_links(spotify_url)
+                        song_links = []
+                        for platform, url in [
+                            ("Apple Music", links.get("appleMusic")),
+                            ("Spotify", links.get("spotify")),
+                            ("YouTube", links.get("youtube")),
+                        ]:
+                            if url:
+                                song_links.append(
+                                    f"[[{platform}]]({url}{'?autoplay=0' if platform == 'Spotify' else ''})"
+                                )
+
                         suggested_songs.append(
                             {
                                 "name": track["name"],
                                 "artist": track["artist"]["name"],
-                                "spotify": links.get("spotify") + "?autoplay=0",
-                                "apple_music": links.get("appleMusic"),
-                                "youtube": links.get("youtube"),
+                                "links": " ".join(song_links),
                             }
                         )
                 return suggested_songs