diff --git a/plugins/relay.py b/plugins/relay.py index b27d7e2..fd3fad6 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -511,16 +511,6 @@ def initialize_channel(irc, channel): # Join their (remote) users and set their modes, if applicable. if remotechan in remoteirc.channels: rc = remoteirc.channels[remotechan] - ''' - if not hasattr(rc, '_relay_initial_burst'): - rc._relay_initial_burst = threading.Event() - - if rc._relay_initial_burst.is_set(): - log.debug('(%s) relay.initialize_channel: skipping inbound burst from %s/%s => %s/%s ' - 'as it has already been bursted', irc.name, remoteirc.name, remotechan, irc.name, channel) - continue - rc._relay_initial_burst.set() - ''' relay_joins(remoteirc, remotechan, rc.users, rc.ts, targetirc=irc) # Only update the topic if it's different from what we already have, diff --git a/utils.py b/utils.py index 82f3c52..434b2e2 100644 --- a/utils.py +++ b/utils.py @@ -248,19 +248,6 @@ class ServiceBot(): to_part = [] persistent_channels = self.get_persistent_channels(irc) for channel in channels: - ''' - if channel in irc.channels and uid in irc.channels[channel].users: - for dch_namespace, dch_data in self.dynamic_channels.items(): - if irc.name in dch_data and channel in dch_data[irc.name]: - log.debug('(%s/%s) Not parting %r because namespace %r still registers it ' - 'as a dynamic channel.', irc.name, self.name, channel, - dch_namespace) - break - else: - to_part.append(channel) - irc.part(uid, channel, '') # TODO: configurable part message? - ''' - if channel in irc.channels and uid in irc.channels[channel].users: if channel in persistent_channels: log.debug('(%s/%s) Not parting %r because it is registered '