Revert "Reformat project"

This reverts commit 64e3e1160aa76d191740342ab3edc68807f890fb.
This commit is contained in:
2022-07-21 13:40:01 +01:00
parent da678617d8
commit 27cafa1def
57 changed files with 214 additions and 519 deletions

View File

@@ -1,15 +1,12 @@
from yaml import dump
import main
from yaml import dump
class EmailCommand:
def __init__(self, *args):
self.email(*args)
def email(
self, addr, authed, data, obj, spl, success, failure, info, incUsage, length
):
def email(self, addr, authed, data, obj, spl, success, failure, info, incUsage, length):
if authed:
if length == 4:
if spl[1] == "add":
@@ -22,16 +19,10 @@ class EmailCommand:
return
if not domain in main.irc["_"]["domains"]:
main.irc["_"]["domains"].append(domain)
success(
"Successfully added domain %s to default config"
% domain
)
success("Successfully added domain %s to default config" % domain)
main.saveConf("irc")
else:
failure(
"Domain already exists in default config: %s"
% domain
)
failure("Domain already exists in default config: %s" % domain)
return
elif spl[1] == "del":
if not spl[2].isdigit():
@@ -41,16 +32,10 @@ class EmailCommand:
if domain in main.irc["_"]["domains"]:
main.irc["_"]["domains"].remove(domain)
success(
"Successfully removed domain %s to default config"
% domain
)
success("Successfully removed domain %s to default config" % domain)
main.saveConf("irc")
else:
failure(
"Domain does not exist in default config: %s"
% domain
)
failure("Domain does not exist in default config: %s" % domain)
return
else:
@@ -62,15 +47,10 @@ class EmailCommand:
if not spl[3] in main.alias[num]["emails"]:
main.alias[num]["emails"].append(spl[3])
main.saveConf("alias")
success(
"Successfully added email %s to alias %i"
% (spl[3], num)
)
success("Successfully added email %s to alias %i" % (spl[3], num))
return
else:
failure(
"Email already exists in alias %i: %s" % (num, spl[3])
)
failure("Email already exists in alias %i: %s" % (num, spl[3]))
return
elif spl[1] == "del":
if not num in main.alias.keys():
@@ -79,15 +59,10 @@ class EmailCommand:
if spl[3] in main.alias[num]["emails"]:
main.alias[num]["emails"].remove(spl[3])
main.saveConf("alias")
success(
"Successfully removed email %s from alias %i"
% (spl[3], num)
)
success("Successfully removed email %s from alias %i" % (spl[3], num))
return
else:
failure(
"Email does not exist in alias %i: %s" % (spl[3], num)
)
failure("Email does not exist in alias %i: %s" % (spl[3], num))
return
elif length == 2:
if spl[1] == "list":
@@ -99,12 +74,7 @@ class EmailCommand:
elif length == 3:
if spl[1] == "list":
if spl[2] == "domain":
filtered = {
f"{k}:{k2}": v2
for k, v in main.irc.items()
for k2, v2 in v.items()
if k2 == "domains"
}
filtered = {f"{k}:{k2}":v2 for k,v in main.irc.items() for k2,v2 in v.items() if k2 == "domains"}
info(dump(filtered))
return
else: