From d3f4e8893402b885e42394e08690227f02cb9ca6 Mon Sep 17 00:00:00 2001 From: Firepup Sixfifty Date: Tue, 7 Nov 2023 20:30:35 -0600 Subject: [PATCH] Formatting --- bot.py | 37 ++++++++++++++++++++++++++++--------- commands.py | 19 ++++++++++--------- config.py | 3 +++ 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/bot.py b/bot.py index 9603d55..1e2b11e 100644 --- a/bot.py +++ b/bot.py @@ -10,22 +10,28 @@ from time import sleep from importlib import reload import random as r + def mfind(message: str, find: list, usePrefix: bool = True) -> bool: if usePrefix: return any(message[: len(match) + 1] == conf.prefix + match for match in find) else: return any(message[: len(match)] == match for match in find) + class bot: def __init__(self, server: str): self.gmode = False self.server = server self.nicklen = 30 self.address = conf.servers[server]["address"] - self.port = conf.servers[server]["port"] if "port" in conf.servers[server] else 6667 + self.port = ( + conf.servers[server]["port"] if "port" in conf.servers[server] else 6667 + ) self.channels = conf.servers[server]["channels"] self.interval = ( - conf.servers[server]["interval"] if "interval" in conf.servers[server] else 50 + conf.servers[server]["interval"] + if "interval" in conf.servers[server] + else 50 ) self.__version__ = conf.__version__ self.nick = "FireBot" @@ -148,7 +154,7 @@ class bot: sender = msg.split("!", 1)[0][1:] message = msg.split("PRIVMSG", 1)[1].split(":", 1)[1].strip() kind = msg.split("\x01")[1].split(" ", 1)[0] - self.log(f"Responding to CTCP \"{kind}\" from {sender}") + self.log(f'Responding to CTCP "{kind}" from {sender}') if kind == "VERSION": self.notice( f"\x01VERSION FireBot {conf.__version__} (https://git.amcforum.wiki/Firepup650/fire-ircbot)\x01", @@ -174,7 +180,7 @@ class bot: "\x01CLIENTINFO ACTION VERSION USERINFO SOURCE FINGER\x01", sender, True ) return True - self.log(f"Unknown CTCP \"{kind}\"", "WARN") + self.log(f'Unknown CTCP "{kind}"', "WARN") return False def msg(self, msg: str, target: str) -> None: @@ -203,7 +209,9 @@ class bot: self.log("Starting connection..") self.connect() if "pass" in conf.servers[self.server]: - self.msg(f"IDENTIFY FireBot {conf.servers[self.server]['pass']}", "NickServ") + self.msg( + f"IDENTIFY FireBot {conf.servers[self.server]['pass']}", "NickServ" + ) sleep(0.5) for chan in self.channels: self.join(chan, "null", False) @@ -266,14 +274,22 @@ class bot: for cmd in cmds.data: triggers = [cmd] triggers.extend(cmds.data[cmd]["aliases"]) - triggers = list(call.replace("$BOTNICK", self.nick.lower()) for call in triggers) + triggers = list( + call.replace("$BOTNICK", self.nick.lower()) + for call in triggers + ) if mfind( message.lower(), triggers, cmds.data[cmd]["prefix"], ): - if ("admin" in cmds.data[cmd] and cmds.data[cmd]["admin"]) and name not in self.adminnames: - self.msg(f"Sorry {name}, you don't have permission to use {cmd.strip()}.", chan) + if ( + "admin" in cmds.data[cmd] and cmds.data[cmd]["admin"] + ) and name not in self.adminnames: + self.msg( + f"Sorry {name}, you don't have permission to use {cmd.strip()}.", + chan, + ) else: cmds.call[cmd](self, chan, name, message) handled = True @@ -296,7 +312,10 @@ class bot: self.__version__ = conf.__version__ self.msg("Reloaded config and commands", chan) else: - self.msg(f"Sorry {name}, you don't have permission to use reload.", chan) + self.msg( + f"Sorry {name}, you don't have permission to use reload.", + chan, + ) handled = True if not handled and len(message.split("\x01")) == 3: if not self.CTCP(message, name): diff --git a/commands.py b/commands.py index 0747f06..a7f493c 100644 --- a/commands.py +++ b/commands.py @@ -2,6 +2,7 @@ from subprocess import run, PIPE from config import npbase, su, decode_escapes import random as r + def goat(bot, chan: str, name: str, message: str) -> None: bot.log("GOAT DETECTED") bot.msg("Hello Goat", chan) @@ -96,8 +97,8 @@ def quote(bot, chan: str, name: str, message: str) -> None: def join(bot, chan: str, name: str, message: str) -> None: - newchan = message.split(" ", 1)[1].strip() - bot.join(newchan, chan) + newchan = message.split(" ", 1)[1].strip() + bot.join(newchan, chan) def eball(bot, chan: str, name: str, message: str) -> None: @@ -112,10 +113,10 @@ def eball(bot, chan: str, name: str, message: str) -> None: def debug(bot, chan: str, name: str, message: str) -> None: - bot.msg(f"[DEBUG] VERSION={bot.__version__}", chan) - bot.msg(f"[DEBUG] NICKLEN={bot.nicklen}", chan) - bot.msg(f"[DEBUG] ADMINS={bot.adminnames}", chan) - bot.msg(f"[DEBUG] CHANNELS={bot.channels}", chan) + bot.msg(f"[DEBUG] VERSION={bot.__version__}", chan) + bot.msg(f"[DEBUG] NICKLEN={bot.nicklen}", chan) + bot.msg(f"[DEBUG] ADMINS={bot.adminnames}", chan) + bot.msg(f"[DEBUG] CHANNELS={bot.channels}", chan) def raw(bot, chan: str, name: str, message: str) -> None: @@ -123,8 +124,8 @@ def raw(bot, chan: str, name: str, message: str) -> None: def reboot(bot, chan: str, name: str, message: str) -> None: - bot.send("QUIT :Rebooting\n") - bot.exit("Reboot") + bot.send("QUIT :Rebooting\n") + bot.exit("Reboot") def sudo(bot, chan: str, name: str, message: str) -> None: @@ -149,7 +150,7 @@ data = { "!botlist": {"prefix": False, "aliases": []}, "bugs bugs bugs": {"prefix": False, "aliases": []}, "hi $BOTNICK": {"prefix": False, "aliases": ["hello $BOTNICK"]}, -# [npbase, su] + # [npbase, su] "restart": {"prefix": True, "aliases": ["reboot"], "admin": True}, "uptime": {"prefix": True, "aliases": []}, "raw ": {"prefix": True, "aliases": ["cmd "], "admin": True}, diff --git a/config.py b/config.py index c81518e..3aa1a54 100644 --- a/config.py +++ b/config.py @@ -2,6 +2,7 @@ from os import environ as env from dotenv import load_dotenv import re + load_dotenv() __version__ = "v2.0.2" npbase = "\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|^]{1,MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" @@ -39,6 +40,8 @@ ESCAPE_SEQUENCE_RE = re.compile( re.UNICODE | re.VERBOSE, ) prefix = "." + + def decode_escapes(s: str) -> str: def decode_match(match): return codecs.decode(match.group(0), "unicode-escape")