Merge pull request #32 from adator85/dev

Update vote kick commands

mods/mod_clone.py

@@ -198,7 +198,7 @@ class Clone():
             case 'clone':
                 option = str(cmd[1]).lower()
 
-                if len(option) == 1:
+                if len(command) == 1:
                     self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} clone connect 6')
                     self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} clone kill [all | nickname]')
                     self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} clone join [all | nickname] #channel')

mods/mod_votekick.py

@@ -48,7 +48,7 @@ class Votekick():
 
         # Créer les nouvelles commandes du module
         self.commands_level = {
-            0: ['vote_for', 'vote_against'],
+            0: ['vote'],
             1: ['activate', 'deactivate', 'submit', 'vote_stat', 'vote_verdict', 'vote_cancel']
         }
 
@@ -60,6 +60,8 @@ class Votekick():
 
     def __init_module(self) -> None:
 
+        self.Admin = self.Irc.Admin
+
         self.__set_commands(self.commands_level)
         self.__create_tables()
         self.join_saved_channels()
@@ -192,7 +194,9 @@ class Votekick():
 
     def join_saved_channels(self) -> None:
 
-        result = self.Base.db_execute_query("SELECT id, channel FROM votekick_channel")
+        param = {'module_name': self.module_name}
+        result = self.Base.db_execute_query(f"SELECT id, channel_name FROM {self.Config.table_channel} WHERE module_name = :module_name", param)
+
         channels = result.fetchall()
         unixtime = self.Base.get_unixtime()
 
@@ -258,25 +262,69 @@ class Votekick():
         fromchannel = channel
 
         match command:
+            case 'vote':
+                option = str(cmd[1]).lower()
+                match option:
 
-            case 'vote_cancel':
+                    case 'activate':
                         try:
-                    if channel is None:
+                            # vote activate #channel
-                        self.Logs.error(f"The channel is not known, defender can't cancel the vote")
+                            if self.Admin.get_Admin(fromuser) is None:
-                        self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :You need to specify the channel => /msg {dnickname} vote_cancel #channel')
+                                self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Your are not allowed to execute this command')
+                                return None
 
-                    for vote in self.VOTE_CHANNEL_DB:
+                            sentchannel = str(cmd[2]).lower() if self.Base.Is_Channel(str(cmd[2]).lower()) else None
-                        if vote.channel_name == channel:
+                            if sentchannel is None:
-                            self.init_vote_system(channel)
+                                self.Irc.send2socket(f":{dnickname} NOTICE {fromuser} :The correct command is {self.Config.SERVICE_PREFIX}{command} {option} #CHANNEL")
-                            self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :Vote system re-initiated')
 
-                except IndexError as ke:
+                            self.insert_vote_channel(
-                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} vote_cancel #channel')
+                                self.VoteChannelModel(
-                    self.Logs.error(f'Index Error: {ke}')
+                                    channel_name=sentchannel,
+                                    target_user='',
+                                    voter_users=[],
+                                    vote_for=0,
+                                    vote_against=0
+                                    )
+                                )
 
-            case 'vote_for':
+                            self.Base.db_query_channel('add', self.module_name, sentchannel)
+
+                            self.Irc.send2socket(f":{dnickname} JOIN {sentchannel}")
+                            self.Irc.send2socket(f":{dnickname} SAMODE {sentchannel} +o {dnickname}")
+                            self.Irc.send2socket(f":{dnickname} PRIVMSG {sentchannel} :You can now use !submit <nickname> to decide if he will stay or not on this channel ")
+                        except Exception as err:
+                            self.Logs.error(f'{err}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option} #channel')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option} #welcome')
+
+                    case 'deactivate':
                         try:
-                    # vote_for
+                            # vote deactivate #channel
+                            if self.Admin.get_Admin(fromuser) is None:
+                                self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Your are not allowed to execute this command')
+                                return None
+
+                            sentchannel = str(cmd[2]).lower() if self.Base.Is_Channel(str(cmd[2]).lower()) else None
+                            if sentchannel is None:
+                                self.Irc.send2socket(f":{dnickname} NOTICE {fromuser} :The correct command is {self.Config.SERVICE_PREFIX}{command} {option} #CHANNEL")
+
+                            self.Irc.send2socket(f":{dnickname} SAMODE {sentchannel} -o {dnickname}")
+                            self.Irc.send2socket(f":{dnickname} PART {sentchannel}")
+
+                            for chan in self.VOTE_CHANNEL_DB:
+                                if chan.channel_name == sentchannel:
+                                    self.VOTE_CHANNEL_DB.remove(chan)
+                                    self.Base.db_query_channel('del', self.module_name, chan.channel_name)
+
+                            self.Logs.debug(f"The Channel {sentchannel} has been deactivated from the vote system")
+                        except Exception as err:
+                            self.Logs.error(f'{err}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option} #channel')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option} #welcome')
+
+                    case '+':
+                        try:
+                            # vote +
                             channel = fromchannel
                             for chan in self.VOTE_CHANNEL_DB:
                                 if chan.channel_name == channel:
@@ -286,16 +334,14 @@ class Votekick():
                                         chan.vote_for += 1
                                         chan.voter_users.append(fromuser)
                                         self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :Vote recorded, thank you')
+                        except Exception as err:
+                            self.Logs.error(f'{err}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option}')
 
-                except KeyError as ke:
+                    case '-':
-                    self.Logs.error(f'Key Error: {ke}')
-                except IndexError as ie:
-                    self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} vote_cancel #channel')
-                    self.Logs.error(f'Index Error: {ie}')
-
-            case 'vote_against':
                         try:
-                    # vote_against
+                            # vote -
                             channel = fromchannel
                             for chan in self.VOTE_CHANNEL_DB:
                                 if chan.channel_name == channel:
@@ -305,44 +351,52 @@ class Votekick():
                                         chan.vote_against += 1
                                         chan.voter_users.append(fromuser)
                                         self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :Vote recorded, thank you')
+                        except Exception as err:
+                            self.Logs.error(f'{err}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option}')
 
-                except KeyError as ke:
+                    case 'cancel':
-                    self.Logs.error(f'Key Error: {ke}')
-
-            case 'vote_stat':
                         try:
-                    # channel = str(fullcmd[2]).lower()
+                            # vote cancel
+                            if self.Admin.get_Admin(fromuser) is None:
+                                self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Your are not allowed to execute this command')
+                                return None
+
+                            if channel is None:
+                                self.Logs.error(f"The channel is not known, defender can't cancel the vote")
+                                self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :You need to specify the channel => /msg {dnickname} vote_cancel #channel')
+
+                            for vote in self.VOTE_CHANNEL_DB:
+                                if vote.channel_name == channel:
+                                    self.init_vote_system(channel)
+                                    self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :Vote system re-initiated')
+
+                        except Exception as err:
+                            self.Logs.error(f'{err}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option}')
+
+                    case 'status':
+                        try:
+                            # vote status
                             for chan in self.VOTE_CHANNEL_DB:
                                 if chan.channel_name == channel:
                                     self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :Channel: {chan.channel_name} | Target: {self.User.get_nickname(chan.target_user)} | For: {chan.vote_for} | Against: {chan.vote_against} | Number of voters: {str(len(chan.voter_users))}')
 
-                except KeyError as ke:
+                        except Exception as err:
-                    self.Logs.error(f'Key Error: {ke}')
+                            self.Logs.error(f'{err}')
-
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option}')
-            case 'vote_verdict':
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option}')
-                try:
-                    # channel = str(fullcmd[2]).lower()
-                    for chan in self.VOTE_CHANNEL_DB:
-                        if chan.channel_name == channel:
-                            target_user = self.User.get_nickname(chan.target_user)
-                            if chan.vote_for > chan.vote_against:
-                                self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :User {self.Config.CONFIG_COLOR["gras"]}{target_user}{self.Config.CONFIG_COLOR["nogc"]} has {chan.vote_against} votes against and {chan.vote_for} votes for. For this reason, it\'ll be kicked from the channel')
-                                self.Irc.send2socket(f":{dnickname} KICK {channel} {target_user} Following the vote, you are not welcome in {channel}")
-                            elif chan.vote_for <= chan.vote_against:
-                                self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :User {self.Config.CONFIG_COLOR["gras"]}{target_user}{self.Config.CONFIG_COLOR["nogc"]} has {chan.vote_against} votes against and {chan.vote_for} votes for. For this reason, it\'ll remain in the channel')
-                            
-                            # Init the system
-                            if self.init_vote_system(channel):
-                                self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :System vote re initiated')
-
-                except KeyError as ke:
-                    self.Logs.error(f'Key Error: {ke}')
 
                     case 'submit':
-                # submit nickname
                         try:
-                    nickname_submitted = cmd[1]
+                            # vote submit nickname
-                    # channel = str(fullcmd[2]).lower()
+                            if self.Admin.get_Admin(fromuser) is None:
+                                self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Your are not allowed to execute this command')
+                                return None
+
+                            nickname_submitted = cmd[2]
                             uid_submitted = self.User.get_uid(nickname_submitted)
                             user_submitted = self.User.get_User(nickname_submitted)
 
@@ -390,54 +444,31 @@ class Votekick():
                             self.Base.create_timer(60, self.timer_vote_verdict, (channel, ))
                             self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :This vote will end after 60 secondes')
 
-                except KeyError as ke:
+                        except Exception as err:
-                    self.Logs.error(f'Key Error: {ke}')
+                            self.Logs.error(f'{err}')
-                except TypeError as te:
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option} nickname')
-                    self.Logs.error(te)
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option} adator')
 
-            case 'activate':
+                    case 'verdict':
                         try:
-                    # activate #channel
+                            # vote verdict
-                    sentchannel = str(cmd[1]).lower() if self.Base.Is_Channel(str(cmd[1]).lower()) else None
+                            if self.Admin.get_Admin(fromuser) is None:
-                    if sentchannel is None:
+                                self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Your are not allowed to execute this command')
-                        self.Irc.send2socket(f":{dnickname} NOTICE {fromuser} :The correct command is {self.Config.SERVICE_PREFIX}ACTIVATE #CHANNEL")
+                                return None
-
-                    self.insert_vote_channel(
-                        self.VoteChannelModel(
-                            channel_name=sentchannel,
-                            target_user='',
-                            voter_users=[],
-                            vote_for=0,
-                            vote_against=0
-                            )
-                        )
-
-                    self.Base.db_query_channel('add', self.module_name, sentchannel)
-
-                    self.Irc.send2socket(f":{dnickname} JOIN {sentchannel}")
-                    self.Irc.send2socket(f":{dnickname} SAMODE {sentchannel} +o {dnickname}")
-                    self.Irc.send2socket(f":{dnickname} PRIVMSG {sentchannel} :You can now use !submit <nickname> to decide if he will stay or not on this channel ")
-
-                except KeyError as ke:
-                    self.Logs.error(f"Key Error : {ke}")
-
-            case 'deactivate':
-                try:
-                    # deactivate #channel
-                    sentchannel = str(cmd[1]).lower() if self.Base.Is_Channel(str(cmd[1]).lower()) else None
-                    if sentchannel is None:
-                        self.Irc.send2socket(f":{dnickname} NOTICE {fromuser} :The correct command is {self.Config.SERVICE_PREFIX}DEACTIVATE #CHANNEL")
-
-                    self.Irc.send2socket(f":{dnickname} SAMODE {sentchannel} -o {dnickname}")
-                    self.Irc.send2socket(f":{dnickname} PART {sentchannel}")
 
                             for chan in self.VOTE_CHANNEL_DB:
-                        if chan.channel_name == sentchannel:
+                                if chan.channel_name == channel:
-                            self.VOTE_CHANNEL_DB.remove(chan)
+                                    target_user = self.User.get_nickname(chan.target_user)
-                            self.Base.db_query_channel('del', self.module_name, chan.channel_name)
+                                    if chan.vote_for > chan.vote_against:
-                            # self.db_delete_vote_channel(chan.channel_name)
+                                        self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :User {self.Config.CONFIG_COLOR["gras"]}{target_user}{self.Config.CONFIG_COLOR["nogc"]} has {chan.vote_against} votes against and {chan.vote_for} votes for. For this reason, it\'ll be kicked from the channel')
+                                        self.Irc.send2socket(f":{dnickname} KICK {channel} {target_user} Following the vote, you are not welcome in {channel}")
+                                    elif chan.vote_for <= chan.vote_against:
+                                        self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :User {self.Config.CONFIG_COLOR["gras"]}{target_user}{self.Config.CONFIG_COLOR["nogc"]} has {chan.vote_against} votes against and {chan.vote_for} votes for. For this reason, it\'ll remain in the channel')
                                     
-                    self.Logs.debug(f"The Channel {sentchannel} has been deactivated from the vote system")
+                                    # Init the system
-
+                                    if self.init_vote_system(channel):
-                except KeyError as ke:
+                                        self.Irc.send2socket(f':{dnickname} PRIVMSG {channel} :System vote re initiated')
-                    self.Logs.error(f"Key Error : {ke}")
+                        except Exception as err:
+                            self.Logs.error(f'{err}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :/msg {dnickname} {command} {option}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :Exemple /msg {dnickname} {command} {option}')