Merge pull request #19 from adator85/dev

V5.0.4 - Delete a user when a user has been kicked

core/Model.py

@@ -263,7 +263,6 @@ class Channel:
     @dataclass
     class ChannelModel:
         name: str
-        mode: str
         uids: list
 
     UID_CHANNEL_DB: list[ChannelModel] = []
@@ -302,21 +301,6 @@ class Channel:
 
         return result
 
-    def update(self, name: str, newMode: str) -> bool:
-
-        result = False
-
-        for record in self.UID_CHANNEL_DB:
-            if record.name == name:
-                record.mode = newMode
-                result = True
-                self.log.debug(f'Mode ({record.name}) has been updated with new mode {newMode}')
-
-        if not result:
-            self.log.critical(f'The channel mode {newMode} was not updated, name = {name}')
-
-        return result
-
     def delete(self, name: str) -> bool:
 
         result = False

core/irc.py

@@ -713,11 +713,7 @@ class Irc:
                 case 'MODE':
                     #['@msgid=d0ySx56Yd0nc35oHts2SkC-/J9mVUA1hfM6+Z4494xWUg;time=2024-08-09T12:45:36.651Z', 
                     # ':001', 'MODE', '#a', '+nt', '1723207536']
-                    cmd.pop(0)
-                    if '#' in cmd[2]:
-                        channel = cmd[2]
-                        mode = cmd[3]
-                        self.Channel.update(channel, mode)
+                    pass
 
                 case 'SJOIN':
                     # ['@msgid=5sTwGdj349D82L96p749SY;time=2024-08-15T09:50:23.528Z', ':001', 'SJOIN', '1721564574', '#welcome', ':001JD94QH']
@@ -747,7 +743,6 @@ class Irc:
                     self.Channel.insert(
                         self.Channel.ChannelModel(
                             name=channel,
-                            mode=mode,
                             uids=list_users
                         )
                     )
@@ -756,7 +751,7 @@ class Irc:
                     # ['@unrealircd.org/geoip=FR;unrealircd.org/userhost=50d6492c@80.214.73.44;unrealircd.org/userip=50d6492c@80.214.73.44;msgid=YSIPB9q4PcRu0EVfC9ci7y-/mZT0+Gj5FLiDSZshH5NCw;time=2024-08-15T15:35:53.772Z', 
                     # ':001EPFBRD', 'PART', '#welcome', ':WEB', 'IRC', 'Paris']
                     uid = str(cmd[1]).replace(':','')
-                    channel = str(cmd[3])
+                    channel = str(cmd[3]).lower()
                     self.Channel.delete_user_from_channel(channel, uid)
 
                     pass

mods/mod_votekick.py

@@ -157,7 +157,7 @@ class Votekick():
         mes_donnees = {'channel': channel}
 
         response = self.Base.db_execute_query("SELECT id FROM votekick_channel WHERE channel = :channel", mes_donnees)
-        
+
         isChannelExist = response.fetchone()
 
         if isChannelExist is None:
@@ -198,7 +198,7 @@ class Votekick():
             self.Irc.send2socket(f":{self.Config.SERVEUR_ID} SJOIN {unixtime} {chan} + :{self.Config.SERVICE_ID}")
             self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} SAMODE {chan} +o {self.Config.SERVICE_NICKNAME}")
 
-        return None    
+        return None
 
     def is_vote_ongoing(self, channel: str) -> bool:
 
@@ -207,7 +207,7 @@ class Votekick():
             if vote.channel_name == channel:
                 if vote.target_user:
                     response = True
-        
+
         return response
 
     def timer_vote_verdict(self, channel: str) -> None:
@@ -220,6 +220,7 @@ class Votekick():
                 if chan.vote_for > chan.vote_against:
                     self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :The user {self.Config.CONFIG_COLOR["gras"]}{target_user}{self.Config.CONFIG_COLOR["nogc"]}  will be kicked from this channel')
                     self.Irc.send2socket(f":{dnickname} KICK {channel} {target_user} Following the vote, you are not welcome in {channel}")
+                    self.Channel.delete_user_from_channel(channel, self.User.get_uid(target_user))
                 elif chan.vote_for <= chan.vote_against:
                     self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :This user will stay on this channel')
 

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "5.0.1"
+    "version": "5.0.4"
 }