Update parse_quit, now it returns MUser object and the reason.

core/classes/protocols/inspircd.py

@@ -1196,25 +1196,26 @@ class Inspircd(IProtocol):
         uid = scopy[2]
         return self._User.get_user(uid)
 
-    def parse_quit(self, server_msg: list[str]) -> dict[str, str]:
+    def parse_quit(self, server_msg: list[str]) -> tuple[Optional['MUser'], str]:
         """Parse quit and return dictionary.
         >>> [':97KAAAAAB', 'QUIT', ':Quit:', 'this', 'is', 'my', 'reason', 'to', 'quit']
         Args:
             server_msg (list[str]): The server message to parse
 
         Returns:
-            dict[str, str]: The dictionary.
+            tuple[MUser, str]: The User Who Quit Object and the reason.
         """
         scopy = server_msg.copy()
 
         if scopy[0].startswith('@'):
             scopy.pop(0)
         
-        response = {
-            "uid": scopy[0].replace(':', ''),
-            "reason": " ".join(scopy[3:])
-        }
-        return response
+        user_obj = self._User.get_user(self._Utils.clean_uid(scopy[0]))
+        tmp_reason = scopy[3:]
+        tmp_reason[0] = tmp_reason[0].replace(':', '')
+        reason = ' '.join(tmp_reason)
+
+        return user_obj, reason
 
     def parse_nick(self, server_msg: list[str]) -> dict[str, str]:
         """Parse nick changes.

core/classes/protocols/interface.py

@@ -327,14 +327,14 @@ class IProtocol(ABC):
         """
 
     @abstractmethod
-    def parse_quit(self, serverMsg: list[str]) -> dict[str, str]:
+    def parse_quit(self, serverMsg: list[str]) -> tuple[Optional['MUser'], str]:
         """Parse quit and return dictionary.
         >>> [':97KAAAAAB', 'QUIT', ':Quit:', 'this', 'is', 'my', 'reason', 'to', 'quit']
         Args:
             serverMsg (list[str]): The server message to parse
 
         Returns:
-            dict[str, str]: The response as dictionary.
+            tuple[MUser, str]: The User Who Quit Object and the reason.
         """
 
     @abstractmethod

core/classes/protocols/unreal6.py

@@ -1,4 +1,5 @@
 from base64 import b64decode
+from optparse import Option
 from re import match, findall, search
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Optional
@@ -637,30 +638,31 @@ class Unrealircd6(IProtocol):
             serverMsg (list[str]): The UID ircd response
         """
         scopy = serverMsg.copy()
-        if '@' in scopy[0]:
+        if scopy[0].startswith('@'):
             scopy.pop(0)
 
         uid = scopy[7]
         return self._User.get_user(uid)
 
-    def parse_quit(self, serverMsg: list[str]) -> dict[str, str]:
+    def parse_quit(self, serverMsg: list[str]) -> tuple[Optional['MUser'], str]:
         """Parse quit and return dictionary.
         >>> # ['@unrealtag...', ':001JKNY0N', 'QUIT', ':Quit:', '....']
         Args:
             serverMsg (list[str]): The server message to parse
 
         Returns:
-            dict[str, str]: The dictionary.
+            tuple[MUser, str]: The User Who Quit Object and the reason.
         """
         scopy = serverMsg.copy()
         if scopy[0].startswith('@'):
             scopy.pop(0)
         
-        response = {
-            "uid": scopy[0].replace(':', ''),
-            "reason": " ".join(scopy[3:])
-        }
-        return response
+        user_obj = self._User.get_user(self._Utils.clean_uid(scopy[0]))
+        tmp_reason = scopy[3:]
+        tmp_reason[0] = tmp_reason[0].replace(':', '')
+        reason = ' '.join(tmp_reason)
+
+        return user_obj, reason
 
     def parse_nick(self, serverMsg: list[str]) -> dict[str, str]:
         """Parse nick changes and return dictionary.
@@ -705,7 +707,7 @@ class Unrealircd6(IProtocol):
         channel = self._Channel.get_channel(scopy[2]) if self._Channel.is_valid_channel(scopy[2]) else None
 
         tmp_message = scopy[3:]
-        tmp_message = tmp_message[0].replace(':', '')
+        tmp_message[0] = tmp_message[0].replace(':', '')
         message = ' '.join(tmp_message)
 
         return sender, reciever, channel, message

mods/defender/utils.py

@@ -184,14 +184,17 @@ def handle_on_quit(uplink: 'Defender', srvmsg: list[str]):
         srvmsg (list[str]): The Server MSG
     """
     p = uplink.Protocol
-    parser = p.parse_quit(srvmsg)
+    userobj, reason = p.parse_quit(srvmsg)
     confmodel = uplink.ModConfig
     
+    if userobj is None:
+        uplink.Logs.error("Error when parsing message QUIT", exc_info=True)
+        return None
+
     ban_all_chan = uplink.Base.int_if_possible(confmodel.reputation_ban_all_chan)
-    final_UID = uplink.Loader.Utils.clean_uid(str(parser.get('uid', None)))
     jail_salon = uplink.Config.SALON_JAIL
     service_id = uplink.Config.SERVICE_ID
-    get_user_reputation = uplink.Reputation.get_reputation(final_UID)
+    get_user_reputation = uplink.Reputation.get_reputation(userobj.uid)
 
     if get_user_reputation is not None:
         final_nickname = get_user_reputation.nickname
@@ -200,7 +203,7 @@ def handle_on_quit(uplink: 'Defender', srvmsg: list[str]):
                 p.send2socket(f":{service_id} MODE {chan.name} -b {final_nickname}!*@*")
                 uplink.Logs.debug(f"Mode -b {final_nickname} on channel {chan.name}")
 
-        uplink.Reputation.delete(final_UID)
+        uplink.Reputation.delete(userobj.uid)
         uplink.Logs.debug(f"Client {get_user_reputation.nickname} has been removed from Reputation local DB")
 
 def handle_on_uid(uplink: 'Defender', srvmsg: list[str]):