Merge lp:~max-rabkin/ibid/invite-705907 into lp:~ibid-core/ibid/old-trunk-1.6

[Max Rabkin]

Handle invite events in Address, Ignore, Complain and Identity

[lp:~max-rabkin/ibid/invite-705907]

997. By marcog on 2011-01-21

Provide the possibility to join a channel with a key. Only supported in IRC so far.
Author: marcog
Approved by: Max Rabkin, Stefano Rivera
Fixes LP: #502294

998. By Stefano Rivera on 2011-01-21

URLErrors have reasons, but there are other HTTPErrors
Author: Stefano Rivera
Approved by: marcog, Max Rabkin
Fixes LP: #670855

999. By Stefano Rivera on 2011-01-21

Add parse_timestamp function to ibid.utils, use for parsing timestamps from Twitter.
Author: Stefano Rivera
Approved by: marcog, Max Rabkin
Fixes LP: #702815

1000. By Stefano Rivera on 2011-01-21

Add intersphinx links to Python documentation.
Author: Stefano Rivera
Approved by: marcog, Max Rabkin
Fixes LP: #

1001. By Keegan Carruthers-Smith on 2011-01-21

Use correct plurality in pending memos message
Author: Keegan Carruthers-Smith
Approved by: Max Rabkin, Stefano Rivera, marcog
Fixes LP: #634257

[Stefano Rivera (stefanor)]

This is not enough:

DEBUG source.atrum: Invited into #ibidtest2 by tumblingweed
DEBUG core.dispatcher: Received event from atrum source
INFO core.auth: Checking sources permission for None/202 (tumblingweed!<email address hidden>): no
DEBUG core.dispatcher: {'account': None, 'responses': [{'reply': u'Just do it yourself', 'address': True, 'target': u'#ibidtest2', 'conflate': True, 'source': u'atrum'}], 'complain': u'notauthed', 'source': u'atrum', 'addressed': True, 'processed': True, 'time': datetime.datetime(2011, 1, 21, 23, 16, 9, 353412), 'identity': 202, 'type': u'invite', 'public': False, 'channel': u'#ibidtest2', 'sender': {'nick': u'tumblingweed', 'connection': u'tumblingweed!<email address hidden>', 'id': u'tumblingweed'}}
DEBUG core.dispatcher: Returning event to atrum source
DEBUG source.atrum: Sent privmsg to #ibidtest2: Just do it yourself

review: Needs Fixing

[lp:~max-rabkin/ibid/invite-705907]

1002. By Stefano Rivera on 2011-01-25

Add function get_regexp_op to ibid.db that returns a REGEXP op that works on Postgres too.
Author: Stefano Rivera
Approved by: Jonathan Hitchcock, marcog, Max Rabkin
Fixes LP: #595423

1003. By Dominic Cleal on 2011-01-25

Allow karma plugin to pick up karma changes when addressed=False (albeit with slightly different syntax)
Author: Dominic Cleal
Approved by: Stefano Rivera, Max Rabkin
Fixes LP: #672125

1006. By Max Rabkin on 2011-02-09

Rename channel to target_channel

1007. By Max Rabkin on 2011-02-09

Use unicode in irc joined events

[Max Rabkin (max-rabkin)]

Rebasing did something funny to the list of revisions but the diff looks right.

[Max Rabkin (max-rabkin)]

I'm having issues with libsilc atm, so could somebody please test this on SILC.

[Stefano Rivera (stefanor)]

I can't seem to invite on SILC with irssi. But otherwise LGTM

review: Approve

[Stefano Rivera (stefanor)]

DEBUG core.dispatcher: {'account': 1, 'responses': [{'source': u'reaper', 'reply': u'Happy Sunday, tumbleweed', 'target': u'48e8add50000000000000000000000000407c73fe5bfcee08da571e60e', 'conflate': True, 'address': False}], 'source': u'reaper', 'addressed': True, 'processed': True, 'time': datetime.datetime(2011, 2, 20, 20, 10, 14, 756252), 'identity': 11, 'message': {'raw': u'hi', 'deaddressed': u'hi', 'clean': u'hi', 'stripped': u'hi'}, 'type': u'message', 'public': False, 'channel': u'48e8add50000000000000000000000000407c73fe5bfcee08da571e60e', 'sender': {'nick': u'tumbleweed', 'connection': u'48e8add50000000000000000000000000407c73fe5bfcee08da571e60e', 'id': u'add599b915d243a54f8cd0991be85fce71830eeb'}}
DEBUG core.dispatcher: Returning event to reaper source
DEBUG source.reaper: Sent message to 48e8add50000000000000000000000000407c73fe5bfcee08da571e60e: Happy Sunday, tumbleweed
2011-02-20 22:10:15+0200 [-] Traceback (most recent call last):
2011-02-20 22:10:15+0200 [-] File "/home/stefanor/bzr/ibid/stefanor/tibid/ibid/source/silc.py", line 176, in notify_invite
2011-02-20 22:10:15+0200 [-] event = self._create_event(u'invite', inviter, inviter)
2011-02-20 22:10:15+0200 [-] File "/home/stefanor/bzr/ibid/stefanor/tibid/ibid/source/silc.py", line 39, in _create_event
2011-02-20 22:10:15+0200 [-] event.channel = unicode(channel.channel_name, 'utf-8', 'replace')
2011-02-20 22:10:15+0200 [-] AttributeError: 'SilcUser' object has no attribute 'channel_name'

review: Needs Fixing

[lp:~max-rabkin/ibid/invite-705907]

1008. By Max Rabkin on 2011-02-21

Users aren't channels on SILC

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/core.py'
--- ibid/plugins/core.py	2010-06-22 22:20:18 +0000
+++ ibid/plugins/core.py	2011-02-21 11:38:10 +0000
@@ -70,7 +70,7 @@
 
     priority = -1500
     addressed = False
-    event_types = (u'message', u'action', u'notice')
+    event_types = (u'message', u'action', u'notice', u'invite')
 
     nicks = ListOption('ignore', 'List of nicks to ignore', [])
 
@@ -97,7 +97,7 @@
     priority = 1600
     processed = True
     addressed = False
-    event_types = ('message', 'action', 'notice', 'state')
+    event_types = (u'message', u'action', u'notice', u'state', u'invite')
 
     acknowledgements = ListOption('acknowledgements', 'Responses for positive acknowledgements',
             (u'Okay', u'Sure', u'Done', u'Righto', u'Alrighty', u'Yessir'))
@@ -130,7 +130,7 @@
 
     priority = 950
     processed = True
-    event_types = ('message', 'action')
+    event_types = (u'message', u'action', u'invite')
 
     complaints = DictOption('complaints', 'Complaint responses', {
         'nonsense': (
 
=== modified file 'ibid/plugins/identity.py'
--- ibid/plugins/identity.py	2010-04-26 10:19:16 +0000
+++ ibid/plugins/identity.py	2011-02-21 11:38:10 +0000
@@ -451,7 +451,7 @@
     priority = -1600
     addressed = False
     processed = True
-    event_types = (u'message', u'state', u'action', u'notice')
+    event_types = (u'message', u'state', u'action', u'notice', u'invite')
 
     @handler
     def handle(self, event):
 
=== modified file 'ibid/plugins/sources.py'
--- ibid/plugins/sources.py	2011-01-21 22:01:13 +0000
+++ ibid/plugins/sources.py	2011-02-21 11:38:10 +0000
@@ -90,9 +90,9 @@
     @handler
     @authorise()
     def invited(self, event):
-        event.addresponse(u'Joining %s', event.channel,
+        event.addresponse(u'Joining %s', event.target_channel,
                             target=event.sender['nick'])
-        ibid.sources[event.source].join(event.channel)
+        ibid.sources[event.source].join(event.target_channel)
 
 class NickServ(Processor):
     event_types = (u'notice',)
 
=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py	2011-01-21 22:01:13 +0000
+++ ibid/source/irc.py	2011-02-21 11:38:10 +0000
@@ -173,7 +173,8 @@
         user = unicode(user, 'utf-8', 'replace')
         channel = unicode(channel, 'utf-8', 'replace')
 
-        event = self._create_event(u'invite', user, channel)
+        event = self._create_event(u'invite', user, user)
+        event.target_channel = channel
         event.public = False
         event.addressed = True
         self.factory.log.debug(u'Invited into %s by %s',
@@ -218,7 +219,7 @@
 
     def joined(self, channel):
         event = Event(self.factory.name, u'source')
-        event.channel = channel
+        event.channel = unicode(channel, 'utf-8', 'replace')
         event.status = u'joined'
         ibid.dispatcher.dispatch(event)
 
 
=== modified file 'ibid/source/silc.py'
--- ibid/source/silc.py	2010-12-24 16:20:42 +0000
+++ ibid/source/silc.py	2011-02-21 11:38:10 +0000
@@ -173,7 +173,8 @@
         del self.users[self._to_hex(user.fingerprint)]
 
     def notify_invite(self, channel, channel_name, inviter):
-        event = self._create_event(u'invite', inviter, channel)
+        event = self._create_event(u'invite', inviter, None)
+        event.target_channel = channel
         event.public = False
         event.addressed = True
         self.factory.log.debug(u'Invited into %s by %s',