Merge lp:~xavier-antoviaque/ibid/statechangeevents-722627 into lp:ibid

[XavierAntoviaque]

Include state change events in meeting logs, rather than just empty lines.

[lp:~xavier-antoviaque/ibid/statechangeevents-722627]

1045. By XavierAntoviaque on 2012-02-13

Fixes #722627 - Meeting plugin logs state change events

Simplifies fix for #722627 - events always have a 'type' and that if the type is state, there's a state property.

[XavierAntoviaque (xavier-antoviaque)]

Updated the fix:

16:48 <tumbleweed> antoviaque: you are guaranteed that events always have a 'type' and that if the type is state, there's a state property
16:48 <antoviaque> tumbleweed: oh good, that should simplify the condition - thx, wasn't sure about that : )

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

LGTM.

review: Approve

=== modified file 'ibid/plugins/meetings.py'
--- ibid/plugins/meetings.py	2011-02-22 21:50:56 +0000
+++ ibid/plugins/meetings.py	2012-02-13 22:13:18 +0000
@@ -263,6 +263,9 @@
                 if isinstance(message, dict):
                     message = message['raw']
                 log_event['message'] = message
+            elif event['type'] == u'state':
+                log_event['type'] = u'notice'
+                log_event['message'] = event['state']
 
             if 'sender' in event:
                 log_event['nick'] = event.sender['nick']