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

Move all handlers out of bot.py into handlers.py, minor config update

Browse source
This commit is contained in:
Firepup Sixfifty 2023-11-17 21:23:19 -06:00
parent 9bf199bb48
commit cc4a4d0e1f
Signed by: Firepup650
GPG key ID: 7C92E2ABBBFAB9BA
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bot.py
View file

@ -90,7 +90,7 @@ class bot(bare.bot):
for subchan in chans: for subchan in chans:
self.join(subchan, origin) self.join(subchan, origin)
return return
if chan.startswith("0") or (chan == "#main" and lock): if chan.startswith("0") or (chan == "#main" and lock and self.server != "replirc"):
if origin != "null": if origin != "null":
self.msg(f"Refusing to join channel {chan} (protected)", origin) self.msg(f"Refusing to join channel {chan} (protected)", origin)
return return
@ -213,17 +213,13 @@ class bot(bare.bot):
action = ircmsg.split(" ", 2)[1].strip() action = ircmsg.split(" ", 2)[1].strip()
except IndexError: except IndexError:
pass pass
if action == "PRIVMSG": if action in handlers.handles:
res, chan = handlers.PRIVMSG(self, ircmsg) res, chan = handlers.handles[action](self, ircmsg)
if res == "reload": if res == "reload":
reload(conf) reload(conf)
reload(cmds) reload(cmds)
reload(handlers) reload(handlers)
self.msg("Reloaded successfully", chan) # type: ignore self.msg("Reloaded successfully", chan) # type: ignore
elif action == "NICK":
name = ircmsg.split("!", 1)[0][1:]
if name == self.nick:
self.nick = ircmsg.split("NICK", 1)[1].split(":", 1)[1].strip()
else: else:
if ircmsg.startswith("PING "): if ircmsg.startswith("PING "):
self.ping(ircmsg) self.ping(ircmsg)

2
config.py
View file

@ -15,7 +15,7 @@ servers: dict[str, dict[str, Any]] = {
"port": 6601, "port": 6601,
"interval": 200, "interval": 200,
"pass": env["ircnow_pass"], "pass": env["ircnow_pass"],
"channels": {"#random": 0, "#dice": 0, "#offtopic": 0}, "channels": {"#random": 0, "#dice": 0, "#offtopic": 0, "#main/replirc": 0},
"admins": [], "admins": [],
"hosts": ["9pfs.repl.co"], "hosts": ["9pfs.repl.co"],
}, },

27
handlers.py
View file

@ -151,5 +151,30 @@ def PRIVMSG(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]
mm.close() mm.close()
return None, None return None, None
def NICK(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]]:
name = msg.split("!", 1)[0][1:]
if name == bot.nick:
bot.nick = msg.split("NICK", 1)[1].split(":", 1)[1].strip()
return None, None
handles = {"PRIVMSG": PRIVMSG} def KICK(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]]:
important = msg.split("KICK", 1)[1].split(":", 1)[0].strip().split(" ")
channel = important[0]
kicked = important[1]
if kicked == bot.nick:
bot.channels.pop(channel, None)
return None, None
def PART(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]]:
parted = msg.split("!", 1)[0][1:]
channel = msg.split("PART", 1)[1].split(":", 1)[0].strip()
if parted == bot.nick:
bot.channels.pop(channel, None)
return None, None
handles = {
"PRIVMSG": PRIVMSG,
"NICK": NICK,
"KICK": KICK,
"PART": PART,
}