Merge lp:~stefanor/ibid/meeting-nomessage-598094 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Don't try to process() events without a message in meeting

Proposed for 0.1 too

[Michael Gorven (mgorven)]

Uh, why not event.type == 'message'?

[Max Rabkin (max-rabkin)]

What Michael said. Also, why not use @handler, and are we sure we don't want to log actions and state events?

[lp:~stefanor/ibid/meeting-nomessage-598094]

910. By Stefano Rivera on 2010-07-04

Correctly log events that don't have messages or senders

[Stefano Rivera (stefanor)]

r910

[Jonathan Hitchcock (vhata)]

review: Approve

[Max Rabkin (max-rabkin)]

review: Approve

=== modified file 'ibid/plugins/meetings.py'
--- ibid/plugins/meetings.py	2010-03-27 15:50:58 +0000
+++ ibid/plugins/meetings.py	2010-07-04 15:17:26 +0000
@@ -247,18 +247,27 @@
     features = ('meeting',)
 
     def process(self, event):
-        if 'channel' in event and 'source' in event \
-                and (event.source, event.channel) in meetings:
+        if ('channel' in event and 'source' in event
+                and (event.source, event.channel) in meetings):
             meeting = meetings[(event.source, event.channel)]
-            message = event.message
-            if isinstance(message, dict):
-                message = message['raw']
-            meeting['log'].append({
+
+            log_event = {
                 'nick': event.sender['nick'],
                 'type': event.type,
-                'message': message,
                 'time': event.time,
-            })
+            }
+
+            if 'message' in event:
+                message = event.message
+                if isinstance(message, dict):
+                    message = message['raw']
+                log_event['message'] = message
+
+            if 'sender' in event:
+                log_event['nick'] = event.sender['nick']
+
+            meeting['log'].append(log_event)
+
             for response in event.responses:
                 type = 'message'
                 if response.get('action', False):