Merge lp:~vhata/ibid/saydo-499450 into lp:~ibid-core/ibid/old-trunk-1.6

Proposed by Jonathan Hitchcock
Status: Merged
Approved by: Michael Gorven
Approved revision: 803
Merged at revision: 803
Proposed branch: lp:~vhata/ibid/saydo-499450
Merge into: lp:~ibid-core/ibid/old-trunk-1.6
Diff against target: 16 lines (+2/-2)
1 file modified
ibid/plugins/basic.py (+2/-2)
To merge this branch: bzr merge lp:~vhata/ibid/saydo-499450
Reviewer Review Type Date Requested Status
Michael Gorven Approve
Stefano Rivera Approve
Review via email: mp+16482@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Hitchcock (vhata) wrote :

This plugin doesn't do any sort of identity looking up yet. If you tell it to say something to NAME on SOURCE, it should find out what CURRENTSOURCE/NAME's identity is on SOURCE, and send the message to that identity. But it doesn't. This is a bigger task than this branch/bug warrants, though.

Revision history for this message
Stefano Rivera (stefanor) :
review: Approve
Revision history for this message
Michael Gorven (mgorven) wrote :

 review approve
 status approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/basic.py'
2--- ibid/plugins/basic.py 2009-12-05 18:26:45 +0000
3+++ ibid/plugins/basic.py 2009-12-22 15:28:13 +0000
4@@ -13,10 +13,10 @@
5
6 permission = u'saydo'
7
8- @match(r'^(say|do)\s+(?:in\s+)?(\S+)\s+(?:on\s+(\S+)\s+)?(.*)$', 'deaddressed')
9+ @match(r'^(say|do)\s+(?:in|to)\s+(\S+)\s+(?:on\s+(\S+)\s+)?(.*)$', 'deaddressed')
10 @authorise()
11 def saydo(self, event, action, channel, source, what):
12- event.addresponse(what, address=False, target=channel, source=source,
13+ event.addresponse(what, address=False, target=channel, source=source or event.source,
14 action=(action.lower() == u"do"))
15
16 help['redirect'] = u'Redirects the response to a command to a different channel.'

Subscribers

People subscribed via source and target branches