Merge pull request #52 from adator85/dev

You need to have unrealirc_rpc_py v1.0.3

mods/mod_command.py

@@ -35,10 +35,14 @@ class Command():
         # Create module commands (Mandatory)
         self.commands_level = {
             1: ['join', 'part'],
-            2: ['owner', 'deowner', 'op', 'deop', 'halfop', 'dehalfop', 'voice', 
+            2: ['owner', 'deowner', 'protect', 'deprotect', 'op', 'deop', 'halfop', 'dehalfop', 'voice', 
                 'devoice', 'opall', 'deopall', 'devoiceall', 'voiceall', 'ban', 
-                'unban','kick', 'kickban', 'umode', 'svsjoin', 'svspart', 'svsnick', 'topic',
+                'unban','kick', 'kickban', 'umode', 'mode', 'svsjoin', 'svspart', 'svsnick', 'topic',
-                'wallops', 'globops','gnotice','whois', 'names', 'invite', 'inviteme']
+                'wallops', 'globops','gnotice','whois', 'names', 'invite', 'inviteme',
+                'sajoin', 'sapart', 
+                'kill', 'gline', 'ungline', 'kline', 'unkline', 'shun', 'unshun', 
+                'glinelist', 'shunlist', 'klinelist'],
+            3: ['map']
         }
 
         # Init the module
@@ -59,6 +63,9 @@ class Command():
         self.__load_module_configuration()
         # End of mandatory methods you can start your customization #
 
+        self.user_to_notice: str = ''
+        self.show_219: bool = True
+
         return None
 
     def __set_commands(self, commands:dict[int, list[str]]) -> None:
@@ -123,49 +130,14 @@ class Command():
 
         return None
 
-    def add_defender_channel(self, channel:str) -> bool:
-        """Cette fonction ajoute les salons de join de Defender
-
-        Args:
-            channel (str): le salon à enregistrer.
-        """
-        mes_donnees = {'channel': channel}
-        response = self.Base.db_execute_query("SELECT id FROM def_channels WHERE channel = :channel", mes_donnees)
-        
-        isChannelExist = response.fetchone()
-
-        if isChannelExist is None:
-            mes_donnees = {'datetime': self.Base.get_datetime(), 'channel': channel}
-            insert = self.Base.db_execute_query(f"INSERT INTO def_channels (datetime, channel) VALUES (:datetime, :channel)", mes_donnees)
-            if insert.rowcount >=0:
-                return True
-            else:
-                return False
-        else:
-            return False
-
-    def delete_defender_channel(self, channel:str) -> bool:
-        """Cette fonction supprime les salons de join de Defender
-
-        Args:
-            channel (str): le salon à enregistrer.
-        """
-        mes_donnes = {'channel': channel}
-        response = self.Base.db_execute_query("DELETE FROM def_channels WHERE channel = :channel", mes_donnes)
-        
-        affected_row = response.rowcount
-
-        if affected_row > 0:
-            return True
-        else:
-            return False
-
     def cmd(self, data:list) -> None:
 
-        service_id = self.Config.SERVICE_ID                 # Defender serveur id
+        service_id = self.Config.SERVICE_ID
         dnickname = self.Config.SERVICE_NICKNAME
         dchanlog = self.Config.SERVICE_CHANLOG
         red = self.Config.COLORS.red
+        green = self.Config.COLORS.green
+        bold = self.Config.COLORS.bold
         nogc = self.Config.COLORS.nogc
         cmd = list(data).copy()
 
@@ -176,8 +148,57 @@ class Command():
             # [':irc.deb.biz.st', '403', 'Dev-PyDefender', '#Z', ':No', 'such', 'channel']
             case '403' | '401':
                 try:
-                    message = ' '.join(cmd[2:])
+                    message = ' '.join(cmd[3:])
-                    self.Irc.send2socket(f":{dnickname} PRIVMSG {dchanlog} :[{red}ERROR MSG{nogc}] {message}")
+                    self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} :[{red}ERROR MSG{nogc}] {message}")
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case '006' | '018':
+                try:
+                    # [':irc.deb.biz.st', '006', 'Dev-PyDefender', ':`-services.deb.biz.st', '------', '|', 'Users:', '9', '(47.37%)', '[00B]']
+                    # [':irc.deb.biz.st', '018', 'Dev-PyDefender', ':4', 'servers', 'and', '19', 'users,', 'average', '4.75', 'users', 'per', 'server']
+                    message = ' '.join(cmd[3:])
+                    self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} : [{green}SERVER MSG{nogc}] {message}")
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case '219':
+                try:
+                    # [':irc.deb.biz.st', '219', 'Dev-PyDefender', 's', ':End', 'of', '/STATS', 'report']
+                    if not self.show_219:
+                        # If there is a result in 223 then stop here
+                        self.show_219 = True
+                        return None
+
+                    type_of_stats = str(cmd[3])
+
+                    match type_of_stats:
+                        case 's':
+                            self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} : No shun")
+                        case 'G':
+                            self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} : No gline")
+                        case 'k':
+                            self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} : No kline")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case '223':
+                try:
+                    # [':irc.deb.biz.st', '223', 'Dev-PyDefender', 'G', '*@162.142.125.217', '67624', '18776', 'irc.deb.biz.st', ':Proxy/Drone', 'detected.', 'Check', 'https://dronebl.org/lookup?ip=162.142.125.217', 'for', 'details.']
+                    self.show_219 = False
+                    host = str(cmd[4])
+                    author = str(cmd[7])
+                    reason = ' '.join(cmd[8:])
+
+                    self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} : {bold}Author{nogc}: {author} - {bold}Host{nogc}: {host} - {bold}Reason{nogc}: {reason}")
+
                 except KeyError as ke:
                     self.Base.logs.error(ke)
                 except Exception as err:
@@ -368,6 +389,60 @@ class Command():
                 except Exception as err:
                     self.Logs.warning(f'Unknown Error: {str(err)}')
 
+            case 'protect':
+                # /mode #channel +a user
+                # .protect #channel user
+                try:
+                    if fromchannel is None:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#SALON] [NICKNAME]')
+                        return False
+
+                    if len(cmd) == 1:
+                        self.Irc.send2socket(f":{service_id} MODE {fromchannel} +a {fromuser}")
+                        return True
+
+                    # deowner nickname
+                    if len(cmd) == 2:
+                        nickname = cmd[1]
+                        self.Irc.send2socket(f":{service_id} MODE {fromchannel} +a {nickname}")
+                        return True
+
+                    nickname = cmd[2]
+                    self.Irc.send2socket(f":{service_id} MODE {fromchannel} +a {nickname}")
+
+                except IndexError as e:
+                    self.Logs.warning(f'_hcmd DEOWNER: {str(e)}')
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#SALON] [NICKNAME]')
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'deprotect':
+                # /mode #channel -a user
+                # .deprotect #channel user
+                try:
+                    if fromchannel is None:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#SALON] [NICKNAME]')
+                        return False
+
+                    if len(cmd) == 1:
+                        self.Irc.send2socket(f":{service_id} MODE {fromchannel} -a {fromuser}")
+                        return True
+
+                    # deowner nickname
+                    if len(cmd) == 2:
+                        nickname = cmd[1]
+                        self.Irc.send2socket(f":{service_id} MODE {fromchannel} -a {nickname}")
+                        return True
+
+                    nickname = cmd[2]
+                    self.Irc.send2socket(f":{service_id} MODE {fromchannel} -a {nickname}")
+
+                except IndexError as e:
+                    self.Logs.warning(f'_hcmd DEOWNER: {str(e)}')
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#SALON] [NICKNAME]')
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
             case 'halfop':
                 # /mode #channel +h user
                 # .halfop #channel user
@@ -481,7 +556,7 @@ class Command():
                 try:
                     sentchannel = str(cmd[1]) if self.Base.Is_Channel(cmd[1]) else None
                     if sentchannel is None:
-                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} ban [#SALON] [NICKNAME]')
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#SALON] [NICKNAME]')
                         return False
 
                     nickname = cmd[2]
@@ -490,7 +565,7 @@ class Command():
                     self.Logs.debug(f'{fromuser} has banned {nickname} from {sentchannel}')
                 except IndexError as e:
                     self.Logs.warning(f'_hcmd BAN: {str(e)}')
-                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} ban [#SALON] [NICKNAME]')
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#SALON] [NICKNAME]')
                 except Exception as err:
                     self.Logs.warning(f'Unknown Error: {str(err)}')
 
@@ -679,6 +754,7 @@ class Command():
 
             case 'whois':
                 try:
+                    self.user_to_notice = fromuser
                     if len(cmd) == 1:
                         self.Irc.send2socket(f":{dnickname} NOTICE {fromuser} :/msg {dnickname} {str(cmd[0]).upper()} NICKNAME")
                         return None
@@ -756,6 +832,16 @@ class Command():
                 except Exception as err:
                     self.Logs.warning(f'Unknown Error: {str(err)}')
 
+            case 'map':
+                try:
+                    self.user_to_notice = fromuser
+                    self.Irc.send2socket(f':{dnickname} MAP')
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
             case 'umode':
                 try:
                     # .umode nickname +mode
@@ -768,6 +854,39 @@ class Command():
                 except Exception as err:
                     self.Logs.warning(f'Unknown Error: {str(err)}')
 
+            case 'mode':
+                # .mode #channel +/-mode
+                # .mode +/-mode
+                try:
+
+                    if len(cmd) < 2:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#CHANNEL] [+/-]mode')
+                        return None
+
+                    if fromchannel is None:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#CHANNEL] [+/-]mode')
+                        return None
+
+                    if len(cmd) == 2:
+                        channel_mode = cmd[1]
+                        if self.Base.Is_Channel(fromchannel):
+                            self.Irc.send2socket(f":{dnickname} MODE {fromchannel} {channel_mode}")
+                        else:
+                            self.Irc.send2socket(f":{dnickname} NOTICE {fromuser} : Right command : Channel [{fromchannel}] is not correct should start with #")
+                        return None
+
+                    if len(cmd) == 3:
+                        provided_channel = cmd[1]
+                        channel_mode = cmd[2]
+                        self.Irc.send2socket(f":{service_id} MODE {provided_channel} {channel_mode}")
+                        return None
+
+                except IndexError as e:
+                    self.Logs.warning(f'_hcmd OP: {str(e)}')
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : Right command : /msg {dnickname} {command.upper()} [#CHANNEL] [+/-]mode')
+                except Exception as err:
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
             case 'svsjoin':
                 try:
                     # .svsjoin nickname #channel
@@ -800,6 +919,38 @@ class Command():
                     self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} SVSPART nickname #channel')
                     self.Logs.warning(f'Unknown Error: {str(err)}')
 
+            case 'sajoin':
+                try:
+                    # .sajoin nickname #channel
+                    nickname = str(cmd[1])
+                    channel = str(cmd[2])
+                    if len(cmd) < 3:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname #channel')
+                        return None
+
+                    self.Irc.send2socket(f':{self.Config.SERVEUR_ID} SAJOIN {nickname} {channel}')
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname #channel')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'sapart':
+                try:
+                    # .sapart nickname #channel
+                    nickname = str(cmd[1])
+                    channel = str(cmd[2])
+                    if len(cmd) < 3:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname #channel')
+                        return None
+
+                    self.Irc.send2socket(f':{self.Config.SERVEUR_ID} SAPART {nickname} {channel}')
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname #channel')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
             case 'svsnick':
                 try:
                     # .svsnick nickname newnickname
@@ -812,12 +963,203 @@ class Command():
                         return None
 
                     if len(cmd) != 3:
-                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} SVSNICK nickname newnickname')
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname newnickname')
                         return None
 
                     self.Irc.send2socket(f':{self.Config.SERVEUR_ID} SVSNICK {nickname} {newnickname} {unixtime}')
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname newnickname')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'kill':
+                try:
+                    # 'kill', 'gline', 'ungline', 'shun', 'unshun'
+                    # .kill nickname reason
+                    if len(cmd) < 3:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname reason')
+                        return None
+
+                    nickname = str(cmd[1])
+                    kill_reason = ' '.join(cmd[2:])
+
+                    self.Irc.send2socket(f":{service_id} KILL {nickname} {kill_reason} ({self.Config.COLORS.red}{dnickname}{self.Config.COLORS.nogc})")
                 except KeyError as ke:
                     self.Base.logs.error(ke)
                 except Exception as err:
                     self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} SVSNICK nickname newnickname')
                     self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'gline':
+                try:
+                    # TKL + G user host set_by expire_timestamp set_at_timestamp :reason
+                    # .gline [nickname] [host] [reason]
+                    if len(cmd) < 4:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                        return None
+
+                    nickname = str(cmd[1])
+                    hostname = str(cmd[2])
+                    set_at_timestamp = self.Base.get_unixtime()
+                    expire_time = (60 * 60 * 24) + set_at_timestamp
+                    gline_reason = ' '.join(cmd[3:])
+
+                    if nickname == '*' and hostname == '*':
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : You want to close the server ? i would recommand ./unrealircd stop :)')
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                        return None
+
+                    self.Irc.send2socket(f":{self.Config.SERVEUR_ID} TKL + G {nickname} {hostname} {dnickname} {expire_time} {set_at_timestamp} :{gline_reason}")
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'ungline':
+                try:
+                    # 'shun', 'unshun'
+                    # TKL + G user host set_by expire_timestamp set_at_timestamp :reason
+                    # .ungline nickname host
+                    if len(cmd) < 2:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname hostname')
+                        return None
+
+                    nickname = str(cmd[1])
+                    hostname = str(cmd[2])
+
+                    self.Irc.send2socket(f":{self.Config.SERVEUR_ID} TKL - G {nickname} {hostname} {dnickname}")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname hostname')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'kline':
+                try:
+                    # TKL + k user host set_by expire_timestamp set_at_timestamp :reason
+                    # .gline [nickname] [host] [reason]
+                    if len(cmd) < 4:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                        return None
+
+                    nickname = str(cmd[1])
+                    hostname = str(cmd[2])
+                    set_at_timestamp = self.Base.get_unixtime()
+                    expire_time = (60 * 60 * 24) + set_at_timestamp
+                    gline_reason = ' '.join(cmd[3:])
+
+                    if nickname == '*' and hostname == '*':
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : You want to close the server ? i would recommand ./unrealircd stop :)')
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                        return None
+
+                    self.Irc.send2socket(f":{self.Config.SERVEUR_ID} TKL + k {nickname} {hostname} {dnickname} {expire_time} {set_at_timestamp} :{gline_reason}")
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'unkline':
+                try:
+                    # 'shun', 'unshun'
+                    # TKL + G user host set_by expire_timestamp set_at_timestamp :reason
+                    # .ungline nickname host
+                    if len(cmd) < 2:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname hostname')
+                        return None
+
+                    nickname = str(cmd[1])
+                    hostname = str(cmd[2])
+
+                    self.Irc.send2socket(f":{self.Config.SERVEUR_ID} TKL - k {nickname} {hostname} {dnickname}")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname hostname')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'shun':
+                try:
+                    # TKL + G user host set_by expire_timestamp set_at_timestamp :reason
+                    # .shun [nickname] [host] [reason]
+
+                    if len(cmd) < 4:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                        return None
+
+                    nickname = str(cmd[1])
+                    hostname = str(cmd[2])
+                    set_at_timestamp = self.Base.get_unixtime()
+                    expire_time = (60 * 60 * 24) + set_at_timestamp
+                    shun_reason = ' '.join(cmd[3:])
+
+                    if nickname == '*' and hostname == '*':
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : You want to close the server ? i would recommand ./unrealircd stop :)')
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                        return None
+
+                    self.Irc.send2socket(f":{self.Config.SERVEUR_ID} TKL + s {nickname} {hostname} {dnickname} {expire_time} {set_at_timestamp} :{shun_reason}")
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname host reason')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'unshun':
+                try:
+                    # 'shun', 'unshun'
+                    # TKL + G user host set_by expire_timestamp set_at_timestamp :reason
+                    # .unshun nickname host
+                    if len(cmd) < 2:
+                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname hostname')
+                        return None
+
+                    nickname = str(cmd[1])
+                    hostname = str(cmd[2])
+
+                    self.Irc.send2socket(f":{self.Config.SERVEUR_ID} TKL - s {nickname} {hostname} {dnickname}")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()} nickname hostname')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'glinelist':
+                try:
+                    self.user_to_notice = fromuser
+                    self.Irc.send2socket(f":{self.Config.SERVICE_ID} STATS G")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()}')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'shunlist':
+                try:
+                    self.user_to_notice = fromuser
+                    self.Irc.send2socket(f":{self.Config.SERVICE_ID} STATS s")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()}')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')
+
+            case 'klinelist':
+                try:
+                    self.user_to_notice = fromuser
+                    self.Irc.send2socket(f":{self.Config.SERVICE_ID} STATS k")
+
+                except KeyError as ke:
+                    self.Base.logs.error(ke)
+                except Exception as err:
+                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} : /msg {dnickname} {command.upper()}')
+                    self.Logs.warning(f'Unknown Error: {str(err)}')

mods/mod_jsonrpc.py

@@ -76,6 +76,9 @@ class Jsonrpc():
         if self.Rpc.Error.code != 0:
             self.Irc.sendPrivMsg(f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.Rpc.Error.message}", self.Config.SERVICE_CHANLOG)
 
+        if self.UnrealIrcdRpcLive.Error.code != 0:
+            self.Irc.sendPrivMsg(f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.UnrealIrcdRpcLive.Error.message}", self.Config.SERVICE_CHANLOG)
+
         return None
 
     def __set_commands(self, commands:dict[int, list[str]]) -> None:
@@ -116,13 +119,29 @@ class Jsonrpc():
 
         dnickname = self.Config.SERVICE_NICKNAME
         dchanlog = self.Config.SERVICE_CHANLOG
+        green = self.Config.COLORS.green
+        nogc = self.Config.COLORS.nogc
+        bold = self.Config.COLORS.bold
+        red = self.Config.COLORS.red
 
-        self.Irc.sendPrivMsg(msg=json_response, channel=dchanlog)
+        if json_response.result == True:
+            self.Irc.sendPrivMsg(msg=f"[{bold}{green}JSONRPC{nogc}{bold}] Event activated", channel=dchanlog)
+            return None
+
+        level = json_response.result.level
+        subsystem = json_response.result.subsystem
+        event_id = json_response.result.event_id
+        log_source = json_response.result.log_source
+        msg = json_response.result.msg
+
+        build_msg = f"{green}{log_source}{nogc}: [{bold}{level}{bold}] {subsystem}.{event_id} - {msg}"
+
+        self.Irc.sendPrivMsg(msg=build_msg, channel=dchanlog)
 
     def thread_start_jsonrpc(self):
 
         if self.UnrealIrcdRpcLive.Error.code == 0:
-            self.UnrealIrcdRpcLive.subscribe()
+            self.UnrealIrcdRpcLive.subscribe(["all"])
             self.subscribed = True
         else:
             self.Irc.sendPrivMsg(f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.UnrealIrcdRpcLive.Error.message}", self.Config.SERVICE_CHANLOG)
@@ -211,24 +230,25 @@ class Jsonrpc():
                                 return None
 
                             chan_list = []
-                            for chan in UserInfo.channels:
+                            for chan in UserInfo.user.channels:
-                                chan_list.append(chan["name"])
+                                chan_list.append(chan.name)
 
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :UID                  : {UserInfo.id}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :NICKNAME             : {UserInfo.name}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :USERNAME             : {UserInfo.username}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :USERNAME             : {UserInfo.user.username}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :REALNAME             : {UserInfo.realname}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :REALNAME             : {UserInfo.user.realname}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :MODES                : {UserInfo.user.modes}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CHANNELS             : {chan_list}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :SECURITY GROUP       : {UserInfo.security_groups}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :SECURITY GROUP       : {UserInfo.user.security_groups}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :REPUTATION           : {UserInfo.reputation}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :REPUTATION           : {UserInfo.user.reputation}')
 
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :IP                   : {UserInfo.ip}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :COUNTRY CODE         : {UserInfo.country_code}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :COUNTRY CODE         : {UserInfo.geoip.country_code}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :ASN                  : {UserInfo.asn}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :ASN                  : {UserInfo.geoip.asn}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :ASNAME               : {UserInfo.asname}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :ASNAME               : {UserInfo.geoip.asname}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CLOAKED HOST         : {UserInfo.cloakedhost}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CLOAKED HOST         : {UserInfo.user.cloakedhost}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :HOSTNAME             : {UserInfo.hostname}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :VHOST                : {UserInfo.vhost}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :VHOST                : {UserInfo.user.vhost}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CLIENT PORT          : {UserInfo.client_port}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :SERVER PORT          : {UserInfo.server_port}')
 

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "5.3.2"
+    "version": "5.3.4"
 }