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

Resolve lastfm nowplaying args to a user's set lastfm args is available

Browse source
This commit is contained in:
jesopo 2019-06-03 16:00:53 +01:00
parent ea47c8bc47
commit 15bb7ebb51
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/lastfm.py
View file

@ -20,13 +20,23 @@ class Module(ModuleManager.BaseModule):
:help: Get the last listened to track from a user :help: Get the last listened to track from a user
:usage: [username] :usage: [username]
""" """
if event["args_split"]: user = None
lastfm_username = event["args_split"][0] lastfm_username = None
shown_username = lastfm_username shown_username = None
if event["args"]:
arg_username = event["args_split"][0]
if event["server"].has_user_id(arg_username):
user = event["server"].get_user(event["args_split"][0])
else:
lastfm_username = shown_username = arg_username
else: else:
lastfm_username = event["user"].get_setting("lastfm", user = event["user"]
event["user"].nickname)
shown_username = event["user"].nickname if user:
lastfm_username = user.get_setting("lastfm", user.nickname)
shown_username = user.nickname
page = utils.http.request(URL_SCROBBLER, get_params={ page = utils.http.request(URL_SCROBBLER, get_params={
"method": "user.getrecenttracks", "user": lastfm_username, "method": "user.getrecenttracks", "user": lastfm_username,
"api_key": self.bot.config["lastfm-api-key"], "api_key": self.bot.config["lastfm-api-key"],