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

dont-spam-firemc #7

Closed
9pfs wants to merge 15 commits from 9pfs/FireBot:dont-spam-firemc into master
pull from: 9pfs/FireBot:dont-spam-firemc
merge into: Firepup650:master
Conversation 6 Commits 15 Files changed - +2 -7
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d2d0b47131 - Show all commits

2
bot.py
View file

@ -270,7 +270,7 @@ class bot(bare.bot):
tdict = {} tdict = {}
for thread in self.threads: for thread in self.threads:
tdict[thread] = timers.data[thread] tdict[thread] = timers.data[thread]
if thread in ["radio"]: if tdict[thread]["passInstance"]:
tdict[thread]["args"] = [self] tdict[thread]["args"] = [self]
tMgr = Thread(target=timers.threadManager, args=(tdict,)) tMgr = Thread(target=timers.threadManager, args=(tdict,))
tMgr.daemon = True tMgr.daemon = True

7
timers.py
View file

@ -112,11 +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, "args": []}, "radio": {"noWrap": True, "func": radio, "args": []}
"mc-down": {"noWrap": False, "func": mcDown, "args": [], "interval": 60, "ignoreErrors": True}
} }