Merge lp:~stefanor/ibid/memo-source-634253 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Always respond to memo sending with confirmation of recipient. Allow memos to begin with "on ..." when not naming a known source.

[marcog (marco-gallotta)]

23 + response = (u"OK. I'll assume that you want me to tell "
24 + u"that to %s on %s." % (who, event.source))

In some obscure corner case of ambiguity, we're responding with an unusual reply. Isn't this going to be a little surprising? Perhaps change the default response to: Okay. I'll (tell|ask) <user> [on <source>].

Also, what happened to not liking tuples for the response? :P

review: Needs Fixing

[Stefano Rivera (stefanor)]

Marco: r911

[marcog (marco-gallotta)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

[Max Rabkin (max-rabkin)]

<Taejo> tibid: tell Taejo on second thoughts, I'm not sure if this patch is right
<tibid> Taejo: Got it, I'll tell Taejo on atrum
<Taejo> lessee
<tibid> Taejo: By the way, Taejo on atrum told me "tell Taejo thoughts, I'm not sure if this patch is right" 6 seconds ago

review: Needs Fixing

[Max Rabkin (max-rabkin)]

review: Approve

[marcog (marco-gallotta)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/memo.py'
--- ibid/plugins/memo.py	2010-08-15 11:28:32 +0000
+++ ibid/plugins/memo.py	2010-10-07 14:49:45 +0000
@@ -3,6 +3,8 @@
 
 from datetime import datetime
 import logging
+from random import choice
+import re
 
 import ibid
 from ibid.plugins import Processor, handler, match, authorise
@@ -71,14 +73,16 @@
     permissions = (u'recvmemo',)
 
     @match(r'^\s*(?:please\s+)?(tell|pm|privmsg|msg|ask)'
-           r'\s+(\S+)\s+(?:on\s+(\S+)\s+)?(.+?)\s*$', version='deaddressed')
+           r'\s+(\S+)\s+(.+?)\s*$', version='deaddressed')
     @authorise(fallthrough=False)
-    def tell(self, event, how, who, source, memo):
-        source_specified = bool(source)
-        if not source:
+    def tell(self, event, how, who, memo):
+        m = re.match(r'^on\s+(\S+?)\s+(.+)$', memo, re.I | re.U)
+        source_specified = bool(m) and m.group(1).lower() in ibid.sources
+        if source_specified:
+            source = m.group(1).lower()
+            memo = m.group(2)
+        else:
             source = event.source
-        else:
-            source = source.lower()
 
         if source.lower() == event.source and \
                 any(True for name in ibid.config.plugins['core']['names']
@@ -87,7 +91,7 @@
             return
 
         to = event.session.query(Identity) \
-                .filter_by(identity=who, source=source).first()
+                  .filter_by(identity=who, source=source).first()
 
         if not to and not source_specified:
             account = event.session.query(Account) \
@@ -139,7 +143,13 @@
         nomemos_cache.clear()
         notified_overlimit_cache.discard(to.id)
 
-        event.addresponse(True)
+        event.addresponse(u"%(acknowledgement)s, I'll %(action)s "
+                          u"%(recipient)s on %(source)s", {
+            'acknowledgement': choice(('Okay', 'Righto', 'Sure', 'Got it')),
+            'action': how.lower(),
+            'recipient': to.identity,
+            'source': to.source,
+        })
 
     @match(r'^(?:delete|forget)\s+(?:my\s+)?'
             r'(?:(first|last|\d+(?:st|nd|rd|th)?)\s+)?' # 1st way to specify number