Avoid spamming #firemc #6

Closed
9pfs wants to merge 14 commits from 9pfs/FireBot:dont-spam-firemc into master
3 changed files with 8 additions and 14 deletions

View file

@ -6,7 +6,7 @@ from typing import Optional, Any
import bare, pylast
load_dotenv()
__version__ = "v3.0.7"
__version__ = "v3.0.8"
npbase: str = (
"\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence]
)

View file

@ -172,6 +172,11 @@ def PART(bot: bare.bot, msg: str) -> tuple[None, None]:
bot.channels.pop(channel, None)
return None, None
def QUIT(bot: bare.bot, msg: str) -> tuple[None, None]:
if bot.server == "replirc":
if msg.split("!", 1)[0][1:] == "FireMCBot":
bot.send("TOPIC #firemc :FireMC Relay channel (offline)\n")
Firepup650 marked this conversation as resolved
Review

Last line of the function MUST be return None, None, it'll crash otherwise.

Last line of the function _**MUST**_ be `return None, None`, it'll crash otherwise.
Review

Fixing

Fixing
return None, None
def NULL(bot: bare.bot, msg: str) -> tuple[None, None]:
return None, None
@ -186,4 +191,5 @@ handles: dict[
"PART": PART,
"MODE": NULL,
"TOPIC": NULL,
"QUIT": QUIT
}

View file

@ -112,18 +112,6 @@ def radio(instance: bare.bot) -> NoReturn:
instance.log("Thread while loop broken", "FATAL")
exit(1)
def mcDown(instance: bare.bot) -> None:
instance.sendraw("TOPIC #firemc :FireMC Relay channel (offline)")
data: dict[str, dict[str, Any]] = {
"radio": {"noWrap": True, "func": radio, "passInstance": True},
Firepup650 marked this conversation as resolved Outdated

related to my other commit, this needs to use the new passInstance param.

related to my other commit, this needs to use the new `passInstance` param.
"mc-down": {
"noWrap": False,
"func": mcDown,
"passInstance": True,
"interval": 60,
"ignoreErrors": True,
},
"radio": {"noWrap": True, "func": radio, "passInstance": True}
Firepup650 marked this conversation as resolved Outdated

radio needs to use "passInstance": True, not "args": []

`radio` needs to use `"passInstance": True`, not `"args": []`
}