computertech/duckhunt
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix auto-rejoin after KICK to rejoin immediately

Browse Source
This commit is contained in:
3nd3r
2025-12-28 23:04:37 -06:00
parent 5e4bbb4309
commit a8b4196cf2
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/duckhuntbot.py
View File

@@ -305,29 +305,27 @@ class DuckHuntBot:
self.logger.info(f"Rejoin attempt {self.rejoin_attempts[channel]}/{max_attempts} for {channel}") self.logger.info(f"Rejoin attempt {self.rejoin_attempts[channel]}/{max_attempts} for {channel}")
# Wait before attempting rejoin
await asyncio.sleep(retry_interval)
# Check if we're still connected and registered # Check if we're still connected and registered
if not self.registered or not self.writer or self.writer.is_closing(): if not self.registered or not self.writer or self.writer.is_closing():
self.logger.warning(f"Cannot rejoin {channel}: not connected to server") self.logger.warning(f"Cannot rejoin {channel}: not connected to server")
await asyncio.sleep(retry_interval)
continue continue
# Attempt to rejoin # Attempt to rejoin
if self.send_raw(f"JOIN {channel}"): if self.send_raw(f"JOIN {channel}"):
self.channels_joined.add(channel) self.pending_joins[channel] = None
self.logger.info(f"Successfully rejoined {channel}") self.logger.info(f"Sent JOIN for {channel} (waiting for server confirmation)")
# Reset attempt counter and remove task
self.rejoin_attempts[channel] = 0
if channel in self.rejoin_tasks:
del self.rejoin_tasks[channel]
return
else: else:
self.logger.warning(f"Failed to send JOIN command for {channel}") self.logger.warning(f"Failed to send JOIN command for {channel}")
# Wait before next attempt (if needed)
await asyncio.sleep(retry_interval)
# If we've exceeded max attempts or channel was successfully joined # If we've exceeded max attempts or channel was successfully joined
if self.rejoin_attempts[channel] >= max_attempts: if channel in self.channels_joined:
self.rejoin_attempts[channel] = 0
self.logger.info(f"Rejoin confirmed for {channel}")
elif self.rejoin_attempts[channel] >= max_attempts:
self.logger.error(f"Exhausted all {max_attempts} rejoin attempts for {channel}") self.logger.error(f"Exhausted all {max_attempts} rejoin attempts for {channel}")
# Clean up # Clean up