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

disable !np youtube urls by default

Browse source
This commit is contained in:
jesopo 2020-05-07 22:23:04 +01:00
parent 73371b5571
commit 8d932ccc34
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/lastfm.py
View file

@ -7,8 +7,13 @@ from src import ModuleManager, utils
URL_SCROBBLER = "http://ws.audioscrobbler.com/2.0/" URL_SCROBBLER = "http://ws.audioscrobbler.com/2.0/"
SETTING_YT = utils.BoolSetting("lastfm-youtube",
"Whether or not to search last.fm now-playing results on youtube")
@utils.export("set", utils.Setting("lastfm", "Set last.fm username", @utils.export("set", utils.Setting("lastfm", "Set last.fm username",
example="jesopo")) example="jesopo"))
@utils.export("botset", SETTING_YT)
@utils.export("serverset", SETTING_YT)
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
_name = "last.fm" _name = "last.fm"
@ -59,11 +64,13 @@ class Module(ModuleManager.BaseModule):
time_language = "is listening to" if np else "last listened to" time_language = "is listening to" if np else "last listened to"
yt_url = self.exports.get("search-youtube")(
"%s - %s" % (artist, track_name))
yt_url_str = "" yt_url_str = ""
if yt_url: if event["server"].get_setting("lastfm-youtube",
yt_url_str = " - %s" % yt_url self.bot.get_setting("lastfm-youtube", False)):
yt_url = self.exports.get("search-youtube")(
"%s - %s" % (artist, track_name))
if yt_url:
yt_url_str = " - %s" % yt_url
info_page = utils.http.request(URL_SCROBBLER, get_params={ info_page = utils.http.request(URL_SCROBBLER, get_params={
"method": "track.getInfo", "artist": artist, "method": "track.getInfo", "artist": artist,