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

admin check from config, and import config itself rather than sub-parts for consistency

Browse source
This commit is contained in:
Firepup Sixfifty 2023-11-14 22:44:54 -06:00
parent 5acd72cb83
commit 6adcf4c482
Signed by: Firepup650
GPG key ID: 7C92E2ABBBFAB9BA
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
commands.py
View file

@ -1,5 +1,5 @@
from subprocess import run, PIPE from subprocess import run, PIPE
from config import npbase, su, decode_escapes import config as conf
import random as r import random as r
from typing import Any, Callable from typing import Any, Callable
import bare import bare
@ -101,7 +101,7 @@ def quote(bot: bare.bot, chan: str, name: str, message: str) -> None:
r.seed() r.seed()
mm = open("mastermessages.txt", "r") mm = open("mastermessages.txt", "r")
q = mm.readlines() q = mm.readlines()
sel = decode_escapes(str(r.sample(q, 1)).strip("[]'").replace("\\n", "").strip('"')) sel = conf.decode_escapes(str(r.sample(q, 1)).strip("[]'").replace("\\n", "").strip('"'))
bot.msg(sel, chan) bot.msg(sel, chan)
mm.close() mm.close()
@ -143,7 +143,7 @@ def reboot(bot: bare.bot, chan: str, name: str, message: str) -> None:
def sudo(bot: bare.bot, chan: str, name: str, message: str) -> None: def sudo(bot: bare.bot, chan: str, name: str, message: str) -> None:
if name.lower() in bot.adminnames: if conf.adminCheck(bot, name):
bot.msg("Error - system failure, contact system operator", chan) bot.msg("Error - system failure, contact system operator", chan)
elif "bot" in name.lower(): elif "bot" in name.lower():
bot.log("lol, no.") bot.log("lol, no.")
@ -179,13 +179,13 @@ data: dict[str, dict[str, Any]] = {
"ping": {"prefix": True, "aliases": []}, "ping": {"prefix": True, "aliases": []},
"op me": {"prefix": False, "aliases": [], "admin": True}, "op me": {"prefix": False, "aliases": [], "admin": True},
} }
checks: list[str] = [npbase, su] checks: list[str] = [conf.npbase, conf.su]
call: dict[str, Callable[[bare.bot, str, str, str], None]] = { call: dict[str, Callable[[bare.bot, str, str, str], None]] = {
"!botlist": botlist, "!botlist": botlist,
"bugs bugs bugs": bugs, "bugs bugs bugs": bugs,
"hi $BOTNICK": hi, "hi $BOTNICK": hi,
npbase: nowplaying, conf.npbase: nowplaying,
su: sudo, conf.su: sudo,
"restart": reboot, "restart": reboot,
"uptime": uptime, "uptime": uptime,
"raw ": raw, "raw ": raw,