forked from Firepup650/FireBot
Actually pay attention if the song isn't playing
This commit is contained in:
parent
016e5d2595
commit
b356bfb19b
3 changed files with 8 additions and 2 deletions
|
@ -200,7 +200,7 @@ data: dict[str, dict[str, Any]] = {
|
||||||
"bugs bugs bugs": {"prefix": False, "aliases": []},
|
"bugs bugs bugs": {"prefix": False, "aliases": []},
|
||||||
"hi $BOTNICK": {"prefix": False, "aliases": ["hello $BOTNICK"]},
|
"hi $BOTNICK": {"prefix": False, "aliases": ["hello $BOTNICK"]},
|
||||||
# [npbase, su]
|
# [npbase, su]
|
||||||
"restart": {"prefix": True, "aliases": ["reboot", "stop"], "check": checks.admin},
|
"restart": {"prefix": True, "aliases": ["reboot", "stop", "hardreload"], "check": checks.admin},
|
||||||
"uptime": {"prefix": True, "aliases": []},
|
"uptime": {"prefix": True, "aliases": []},
|
||||||
"raw ": {"prefix": True, "aliases": ["cmd "], "check": checks.admin},
|
"raw ": {"prefix": True, "aliases": ["cmd "], "check": checks.admin},
|
||||||
"debug": {"prefix": True, "aliases": ["dbg", "d"], "check": checks.admin},
|
"debug": {"prefix": True, "aliases": ["dbg", "d"], "check": checks.admin},
|
||||||
|
|
|
@ -6,7 +6,7 @@ from typing import Optional, Any
|
||||||
import bare, pylast
|
import bare, pylast
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
__version__ = "v3.0.2-dev"
|
__version__ = "v3.0.3"
|
||||||
npbase: str = (
|
npbase: str = (
|
||||||
"\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence]
|
"\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence]
|
||||||
)
|
)
|
||||||
|
|
|
@ -77,10 +77,12 @@ def threadManager(
|
||||||
|
|
||||||
def radio(instance: bare.bot) -> NoReturn:
|
def radio(instance: bare.bot) -> NoReturn:
|
||||||
lastTrack = ""
|
lastTrack = ""
|
||||||
|
complained = False
|
||||||
while 1:
|
while 1:
|
||||||
try:
|
try:
|
||||||
newTrack = instance.lastfmLink.get_user("Firepup650").get_now_playing()
|
newTrack = instance.lastfmLink.get_user("Firepup650").get_now_playing()
|
||||||
if newTrack:
|
if newTrack:
|
||||||
|
complained = False
|
||||||
thisTrack = newTrack.__str__()
|
thisTrack = newTrack.__str__()
|
||||||
if thisTrack != lastTrack:
|
if thisTrack != lastTrack:
|
||||||
lastTrack = thisTrack
|
lastTrack = thisTrack
|
||||||
|
@ -88,6 +90,10 @@ def radio(instance: bare.bot) -> NoReturn:
|
||||||
instance.sendraw(
|
instance.sendraw(
|
||||||
f"TOPIC #fp-radio :Firepup radio ({thisTrack}) - https://open.spotify.com/playlist/4ctNy3O0rOwhhXIKyLvUZM"
|
f"TOPIC #fp-radio :Firepup radio ({thisTrack}) - https://open.spotify.com/playlist/4ctNy3O0rOwhhXIKyLvUZM"
|
||||||
)
|
)
|
||||||
|
elif not complained:
|
||||||
|
instance.msg("Firepup seems to have stopped the music by mistake :/", "#fp-radio")
|
||||||
|
instance.sendraw("TOPIC #fp-radio :Firepup radio (Offline) - https://open.spotify.com/playlist/4ctNy3O0rOwhhXIKyLvUZM")
|
||||||
|
complained = True
|
||||||
except Exception:
|
except Exception:
|
||||||
Err = format_exc()
|
Err = format_exc()
|
||||||
for line in Err.split("\n"):
|
for line in Err.split("\n"):
|
||||||
|
|
Loading…
Reference in a new issue