|
|
|
@ -21,6 +21,13 @@ def needToRegister(net):
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def needToAuth(net):
|
|
|
|
|
networkObj = main.network[net]
|
|
|
|
|
if networkObj.auth == "none":
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def selectInst(net):
|
|
|
|
|
if net in main.irc.keys():
|
|
|
|
|
inst = deepcopy(main.irc[net])
|
|
|
|
@ -159,28 +166,53 @@ def registerTest(c):
|
|
|
|
|
confirmRegistration(
|
|
|
|
|
c["net"], c["num"], negativepass=False
|
|
|
|
|
) # Not passed negative check, report back
|
|
|
|
|
debug(f"registerTest() {net} - {num} not passed negative:checknegativemsg check, {sinst['checknegativemsg']} present in message")
|
|
|
|
|
debug(
|
|
|
|
|
(
|
|
|
|
|
f"registerTest() {net} - {num} not passed negative:checknegativemsg "
|
|
|
|
|
f"check, {sinst['checknegativemsg']} present in message"
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
return
|
|
|
|
|
if sinst["checkendnegative"] in c["msg"]:
|
|
|
|
|
confirmRegistration(
|
|
|
|
|
c["net"], c["num"], negativepass=True
|
|
|
|
|
) # Passed the negative check, report back
|
|
|
|
|
debug(f"registerTest() {net} - {num} passed negative:checkendnegative check, {sinst['checkendnegative']} present in message")
|
|
|
|
|
debug(
|
|
|
|
|
(
|
|
|
|
|
f"registerTest() {net} - {num} passed negative:checkendnegative "
|
|
|
|
|
f"check, {sinst['checkendnegative']} present in message"
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
return
|
|
|
|
|
if sinst["ping"]:
|
|
|
|
|
if sinst["checkmsg2"] in c["msg"] and c["nick"] == sinst["entity"]:
|
|
|
|
|
confirmRegistration(c["net"], c["num"])
|
|
|
|
|
debug(f"registerTest() {net} - {num} passed ping:checkmsg2 check, {sinst['checkmsg2']} present in message")
|
|
|
|
|
debug(
|
|
|
|
|
(
|
|
|
|
|
f"registerTest() {net} - {num} passed ping:checkmsg2 "
|
|
|
|
|
f"check, {sinst['checkmsg2']} present in message"
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
return
|
|
|
|
|
if sinst["checktype"] == "msg":
|
|
|
|
|
if sinst["checkmsg"] in c["msg"]:
|
|
|
|
|
confirmRegistration(c["net"], c["num"])
|
|
|
|
|
debug(f"registerTest() {net} - {num} passed checktype:msg:checkmsg check, {sinst['checkmsg']} present in message")
|
|
|
|
|
debug(
|
|
|
|
|
(
|
|
|
|
|
f"registerTest() {net} - {num} passed checktype:msg:checkmsg check, "
|
|
|
|
|
f"{sinst['checkmsg']} present in message"
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
return
|
|
|
|
|
elif sinst["checktype"] == "mode":
|
|
|
|
|
if c["type"] == "self":
|
|
|
|
|
if c["mtype"] == "mode":
|
|
|
|
|
if sinst["checkmode"] in c["mode"] and c["status"] is True:
|
|
|
|
|
confirmRegistration(c["net"], c["num"])
|
|
|
|
|
debug(f"registerTest() {net} - {num} passed checktype:mode:checkmost check, {sinst['checkmode']} present in mode")
|
|
|
|
|
debug(
|
|
|
|
|
(
|
|
|
|
|
f"registerTest() {net} - {num} passed checktype:mode:checkmost check, "
|
|
|
|
|
f"{sinst['checkmode']} present in mode"
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
return
|
|
|
|
|