9pfs/FireBot
1
0
Fork 0
forked from Firepup650/FireBot
Code Pull requests Activity

Allow certain hostnames to have global admin perks

Browse source
This commit is contained in:
Firepup Sixfifty 2023-11-14 22:04:34 -06:00
parent 3960ae7f54
commit eab0787fff
Signed by: Firepup650
GPG key ID: 7C92E2ABBBFAB9BA
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.py
View file

@ -3,6 +3,7 @@ from os import environ as env
from dotenv import load_dotenv from dotenv import load_dotenv
import re, codecs import re, codecs
from typing import Union, Any from typing import Union, Any
import bare
load_dotenv() load_dotenv()
__version__ = "v2.0.4" __version__ = "v2.0.4"
@ -34,6 +35,7 @@ servers: dict[str, dict[str, Any]] = {
"admins": ["firepup650", "thelounge87"] "admins": ["firepup650", "thelounge87"]
} }
} }
admin_hosts: list[str] = ["firepup.firepi", "owner.firepi", "47.221.227.180"]
ESCAPE_SEQUENCE_RE = re.compile( ESCAPE_SEQUENCE_RE = re.compile(
r""" r"""
( \\U........ # 8-digit hex escapes ( \\U........ # 8-digit hex escapes
@ -60,3 +62,6 @@ def mfind(message: str, find: list, usePrefix: bool = True) -> bool:
return any(message[: len(match) + 1] == prefix + match for match in find) return any(message[: len(match) + 1] == prefix + match for match in find)
else: else:
return any(message[: len(match)] == match for match in find) return any(message[: len(match)] == match for match in find)
def adminCheck(bot: bare.bot, name: str, host: str) -> bool:
return name in servers[bot.server]["admins"] or host in admin_hosts

5
handlers.py
View file

@ -44,6 +44,7 @@ def CTCP(bot: bare.bot, msg: str) -> bool:
def PRIVMSG(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]]: def PRIVMSG(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]]:
# Format of ":[Nick]![ident]@[host|vhost] PRIVMSG [channel] :[message]” # Format of ":[Nick]![ident]@[host|vhost] PRIVMSG [channel] :[message]”
name = msg.split("!", 1)[0][1:] name = msg.split("!", 1)[0][1:]
host = msg.split("@", 1)[1].split(" ", 1)[0]
if (name.startswith("saxjax") and bot.server == "efnet") or ( if (name.startswith("saxjax") and bot.server == "efnet") or (
name == "ReplIRC" and bot.server == "replirc" name == "ReplIRC" and bot.server == "replirc"
) or (name == "FirePyLink_" and bot.server == "ircnow"): ) or (name == "FirePyLink_" and bot.server == "ircnow"):
@ -91,7 +92,7 @@ def PRIVMSG(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]
): ):
if ( if (
"admin" in cmds.data[cmd] and cmds.data[cmd]["admin"] "admin" in cmds.data[cmd] and cmds.data[cmd]["admin"]
) and name not in bot.adminnames: ) and not conf.adminCheck(bot, name, host):
bot.msg( bot.msg(
f"Sorry {name}, you don't have permission to use {cmd.strip()}.", f"Sorry {name}, you don't have permission to use {cmd.strip()}.",
chan, chan,
@ -110,7 +111,7 @@ def PRIVMSG(bot: bare.bot, msg: str) -> tuple[Union[None, str], Union[None, str]
handled = True handled = True
break break
if not handled and conf.mfind(message, ["reload"]): if not handled and conf.mfind(message, ["reload"]):
if name in bot.adminnames: if conf.adminCheck(bot, name, host):
return "reload", chan return "reload", chan
else: else:
bot.msg( bot.msg(