From be6116f958f1bcc905c9824b0b02399c635ea6cf Mon Sep 17 00:00:00 2001 From: Milos Petkovic Date: Mon, 17 Jun 2013 08:09:16 +0200 Subject: [PATCH 1/3] Reset network uptime on reconnection as well --- src/irclib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/irclib.py b/src/irclib.py index a8e1f1e78..dfb73022b 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -910,6 +910,7 @@ class Irc(IrcCommandDispatcher): self.lastTake = 0 self.server = 'unset' self.afterConnect = False + self.startedAt = time.time() self.lastping = time.time() self.outstandingPing = False From b4a63fa89e02319b27794195199999f9b3871884 Mon Sep 17 00:00:00 2001 From: Milos Petkovic Date: Mon, 17 Jun 2013 08:53:44 +0200 Subject: [PATCH 2/3] Prevent entrymsgs from spamming warnings --- plugins/Services/plugin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py index 12a13b82a..4f1d462e9 100644 --- a/plugins/Services/plugin.py +++ b/plugins/Services/plugin.py @@ -264,6 +264,8 @@ class Services(callbacks.Plugin): on) elif 'inviting' in s: self.log.debug('Got "Inviting to channel" from ChanServ %s.', on) + elif s.startswith('[#'): + self.log.debug('Got entrymsg from ChanServ %s.', on) else: self.log.warning('Got unexpected notice from ChanServ %s: %r.', on, msg) From 0f3f6da84344f5e382e07ab1362f4a1f94eec9d7 Mon Sep 17 00:00:00 2001 From: Milos Petkovic Date: Mon, 17 Jun 2013 23:54:59 +0200 Subject: [PATCH 3/3] Multiple channel types should be supported --- plugins/Services/plugin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py index 4f1d462e9..053134265 100644 --- a/plugins/Services/plugin.py +++ b/plugins/Services/plugin.py @@ -264,8 +264,10 @@ class Services(callbacks.Plugin): on) elif 'inviting' in s: self.log.debug('Got "Inviting to channel" from ChanServ %s.', on) - elif s.startswith('[#'): - self.log.debug('Got entrymsg from ChanServ %s.', on) + elif s.startswith('['): + chanTypes = irc.state.supported['CHANTYPES'] + if re.match(r'^\[[%s]' % re.escape(chanTypes), s): + self.log.debug('Got entrymsg from ChanServ %s.', on) else: self.log.warning('Got unexpected notice from ChanServ %s: %r.', on, msg)