Pathogen
/
monolith
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use substitutions in registration tests

This commit is contained in:
Mark Veidemanis 2020-11-01 22:19:03 +00:00
parent 0473c57291
commit 45fa21fea3
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/regproc.py
View File

@ -88,32 +88,32 @@ def enableAuthentication(net, num):
confirmRegistration(net, num) confirmRegistration(net, num)
def registerTest(c): def registerTest(c):
inst = selectInst(c["net"]) sinst = substitute(c["net"], c["num"])
name = c["net"]+str(c["num"]) name = c["net"]+str(c["num"])
if inst["check"] == False: if sinst["check"] == False:
return return
if "msg" in c.keys() and not c["msg"] == None: if "msg" in c.keys() and not c["msg"] == None:
if inst["negative"]: if sinst["negative"]:
if name in main.IRCPool.keys(): if name in main.IRCPool.keys():
if not main.IRCPool[name]._negativePass == True: if not main.IRCPool[name]._negativePass == True:
if c["type"] == "query" and c["nick"] == inst["entity"]: if c["type"] == "query" and c["nick"] == sinst["entity"]:
if inst["checknegativemsg"] in c["msg"]: if sinst["checknegativemsg"] in c["msg"]:
confirmRegistration(c["net"], c["num"], negativepass=False) # Not passed negative check, report back confirmRegistration(c["net"], c["num"], negativepass=False) # Not passed negative check, report back
return return
if inst["checkendnegative"] in c["msg"]: if sinst["checkendnegative"] in c["msg"]:
confirmRegistration(c["net"], c["num"], negativepass=True) # Passed the negative check, report back confirmRegistration(c["net"], c["num"], negativepass=True) # Passed the negative check, report back
return return
if inst["ping"]: if sinst["ping"]:
if inst["checkmsg2"] in c["msg"] and c["nick"] == inst["entity"]: if sinst["checkmsg2"] in c["msg"] and c["nick"] == sinst["entity"]:
confirmRegistration(c["net"], c["num"]) confirmRegistration(c["net"], c["num"])
return return
if inst["checktype"] == "msg": if sinst["checktype"] == "msg":
if inst["checkmsg"] in c["msg"]: if sinst["checkmsg"] in c["msg"]:
confirmRegistration(c["net"], c["num"]) confirmRegistration(c["net"], c["num"])
return return
elif inst["checktype"] == "mode": elif sinst["checktype"] == "mode":
if c["type"] == "self": if c["type"] == "self":
if c["mtype"] == "mode": if c["mtype"] == "mode":
if inst["checkmode"] in c["mode"] and c["status"] == True: if sinst["checkmode"] in c["mode"] and c["status"] == True:
confirmRegistration(c["net"], c["num"]) confirmRegistration(c["net"], c["num"])
return return