Allow current nick substitution in IRC commands

conf/templates/irc.json

@@ -4,6 +4,7 @@
         "entity": "NickServ",
         "domains": [],
         "registermsg": "REGISTER {password} {email}",
+        "identifymsg": "IDENTIFY {password}",
         "confirm": "CONFIRM {token}",
         "check": true,
         "ping": true,

modules/regproc.py

@@ -2,7 +2,7 @@ from copy import deepcopy
 from random import choice
 
 import main
-from modules import provision
+from modules import provision, helpers
 from utils.logging.debug import debug
 from utils.logging.log import error
 
@@ -61,10 +61,17 @@ def substitute(net, num, token=None):
     # username = nickname + "/" + net
     password = main.network[net].aliases[num]["password"]
     # inst["email"] = inst["email"].replace("{nickname}", nickname)
+
+    name = f"{net}{num}"
+    if name in main.IRCPool:
+        curnick = main.IRCPool[name].nickname
+    else:
+        curnick = nickname
     for i in inst.keys():
         if not isinstance(inst[i], str):
             continue
         inst[i] = inst[i].replace("{nickname}", nickname)
+        inst[i] = inst[i].replace("{curnick}", curnick)
         inst[i] = inst[i].replace("{password}", password)
         inst[i] = inst[i].replace("{email}", email)
         if token: