Extra error handling around emails

modules/regproc.py

@@ -28,13 +28,21 @@ def selectInst(net):
 def substitute(net, num, token=None):
     inst = selectInst(net)
     alias = main.alias[num]
-    if "emails" in inst:
+    gotemail = False
+    if "emails" in alias:
         # First priority is explicit email lists
-        email = choice(alias["emails"])
-    elif "domains" in inst:
-        domain = choice(inst["domains"])
-        email = f"{alias['nickname']}@{domain}"
-    print("Constructed email: {email}")
+        if alias["emails"]:
+            email = choice(alias["emails"])
+            gotemail = True
+    if "domains" in inst:
+        if inst["domains"]:
+            if not gotemail:
+                domain = choice(inst["domains"])
+                email = f"{alias['nickname']}@{domain}"
+                gotemail = True
+    if not gotemail:
+        error(f"Could not get email for {net} - {num}")
+        return False
     nickname = alias["nick"]
     username = nickname + "/" + net
     password = main.network[net].aliases[num]["password"]
@@ -53,6 +61,9 @@ def substitute(net, num, token=None):
 def registerAccount(net, num):
     debug("Attempting to register: %s - %i" % (net, num))
     sinst = substitute(net, num)
+    if not sinst:
+        error(f"Register account failed for {net} - {num}")
+        return
     if not sinst["register"]:
         error("Cannot register for %s: function disabled" % (net))
         return False