Merge lp:~mgorven/ibid/irc-quit-343790 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Michael Gorven]

[Jonathan Hitchcock (vhata)]

review: Approve

[lp:~mgorven/ibid/irc-quit-343790]

583. By Michael Gorven on 2009-03-16

Check that source is present to silence ibid-plugin.

[Stefano Rivera (stefanor)]

Not tested, but no objections now that the source check is backed out.

review: Approve

[Michael Gorven (mgorven)]

Fixed the possible regression with ibid-plugin.

[Michael Gorven (mgorven)]

 status approve

review: Approve

=== modified file 'ibid/plugins/log.py'
--- ibid/plugins/log.py	2009-03-01 14:36:38 +0000
+++ ibid/plugins/log.py	2009-03-16 18:53:48 +0000
@@ -20,7 +20,7 @@
 
     def get_logfile(self, source, channel, when):
         when = localtime(when)
-        if source.lower() in ibid.sources and ibid.sources[source.lower()].type == 'jabber':
+        if ibid.sources[source.lower()].type == 'jabber':
             channel = channel.split('/')[0]
         filename = self.log %   {   'source': source,
                                     'channel': channel,
 
=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py	2009-03-01 23:04:43 +0000
+++ ibid/source/irc.py	2009-03-16 18:52:53 +0000
@@ -53,9 +53,10 @@
     def _state_event(self, user, channel, action, kicker=None, message=None):
         event = self._create_event(u'state', user, channel)
         event.state = action
+        if message:
+            event.message = unicode(message, 'utf-8', 'replace')
         if kicker:
             event.kicker = unicode(kicker, 'utf-8', 'replace')
-            if message: event.message = unicode(message, 'utf-8', 'replace')
             self.factory.log.debug(u"%s has been kicked from %s by %s (%s)", event.sender['id'], event.channel, event.kicker, event.message)
         else:
             self.factory.log.debug(u"%s has %s %s", user, action, channel)
@@ -88,7 +89,8 @@
         self._state_event(user, channel, u'offline')
 
     def userQuit(self, user, channel):
-        self._state_event(user, channel, u'offline')
+        # Channel contains the quit message
+        self._state_event(user, '', u'offline', message=channel)
 
     def userKicked(self, kickee, channel, kicker, message):
         self._state_event(kickee, channel, u'kicked', kicker, message)