]> git.0d.be Git - botaradio.git/commitdiff
chore: beautified current song display
authorTerry Geng <gengyanda@gmail.com>
Tue, 3 Mar 2020 08:15:47 +0000 (16:15 +0800)
committerTerry Geng <gengyanda@gmail.com>
Tue, 3 Mar 2020 08:15:47 +0000 (16:15 +0800)
configuration.default.ini
util.py

index 669e57411fe936edc03e92f7482ebcf85c6d9488..52b80d7c7d3ee0a7ea824683d2e8c62987da5642 100644 (file)
@@ -184,7 +184,7 @@ queue_empty = Playlist is empty!
 invalid_index = Invalid index <i>{index}</i>. Use '!queue' to see your playlist.
 now_playing_radio = Now Playing Radio: <br /> <a href="{url}">{title}</a> <i>from</i> {name} <i>added by</i> {user}
 now_playing_file = Now Playing File:<br /> {artist} - {title} <i>added by</i> {user}
-now_playing_from_playlist = Now Playing URL:<br /> {title} <i>from playlist</i> <a href="{url}">{playlist}</a> <i>added by</i> {user}
+now_playing_from_playlist = Now Playing URL:<br /> <a href="{url}">{title}</a> <i>from playlist</i> <a href="{playlist_url}">{playlist}</a> <i>added by</i> {user}
 now_playing_url = Now Playing URL: <br /> <a href="{url}">{title}</a> <i>added by</i> {user}
 not_in_my_channel = You're not in my channel, command refused!
 pm_not_allowed = Private message aren't allowed.
diff --git a/util.py b/util.py
index 0cde66b8f45a649e61e4ed4c4993d69d57baf87e..96ac83d54aba814cea77b76df84cd75f81d58717 100644 (file)
--- a/util.py
+++ b/util.py
@@ -158,7 +158,8 @@ def format_song_string(music):
     elif source == "url" and 'from_playlist' in music:
         display = constants.strings("now_playing_from_playlist",
                                     title=title,
-                                    url=music["playlist_url"],
+                                    url=music['url'],
+                                    playlist_url=music["playlist_url"],
                                     playlist=music["playlist_title"],
                                     user=music["user"]
         )