From f70ede55cad3ee25e8e907b01472354fd2d6078b Mon Sep 17 00:00:00 2001 From: swee Date: Wed, 22 Jan 2025 21:09:09 -0800 Subject: [PATCH] Update modules/pawserv.py --- modules/pawserv.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/pawserv.py b/modules/pawserv.py index 9805859..deee2ec 100644 --- a/modules/pawserv.py +++ b/modules/pawserv.py @@ -52,21 +52,24 @@ class IRCatModule: connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :Invalid verification.\r\n", "UTF-8")) elif len(args) > 0 and args[0].lower() == "register": if len(args) == 3: - if not nick in self.memory: - context = ssl.create_default_context() - token = str(uuid.uuid4()) - message = f"\\\nSubject: {self.net_name} Account Verification\n\nHi,\nIt appears you have tried to register an account ({nick}) with this email on {self.net_name},\nIf you did not register an account, feel free to delete this email.\nIf you did, use this command:\n/nickserv verify {nick} {token}" - with smtplib.SMTP(self.smtp_server, self.smtp_port) as server: - server.ehlo() - if self.smtp_starttls: - server.starttls(context=context) + if not self.sql.nickserv_isexist(nick.lower()): + if not nick in self.memory: + context = ssl.create_default_context() + token = str(uuid.uuid4()) + message = f"Subject: {self.net_name} Account Verification\n\nHi,\nIt appears you have tried to register an account ({nick}) with this email on {self.net_name},\nIf you did not register an account, feel free to delete this email.\nIf you did, use this command:\n/nickserv verify {nick} {token}" + with smtplib.SMTP(self.smtp_server, self.smtp_port) as server: server.ehlo() - server.login(self.smtp_username, self.smtp_password) - server.sendmail(self.smtp_username, args[2], message) - self.memory[nick.lower()] = [token, args[1], args[2]] - connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :Email sent, please verify.\r\n", "UTF-8")) + if self.smtp_starttls: + server.starttls(context=context) + server.ehlo() + server.login(self.smtp_username, self.smtp_password) + server.sendmail(self.smtp_username, args[2], message) + self.memory[nick.lower()] = [token, args[1], args[2]] + connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :Email sent, please verify.\r\n", "UTF-8")) + else: + connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :A verification is already pending.\r\n", "UTF-8")) else: - connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :A verification is already pending.\r\n", "UTF-8")) + connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :The user {nick} already exists.\r\n", "UTF-8")) else: connection.sendall(bytes(f":NickServ!Meow@PawServ NOTICE {nick} :Needs 3 arguments, nickname, password, and email.\r\n", "UTF-8")) elif len(args) > 0 and args[0].lower() == "identify":