Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Don't show actual lastfm name unless it was explicitly provided

Browse source
This commit is contained in:
jesopo 2018-08-13 16:04:08 +01:00
parent b369f5d6e8
commit 63418dc0f3
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/lastfm.py
View file

@ -19,12 +19,14 @@ class Module(object):
def np(self, event): def np(self, event):
if event["args_split"]: if event["args_split"]:
username = event["args_split"][0] lastfm_username = event["args_split"][0]
shown_username = lastfm_username
else: else:
username = event["user"].get_setting("lastfm", username = event["user"].get_setting("lastfm",
event["user"].nickname) event["user"].nickname)
shown_username = event["user"].nickname
page = Utils.get_url(URL_SCROBBLER, get_params={ page = Utils.get_url(URL_SCROBBLER, get_params={
"method": "user.getrecenttracks", "user": username, "method": "user.getrecenttracks", "user": lastfm_username,
"api_key": self.bot.config["lastfm-api-key"], "api_key": self.bot.config["lastfm-api-key"],
"format": "json", "limit": "1"}, json=True) "format": "json", "limit": "1"}, json=True)
if page: if page:
@ -38,7 +40,7 @@ class Module(object):
"method": "track.getInfo", "artist": artist, "method": "track.getInfo", "artist": artist,
"track": track_name, "autocorrect": "1", "track": track_name, "autocorrect": "1",
"api_key": self.bot.config["lastfm-api-key"], "api_key": self.bot.config["lastfm-api-key"],
"user": username, "format": "json"}, json=True) "user": lastfm_username, "format": "json"}, json=True)
tags = [] tags = []
if "toptags" in info_page.get("track", []): if "toptags" in info_page.get("track", []):
for tag in info_page["track"]["toptags"]["tag"]: for tag in info_page["track"]["toptags"]["tag"]:
@ -56,10 +58,10 @@ class Module(object):
event["stdout"].write( event["stdout"].write(
"%s is now playing: %s - %s%s%s" % ( "%s is now playing: %s - %s%s%s" % (
username, artist, track_name, play_count, tags)) shown_username, artist, track_name, play_count, tags))
else: else:
event["stderr"].write( event["stderr"].write(
"The user '%s' has never scrobbled before" % ( "The user '%s' has never scrobbled before" % (
username)) shown_username))
else: else:
event["stderr"].write("Failed to load results") event["stderr"].write("Failed to load results")