mirror of
https://github.com/iio612/DEFENDER.git
synced 2026-02-13 11:14:23 +00:00
Merge pull request #85 from adator85/v6.2.0
Fix removing a user when he leave a channel
This commit is contained in:
@@ -508,12 +508,11 @@ class Base:
|
||||
"""Methode qui supprime les timers qui ont finis leurs job
|
||||
"""
|
||||
try:
|
||||
|
||||
for timer in self.running_timers:
|
||||
if not timer.is_alive():
|
||||
timer.cancel()
|
||||
self.running_timers.remove(timer)
|
||||
self.logs.info(f"-- Timer {str(timer)} removed")
|
||||
self.logs.debug(f"-- Timer {str(timer)} removed")
|
||||
else:
|
||||
self.logs.debug(f"--* Timer {str(timer)} Still running ...")
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ class Channel:
|
||||
|
||||
return True
|
||||
|
||||
def delete_user_from_channel(self, channel_name: str, uid:str) -> bool:
|
||||
def delete_user_from_channel(self, channel_name: str, uid: str) -> bool:
|
||||
"""Delete a user from a channel
|
||||
|
||||
Args:
|
||||
@@ -95,8 +95,7 @@ class Channel:
|
||||
"""
|
||||
try:
|
||||
result = False
|
||||
|
||||
chan_obj = self.get_channel(channel_name.lower())
|
||||
chan_obj = self.get_channel(channel_name)
|
||||
|
||||
if chan_obj is None:
|
||||
return result
|
||||
|
||||
@@ -726,13 +726,10 @@ class Unrealircd6:
|
||||
serverMsg (list[str]): Original server message
|
||||
"""
|
||||
try:
|
||||
# ['@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']
|
||||
|
||||
# ['@unrealircd.org', ':001EPFBRD', 'PART', '#welcome', ':WEB', 'IRC', 'Paris']
|
||||
uid = str(serverMsg[1]).lstrip(':')
|
||||
channel = str(serverMsg[3]).lower()
|
||||
self.__Irc.Channel.delete_user_from_channel(channel, uid)
|
||||
|
||||
return None
|
||||
|
||||
except IndexError as ie:
|
||||
|
||||
@@ -897,7 +897,7 @@ class Irc:
|
||||
self.Protocol.on_squit(serverMsg=original_response)
|
||||
|
||||
case 'PART':
|
||||
self.Protocol.on_part(serverMsg=parsed_protocol)
|
||||
self.Protocol.on_part(serverMsg=original_response)
|
||||
|
||||
case 'VERSION':
|
||||
self.Protocol.on_version_msg(serverMsg=original_response)
|
||||
|
||||
Reference in New Issue
Block a user