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

Proposed by XavierAntoviaque on 2012-02-13
Status: Merged
Approved by: Stefano Rivera on 2012-02-13
Approved revision: 1045
Merged at revision: 1044
Proposed branch: lp:~xavier-antoviaque/ibid/statechangeevents-722627
Merge into: lp:ibid
Diff against target: 13 lines (+3/-0)
1 file modified
ibid/plugins/meetings.py (+3/-0)
To merge this branch: bzr merge lp:~xavier-antoviaque/ibid/statechangeevents-722627
Reviewer Review Type Date Requested Status
Jonathan Hitchcock Approve on 2012-02-13
Stefano Rivera 2012-02-13 Approve on 2012-02-13
Review via email: mp+92861@code.launchpad.net

Commit message

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

To post a comment you must log in.
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.

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) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/meetings.py'
2--- ibid/plugins/meetings.py 2011-02-22 21:50:56 +0000
3+++ ibid/plugins/meetings.py 2012-02-13 22:13:18 +0000
4@@ -263,6 +263,9 @@
5 if isinstance(message, dict):
6 message = message['raw']
7 log_event['message'] = message
8+ elif event['type'] == u'state':
9+ log_event['type'] = u'notice'
10+ log_event['message'] = event['state']
11
12 if 'sender' in event:
13 log_event['nick'] = event.sender['nick']

Subscribers

People subscribed via source and target branches