notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds ability for the bot to be in multiple channels.

Browse Source
This commit is contained in:
Vgr E.Barry 2014-12-06 17:39:21 -05:00
parent 3192052add
commit 87f74d3265
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
botconfig.py.example
View File

@ -23,3 +23,7 @@ ADMINS = ("unaffiliated/wolfbot_admin2", "unaffiliated/wolfbot_admin3") # glob
OWNERS_ACCOUNTS = ("1owner_acc",)
ADMINS_ACCOUNTS = ("1admin_acc", "2admin_acc")
ALT_CHANNELS = ""
ALLOWED_ALT_CHANNELS_COMMANDS = []

1
modules/common.py
View File

@ -98,6 +98,7 @@ def connect_callback(cli):
def prepare_stuff(*args):
cli.join(botconfig.CHANNEL)
cli.join(botconfig.ALT_CHANNELS)
cli.msg("ChanServ", "op "+botconfig.CHANNEL)
cli.cap("REQ", "extended-join")

23
tools/decorators.py
View File

@ -27,14 +27,29 @@ def generate(fdict, permissions=True, **kwargs):
else:
nick = ""
cloak = ""
if len(largs) > 3 and largs[2]:
chan = largs[2]
else:
chan = ""
if not raw_nick and len(largs) > 1 and largs[1]:
largs[1] = nick
if not permissions:
return f(*largs)
if chan and not chan == botconfig.CHANNEL and not admin_only and not owner_only:
if "" in s:
return # Don't have empty commands triggering in other channels
allowed = False
for cmdname in s:
if cmdname in botconfig.ALLOWED_ALT_CHANNELS_COMMANDS:
allowed = True
break
if not allowed:
return
if nick in var.USERS.keys():
acc = var.USERS[nick]["account"]
else:
acc = None
if not raw_nick and len(largs) > 1 and largs[1]:
largs[1] = nick
#if largs[1].startswith("#"):
if not permissions or "" in s:
if "" in s:
return f(*largs)
if cloak:
for pattern in botconfig.DENY.keys():