From 940ea7f4c924536d913e1a1c4ec6bacf51bcdc2f Mon Sep 17 00:00:00 2001
From: Pratyush Desai <pratyush.desai@liberta.casa>
Date: Fri, 20 Aug 2021 14:01:27 +0530
Subject: [PATCH] add ACCOUNT

---
 README.md | 14 ++++++++++++++
 plugin.py | 22 ++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7812442..b8674d0 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,15 @@
+# SnoParser
+
 Parses the Server Notices from ErgoIRCd
+
+Coverage:
+
+1. CONNECT
+
+2. XLINE
+
+3. NICK
+
+4. KILL
+
+5. ACCOUNT (reg only)
\ No newline at end of file
diff --git a/plugin.py b/plugin.py
index 0b8d698..fcfc89b 100644
--- a/plugin.py
+++ b/plugin.py
@@ -122,12 +122,26 @@ class SnoParser(callbacks.Plugin):
                 quitregex = "^-QUIT- (.+) exited the network$"
                 couple = re.match(quitregex, text)
                 nick = couple.group(1)
+                DictFromSnotice = {'notice': 'quit', 'nick': nick}
                 repl = f"\x02\x1FNOTICE: quit nick: {nick} has exited the network"
                 self._sendSnotice(irc, msg, repl)
-            # -ACCOUNT- Client [<redacted-hostmask>] registered account [<redacted>] from IP <redacted>
-            # -ACCOUNT- Operator [<redacted>] registered account [<redacted>] with SAREGISTER
-            # if 'ACCOUNT' in text and 'logged into account' in text:
-            #     accregex = "^-ACCOUNT- "
+            if 'ACCOUNT' in text and 'registered account' in text:
+                accregex = "^-ACCOUNT- Client \[(.*)\] registered account \[(.*)\] from IP (.*)$"
+                couple = re.match(accregex, text)
+                hostmask = couple.group(1)
+                account = couple.group(2)
+                ip = couple.group(3)
+                DictFromSnotice = {'notice': 'accreg', 'hostmask': hostmask, 'account': account, 'ip': ip}
+                repl = f"\x02\x1FNOTICE: accreg -> [{account}] was registered by hostmask [{hostmask}] from IP {ip}"
+                self._sendSnotice(irc, msg, repl)
+            if 'ACCOUNT' in text and 'registered account' in text and 'SAREGISTER' in text:
+                accregex = "^-ACCOUNT- Operator \[(.*)\] registered account \[(.*)\] with SAREGISTER$"
+                couple = re.match(accregex, text)
+                oper = couple.group(1)
+                account = couple.group(2)
+                DictFromSnotice = {'notice': 'sareg', 'oper': oper, 'account': account}
+                repl = f"\x02\x1FNOTICE: sareg -> [{account}] was registered by operator [{oper}]"
+                self._sendSnotice(irc, msg, repl)