Revert "Reformat project"
This reverts commit 64e3e1160aa76d191740342ab3edc68807f890fb.
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
from copy import deepcopy
|
||||
from random import choice
|
||||
|
||||
import main
|
||||
from modules import provision
|
||||
from utils.logging.debug import *
|
||||
from utils.logging.log import *
|
||||
|
||||
from utils.logging.debug import *
|
||||
from copy import deepcopy
|
||||
from random import choice
|
||||
|
||||
def needToRegister(net):
|
||||
# Check if the network does not support authentication
|
||||
@@ -53,7 +51,7 @@ def substitute(net, num, token=None):
|
||||
nickname = alias["nick"]
|
||||
username = nickname + "/" + net
|
||||
password = main.network[net].aliases[num]["password"]
|
||||
# inst["email"] = inst["email"].replace("{nickname}", nickname)
|
||||
#inst["email"] = inst["email"].replace("{nickname}", nickname)
|
||||
for i in inst.keys():
|
||||
if not isinstance(inst[i], str):
|
||||
continue
|
||||
@@ -114,12 +112,8 @@ def enableAuthentication(net, num):
|
||||
auth = obj.auth
|
||||
password = obj.aliases[num]["password"]
|
||||
uname = main.alias[num]["nick"] + "/" + net
|
||||
provision.provisionAuthenticationData(
|
||||
num, nick, net, security, auth, password
|
||||
) # Set up for auth
|
||||
main.IRCPool[net + str(num)].msg(
|
||||
main.config["Tweaks"]["ZNC"]["Prefix"] + "status", "Jump"
|
||||
)
|
||||
provision.provisionAuthenticationData(num, nick, net, security, auth, password) # Set up for auth
|
||||
main.IRCPool[net + str(num)].msg(main.config["Tweaks"]["ZNC"]["Prefix"] + "status", "Jump")
|
||||
if selectInst(net)["check"] == False:
|
||||
confirmRegistration(net, num)
|
||||
|
||||
@@ -135,14 +129,10 @@ def registerTest(c):
|
||||
if not main.IRCPool[name]._negativePass == True:
|
||||
if c["type"] == "query" and c["nick"] == sinst["entity"]:
|
||||
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
|
||||
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
|
||||
if sinst["ping"]:
|
||||
if sinst["checkmsg2"] in c["msg"] and c["nick"] == sinst["entity"]:
|
||||
|
||||
Reference in New Issue
Block a user