Firepup650/FireBot
2
0
Fork 1
Code Issues 5 Pull requests Activity Actions

Avoid spamming #firemc #6

Closed
9pfs wants to merge 14 commits from 9pfs/FireBot:dont-spam-firemc into master
pull from: 9pfs/FireBot:dont-spam-firemc
merge into: Firepup650:master
Conversation 21 Commits 14 Files changed 3 +8 -14
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.py
View file

@ -6,7 +6,7 @@ from typing import Optional, Any
import bare, pylast import bare, pylast
load_dotenv() load_dotenv()
__version__ = "v3.0.7" __version__ = "v3.0.8"
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]
) )

6
handlers.py
View file

@ -172,6 +172,11 @@ def PART(bot: bare.bot, msg: str) -> tuple[None, None]:
bot.channels.pop(channel, None) bot.channels.pop(channel, None)
return None, 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
Firepup650 commented 2024-05-01 00:58:26 +00:00
Review
Copy link

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.
9pfs commented 2024-05-01 01:01:50 +00:00
Review
Copy link

Fixing

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

14
timers.py
View file

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

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.
Firepup650 marked this conversation as resolved Outdated
Firepup650 commented 2024-05-01 01:08:57 +00:00
Outdated
Review
Copy link

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

`radio` needs to use `"passInstance": True`, not `"args": []`
"mc-down": {
"noWrap": False,
"func": mcDown,
"passInstance": True,
"interval": 60,
"ignoreErrors": True,
},
} }