Merge lp:~stefanor/ibid/summon-330869 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Stefano Rivera (stefanor)]

OK I can't reproduce the problem that was holding back this proposal.

[lp:~stefanor/ibid/summon-330869]

794. By Stefano Rivera on 2009-12-28

We now have ibid.compat

795. By Stefano Rivera on 2009-12-28

Werewolf missed the event_types unicoding

[Jonathan Hitchcock (vhata)]

Seeeems good.

review: Approve

[lp:~stefanor/ibid/summon-330869]

796. By Stefano Rivera on 2009-12-29

Merge from trunk

[Michael Gorven (mgorven)]

Seems fine.
 review approve
 status approved

review: Approve

[lp:~stefanor/ibid/summon-330869]

797. By Stefano Rivera on 2009-12-30

Merge from trunk

=== modified file 'ibid/__init__.py'
--- ibid/__init__.py	2009-10-16 16:31:34 +0000
+++ ibid/__init__.py	2009-12-30 22:21:13 +0000
@@ -10,6 +10,7 @@
 import twisted.python.log
 
 import ibid.core
+from ibid.compat import defaultdict
 from ibid.config import FileConfig
 
 class InsensitiveDict(dict):
@@ -32,6 +33,7 @@
 service = None
 options = {}
 rpc = {}
+channels = defaultdict(lambda: defaultdict(set))
 
 def twisted_log(eventDict):
     log = logging.getLogger('twisted')

=== modified file 'ibid/plugins/__init__.py'
--- ibid/plugins/__init__.py	2009-12-10 09:56:44 +0000
+++ ibid/plugins/__init__.py	2009-12-30 22:21:13 +0000
@@ -26,7 +26,7 @@
     explicitly required in the configuration file
     """
 
-    event_types = ('message',)
+    event_types = (u'message',)
     addressed = True
     processed = False
     priority = 0

=== modified file 'ibid/plugins/core.py'
--- ibid/plugins/core.py	2009-12-30 20:53:06 +0000
+++ ibid/plugins/core.py	2009-12-30 22:21:13 +0000
@@ -7,6 +7,7 @@
 from ibid.compat import any
 from ibid.config import IntOption, ListOption, DictOption
 from ibid.plugins import Processor, handler
+from ibid.plugins.identity import identify
 
 class Addressed(Processor):
 
@@ -43,7 +44,7 @@
 
     priority = -1600
     addressed = False
-    event_types = ('message', 'action', 'notice')
+    event_types = (u'message', u'action', u'notice')
 
     pattern = re.compile(r'^\s*(.*?)\s*[?!.]*\s*$', re.DOTALL)
 
@@ -58,7 +59,7 @@
 
     priority = -1500
     addressed = False
-    event_types = ('message', 'action', 'notice')
+    event_types = (u'message', u'action', u'notice')
 
     nicks = ListOption('ignore', 'List of nicks to ignore', [])
 
@@ -85,7 +86,6 @@
     priority = 1600
     processed = True
     addressed = False
-
     event_types = ('message', 'action', 'notice', 'state')
 
     acknowledgements = ListOption('acknowledgements', 'Responses for positive acknowledgements',
@@ -148,7 +148,7 @@
 class RateLimit(Processor):
 
     priority = -1000
-    event_types = ('message', 'action', 'notice')
+    event_types = (u'message', u'action', u'notice')
 
     limit_time = IntOption('limit_time', 'Time period over which to measure messages', 10)
     limit_messages = IntOption('limit_messages', 'Number of messages to allow during the time period', 5)
@@ -210,4 +210,32 @@
         elif isinstance(object, str):
             self.log.warning(u'Found a non-unicode string: %s' % object)
 
+class ChannelTracker(Processor):
+    priority = -1550
+    addressed = False
+    event_types = (u'state', u'source')
+
+    @handler
+    def track(self, event):
+        if event.type == u'source':
+            if event.status == u'disconnected':
+                ibid.channels.pop(event.source, None)
+            elif event.status == u'left':
+                ibid.channels[event.source].pop(event.channel, None)
+        elif event.public:
+            if event.state == u'online' and hasattr(event, 'othername'):
+                oldid = identify(event.session, event.source, event.othername)
+                for channel in ibid.channels[event.source].values():
+                    if oldid in channel:
+                        channel.remove(oldid)
+                        channel.add(event.identity)
+            elif event.state == u'online':
+                ibid.channels[event.source][event.channel].add(event.identity)
+            elif event.state == u'offline' and not hasattr(event, 'othername'):
+                if event.channel:
+                    ibid.channels[event.source][event.channel].remove(event.identity)
+                else:
+                    for channel in ibid.channels[event.source].values():
+                        channel.discard(event.identity)
+
 # vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/games.py'
--- ibid/plugins/games.py	2009-12-30 14:08:03 +0000
+++ ibid/plugins/games.py	2009-12-30 22:21:13 +0000
@@ -218,7 +218,7 @@
     feature = 'duel'
 
     # Parameters for Processor:
-    event_types = ('message', 'action')
+    event_types = (u'message', u'action')
 
     addressed = BoolOption('addressed', 'Must the bot be addressed?', True)
 
@@ -400,7 +400,7 @@
 class DuelFlee(Processor):
     feature = 'duel'
     addressed = False
-    event_types = ('state',)
+    event_types = (u'state',)
 
     @handler
     def dueller_fled(self, event):
@@ -470,7 +470,7 @@
     seer_delay = IntOption('seer_delay',
             'Number of players between extra wolf and extra seer', 4)
 
-    event_types = ('message', 'action')
+    event_types = (u'message', u'action')
 
     @match(r'^(?:start|play|begin)s?\b.*werewolf$')
     def prestart(self, event):
@@ -843,7 +843,7 @@
 
 class WerewolfState(Processor):
     feature = 'werewolf'
-    event_types = ('state',)
+    event_types = (u'state',)
 
     @handler
     def state_change(self, event):

=== modified file 'ibid/plugins/identity.py'
--- ibid/plugins/identity.py	2009-12-22 14:49:33 +0000
+++ ibid/plugins/identity.py	2009-12-30 22:21:13 +0000
@@ -3,9 +3,10 @@
 import logging
 
 import ibid
-from ibid.db import eagerload, IntegrityError
+from ibid.config import Option
+from ibid.db import eagerload, IntegrityError, and_, or_
 from ibid.db.models import Account, Identity, Attribute
-from ibid.plugins import Processor, match, auth_responses
+from ibid.plugins import Processor, match, handler, auth_responses, authorise
 from ibid.utils import human_join
 
 help = {}
@@ -368,11 +369,79 @@
             'identities': human_join(u'%s on %s' % (identity.identity, identity.source) for identity in account.identities),
         })
 
+help['summon'] = u"Get the attention of a person via different source"
+class Summon(Processor):
+    u"summon <person> [via <source>]"
+    feature = 'summon'
+    permission = u'summon'
+
+    default_source = Option('default_source',
+            u'Default source to summon people via', u'jabber')
+
+    @authorise(fallthrough=False)
+    @match(r'^summon\s+(\S+)(?:\s+(?:via|on|using)\s+(\S+))?$')
+    def summon(self, event, who, source):
+        if not source:
+            source = self.default_source
+
+        if source.lower() not in ibid.sources:
+            event.addresponse(u"I'm afraid that I'm not connected to %s",
+                              source)
+            return
+
+        account = event.session.query(Account) \
+            .options(eagerload('identities')) \
+            .join(Identity) \
+            .filter(
+                or_(
+                    and_(
+                        Identity.identity == who,
+                        Identity.source == event.source,
+                    ),
+                    Account.username == who,
+                )) \
+            .first()
+
+        if account:
+            for other_identity in [id for id
+                    in account.identities
+                    if id.source.lower() == source.lower()]:
+                if any(True for channel
+                        in ibid.channels[other_identity.source].itervalues()
+                        if other_identity.id in channel):
+                    event.addresponse(u'Your presence has been requested by '
+                                      u'%(who)s in %(channel)s on %(source)s.',
+                        {
+                            'who': event.sender['nick'],
+                            'channel': (not event.public)
+                                    and u'private' or event.channel,
+                            'source': event.source,
+                        }, target=other_identity.identity,
+                        source=other_identity.source, address=False)
+                    event.addresponse(True)
+                else:
+                    event.addresponse(
+                        u"Sorry %s doesn't appear to be available right now.",
+                        who)
+                return
+
+        event.addresponse(
+                u"Sorry, I don't know how to find %(who)s on %(source)s. "
+                u'%(who)s must first link an identity on %(source)s.', {
+                    'who': who,
+                    'source': source,
+        })
+        return
+
 class Identify(Processor):
 
     priority = -1600
+    addressed = False
+    processed = True
+    event_types = (u'message', u'state', u'action', u'notice')
 
-    def process(self, event):
+    @handler
+    def handle(self, event):
         if event.sender:
             if (event.source, event.sender['connection']) in identify_cache:
                 (event.identity, event.account) = identify_cache[(event.source, event.sender['connection'])]
@@ -414,4 +483,9 @@
     else:
         return (event.identity,)
 
+def identify(session, source, id):
+    identity = session.query(Identity) \
+                      .filter_by(source=source, identity=id).first()
+    return identity and identity.id
+
 # vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/irc.py'
--- ibid/plugins/irc.py	2009-10-20 15:45:46 +0000
+++ ibid/plugins/irc.py	2009-12-30 22:21:13 +0000
@@ -43,8 +43,8 @@
             source.join(channel)
             event.addresponse(u'Joining %s', channel)
         else:
-            source.part(channel)
-            event.addresponse(u'Parting %s', channel)
+            source.leave(channel)
+            event.addresponse(u'Leaving %s', channel)
 
     @match(r'^change\s+nick\s+to\s+(\S+)(?:\s+on\s+(\S+))?$')
     @authorise()
@@ -66,7 +66,7 @@
             event.addresponse(u'Changing nick to %s', nick)
 
 class NickServ(Processor):
-    event_types = ('notice',)
+    event_types = (u'notice',)
 
     def is_nickserv(self, event):
         source_cfg = ibid.config['sources'][event.source]

=== modified file 'ibid/plugins/log.py'
--- ibid/plugins/log.py	2009-12-14 13:40:46 +0000
+++ ibid/plugins/log.py	2009-12-30 22:21:13 +0000
@@ -7,7 +7,7 @@
 from dateutil.tz import tzlocal, tzutc
 
 import ibid
-from ibid.plugins import Processor
+from ibid.plugins import Processor, handler
 from ibid.config import Option, BoolOption
 from ibid.event import Event
 
@@ -15,6 +15,7 @@
 
     addressed = False
     processed = True
+    event_types = (u'message', u'state', u'action', u'notice')
     priority = 1900
 
     log = Option('log', 'Log file to log messages to. Can contain substitutions: source, channel, year, month, day',
@@ -31,6 +32,8 @@
             u'%(timestamp)s -%(sender_nick)s- %(message)s')
     presence_format = Option('presence_format', 'Format string for presence events',
             u'%(timestamp)s %(sender_nick)s (%(sender_connection)s) is now %(state)s')
+    rename_format = Option('rename_format', 'Format string for rename events',
+            u'%(timestamp)s %(sender_nick)s (%(sender_connection)s) has renamed to %(new_nick)s')
 
     public_mode = Option('public_mode',
             u'File Permissions mode for public channels, in octal', '644')
@@ -72,42 +75,51 @@
         return self.logs[filename]
 
     def log_event(self, event):
-        if event.type in ('message', 'state', 'action', 'notice'):
-            when = event.time
-            if not self.date_utc:
-                when = when.replace(tzinfo=tzutc()).astimezone(tzlocal())
-
-            format = {
-                    'message': self.message_format,
-                    'state': self.presence_format,
-                    'action': self.action_format,
-                    'notice': self.notice_format,
-                }[event.type]
-
-            fields = {
-                    'source': event.source,
-                    'channel': event.channel,
-                    'sender_connection': event.sender['connection'],
-                    'sender_id': event.sender['id'],
-                    'sender_nick': event.sender['nick'],
-                    'timestamp': unicode(
-                        when.strftime(self.timestamp_format.encode('utf8')),
-                        'utf8'),
-            }
-
-            if event.type == 'state':
+        when = event.time
+        if not self.date_utc:
+            when = when.replace(tzinfo=tzutc()).astimezone(tzlocal())
+
+        format = {
+                'message': self.message_format,
+                'state': self.presence_format,
+                'action': self.action_format,
+                'notice': self.notice_format,
+            }[event.type]
+
+        # We get two events on a rename, ignore one of them
+        if event.type == 'state' and hasattr(event, 'othername'):
+            if event.state == 'online':
+                return
+            format = self.rename_format
+
+        fields = {
+                'source': event.source,
+                'channel': event.channel,
+                'sender_connection': event.sender['connection'],
+                'sender_id': event.sender['id'],
+                'sender_nick': event.sender['nick'],
+                'timestamp': unicode(
+                    when.strftime(self.timestamp_format.encode('utf8')),
+                    'utf8')
+        }
+
+        if event.type == 'state':
+            if hasattr(event, 'othername'):
+                fields['new_nick'] = event.othername
+            else:
                 fields['state'] = event.state
-            elif isinstance(event.message, dict):
-                fields['message'] = event.message['raw']
-            else:
-                fields['message'] = event.message
-
-            file = self.get_logfile(event)
-
-            file.write((format % fields).encode('utf-8') + '\n')
-            file.flush()
-
-    def process(self, event):
+        elif isinstance(event.message, dict):
+            fields['message'] = event.message['raw']
+        else:
+            fields['message'] = event.message
+
+        file = self.get_logfile(event)
+
+        file.write((format % fields).encode('utf-8') + '\n')
+        file.flush()
+
+    @handler
+    def log_handler(self, event):
         self.log_event(event)
 
         for response in event.responses:

=== modified file 'ibid/plugins/memo.py'
--- ibid/plugins/memo.py	2009-12-20 21:15:42 +0000
+++ ibid/plugins/memo.py	2009-12-30 22:21:13 +0000
@@ -285,7 +285,7 @@
 class Notify(Processor):
     feature = 'memo'
 
-    event_types = ('state',)
+    event_types = (u'state',)
     addressed = False
     processed = True
 

=== modified file 'ibid/plugins/seen.py'
--- ibid/plugins/seen.py	2009-12-20 21:15:42 +0000
+++ ibid/plugins/seen.py	2009-12-30 22:21:13 +0000
@@ -5,7 +5,7 @@
                     Table, Column, ForeignKey, UniqueConstraint, \
                     relation, IntegrityError, Base, VersionedSchema
 from ibid.db.models import Identity, Account
-from ibid.plugins import Processor, match
+from ibid.plugins import Processor, match, handler
 from ibid.utils import ago, format_date
 
 log = logging.getLogger('plugins.seen')
@@ -60,11 +60,12 @@
     feature = 'seen'
 
     priority = 1500
-
-    def process(self, event):
-        if event.type != 'message' and event.type != 'state':
-            return
-
+    event_types = (u'message', u'state')
+    addressed = False
+    processed = True
+
+    @handler
+    def see(self, event):
         sighting = event.session.query(Sighting) \
                 .filter_by(identity_id=event.identity, type=event.type).first()
         if not sighting:

=== modified file 'ibid/source/campfire.py'
--- ibid/source/campfire.py	2009-12-30 16:29:10 +0000
+++ ibid/source/campfire.py	2009-12-30 22:21:13 +0000
@@ -84,7 +84,7 @@
     def join(self, room_name):
         return self.join_room(self._locate_room(room_name))
 
-    def part(self, room_name):
+    def leave(self, room_name):
         return self.leave_room(self._locate_room(room_name))
 
 class SourceFactory(IbidSourceFactory):
@@ -122,7 +122,7 @@
     def join(self, room_name):
         return self.client.join(room_name)
 
-    def part(self, room_name):
-        return self.client.part(room_name)
+    def leave(self, room_name):
+        return self.client.leave(room_name)
 
 # vi: set et sta sw=4 ts=4:

=== modified file 'ibid/source/dc.py'
--- ibid/source/dc.py	2009-12-30 16:29:10 +0000
+++ ibid/source/dc.py	2009-12-30 22:21:13 +0000
@@ -42,6 +42,11 @@
 
     def connectionLost(self, reason):
         self.factory.log.info(u"Disconnected (%s)", reason)
+
+        event = Event(self.factory.name, u'source')
+        event.status = u'disconnected'
+        ibid.dispatcher.dispatch(event)
+
         dcwords.DCClient.connectionLost(self, reason)
 
     def signedOn(self):
@@ -51,6 +56,16 @@
             names.append(self.my_nickname)
             ibid.config.plugins['core']['names'] = names
             ibid.reloader.reload_config()
+
+        event = Event(self.factory.name, u'source')
+        event.status = u'connected'
+        ibid.dispatcher.dispatch(event)
+
+        event = Event(self.factory.name, u'source')
+        event.channel = u'$public'
+        event.status = u'joined'
+        ibid.dispatcher.dispatch(event)
+
         self.factory.log.info(u"Signed on")
 
     def _create_event(self, type, user):
@@ -60,7 +75,6 @@
         event.sender['nick'] = user
         event.channel = u'$public'
         event.public = True
-        event.source = self.factory.name
         return event
 
     def _state_event(self, user, action):

=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py	2009-12-30 22:01:38 +0000
+++ ibid/source/irc.py	2009-12-30 22:21:13 +0000
@@ -22,15 +22,23 @@
 
     def connectionMade(self):
         self.nickname = self.factory.nick.encode('utf-8')
+
         irc.IRCClient.connectionMade(self)
+
         self.factory.resetDelay()
         self.factory.proto = self
         self.auth_callbacks = {}
+        self.mode_prefixes = '@+'
         self._ping_deferred = reactor.callLater(self.factory.ping_interval, self._idle_ping)
         self.factory.log.info(u"Connected")
 
     def connectionLost(self, reason):
         self.factory.log.info(u"Disconnected (%s)", reason)
+
+        event = Event(self.factory.name, u'source')
+        event.status = u'disconnected'
+        ibid.dispatcher.dispatch(event)
+
         irc.IRCClient.connectionLost(self, reason)
 
     def _idle_ping(self):
@@ -73,27 +81,30 @@
             self.join(channel.encode('utf-8'))
         self.factory.log.info(u"Signed on")
 
+        event = Event(self.factory.name, u'source')
+        event.status = u'connected'
+        ibid.dispatcher.dispatch(event)
+
     def _create_event(self, type, user, channel):
         nick = user.split('!', 1)[0]
         event = Event(self.factory.name, type)
-        event.sender['connection'] = unicode(user, 'utf-8', 'replace')
-        event.sender['id'] = unicode(nick, 'utf-8', 'replace')
+        event.sender['connection'] = user
+        event.sender['id'] = nick
         event.sender['nick'] = event.sender['id']
-        event.channel = unicode(channel, 'utf-8', 'replace')
+        event.channel = channel
         event.public = True
-        event.source = self.factory.name
         return event
 
-    def _state_event(self, user, channel, action, kicker=None, message=None):
+    def _state_event(self, user, channel, action, kicker=None, message=None, othername=None):
         event = self._create_event(u'state', user, channel)
         event.state = action
         if message:
-            event.message = unicode(message, 'utf-8', 'replace')
+            event.message = message
         if kicker:
-            event.kicker = unicode(kicker, 'utf-8', 'replace')
+            event.kicker = kicker
             self.factory.log.debug(u"%s has been kicked from %s by %s (%s)", event.sender['id'], event.channel, event.kicker, event.message)
-        else:
-            self.factory.log.debug(u"%s has %s %s", user, action, channel)
+        elif othername:
+            event.othername = othername
         ibid.dispatcher.dispatch(event).addCallback(self.respond)
 
     def privmsg(self, user, channel, msg):
@@ -106,6 +117,9 @@
         self._message_event(u'action', user, channel, msg)
 
     def _message_event(self, msgtype, user, channel, msg):
+        user = unicode(user, 'utf-8', 'replace')
+        channel = unicode(channel, 'utf-8', 'replace')
+
         event = self._create_event(msgtype, user, channel)
         event.message = unicode(msg, 'utf-8', 'replace')
         self.factory.log.debug(u"Received %s from %s in %s: %s", msgtype, event.sender['id'], event.channel, event.message)
@@ -120,16 +134,32 @@
         ibid.dispatcher.dispatch(event).addCallback(self.respond)
 
     def userJoined(self, user, channel):
+        user = unicode(user, 'utf-8', 'replace')
+        channel = unicode(channel, 'utf-8', 'replace')
         self._state_event(user, channel, u'online')
 
     def userLeft(self, user, channel):
+        user = unicode(user, 'utf-8', 'replace')
+        channel = unicode(channel, 'utf-8', 'replace')
         self._state_event(user, channel, u'offline')
 
+    def userRenamed(self, oldname, newname):
+        oldname = unicode(oldname, 'utf-8', 'replace')
+        newname = unicode(newname, 'utf-8', 'replace')
+        self._state_event(oldname, None, u'offline', othername=newname)
+        self._state_event(newname, None, u'online', othername=oldname)
+
     def userQuit(self, user, channel):
         # Channel contains the quit message
-        self._state_event(user, '', u'offline', message=channel)
+        user = unicode(user, 'utf-8', 'replace')
+        channel = unicode(channel, 'utf-8', 'replace')
+        self._state_event(user, None, u'offline', message=channel)
 
     def userKicked(self, kickee, channel, kicker, message):
+        kickee = unicode(kickee, 'utf-8', 'replace')
+        channel = unicode(channel, 'utf-8', 'replace')
+        kicker = unicode(kicker, 'utf-8', 'replace')
+        message = unicode(message, 'utf-8', 'replace')
         self._state_event(kickee, channel, u'kicked', kicker, message)
 
     def respond(self, event):
@@ -149,6 +179,7 @@
             self.factory.log.debug(u"Set topic in %s to %s", target, message)
         elif response.get('action', False):
             # We can't use self.me() because it prepends a # onto channel names
+            # See http://twistedmatrix.com/trac/ticket/3910
             self.ctcpMakeQuery(raw_target, [('ACTION', raw_message)])
             self.factory.log.debug(u"Sent action to %s: %s", target, message)
         elif response.get('notice', False):
@@ -162,9 +193,21 @@
         self.factory.log.info(u"Joining %s", channel)
         irc.IRCClient.join(self, channel.encode('utf-8'))
 
-    def part(self, channel):
+    def joined(self, channel):
+        event = Event(self.factory.name, u'source')
+        event.channel = channel
+        event.status = u'joined'
+        ibid.dispatcher.dispatch(event)
+
+    def leave(self, channel):
         self.factory.log.info(u"Leaving %s", channel)
-        irc.IRCClient.part(self, channel.encode('utf-8'))
+        irc.IRCClient.leave(self, channel.encode('utf-8'))
+
+    def left(self, channel):
+        event = Event(self.factory.name, u'source')
+        event.channel = channel
+        event.status = u'left'
+        ibid.dispatcher.dispatch(event)
 
     def authenticate(self, nick, callback):
         self.sendLine('WHOIS %s' % nick.encode('utf-8'))
@@ -186,6 +229,28 @@
         elif command == "RPL_ENDOFWHOIS":
             self.do_auth_callback(params[1], False)
 
+    def irc_RPL_BOUNCE(self, prefix, params):
+        # Broken in IrcClient :/
+        # See http://twistedmatrix.com/trac/ticket/3285
+        if params[-1] in ('are available on this server', 'are supported by this server'):
+            self.isupport(params[1:-1])
+        else:
+            self.bounce(params[1])
+
+    def isupport(self, options):
+        "Server supports message"
+        for option in options:
+            if option.startswith('PREFIX='):
+                self.mode_prefixes = option.split(')', 1)[1]
+
+    def irc_RPL_NAMREPLY(self, prefix, params):
+        channel = params[2]
+        for user in params[3].split():
+            if user[0] in self.mode_prefixes:
+                user = user[1:]
+            if user != self.nickname:
+                self.userJoined(user, channel)
+
     def ctcpQuery_VERSION(self, user, channel, data):
         nick = user.split("!")[0]
         self.ctcpMakeReply(nick, [('VERSION', 'Ibid %s' % (ibid_version() or '',))])
@@ -244,8 +309,8 @@
     def join(self, channel):
         return self.proto.join(channel)
 
-    def part(self, channel):
-        return self.proto.part(channel)
+    def leave(self, channel):
+        return self.proto.leave(channel)
 
     def change_nick(self, nick):
         return self.proto.setNick(nick.encode('utf-8'))
@@ -254,7 +319,9 @@
         return self.proto.send(response)
 
     def logging_name(self, identity):
-        return identity.split('!')[0]
+        if identity is None:
+            return u''
+        return identity.split(u'!')[0]
 
     def url(self):
         return u'irc://%s@%s:%s' % (self.nick, self.server, self.port)

=== modified file 'ibid/source/jabber.py'
--- ibid/source/jabber.py	2009-12-30 16:29:10 +0000
+++ ibid/source/jabber.py	2009-12-30 22:21:13 +0000
@@ -1,6 +1,6 @@
 import logging
 
-from wokkel import client, xmppim
+from wokkel import client, xmppim, subprotocols
 from twisted.internet import reactor, ssl
 from twisted.words.protocols.jabber.jid import JID
 from twisted.words.xish import domish
@@ -39,27 +39,48 @@
         for room in self.parent.rooms:
             self.join(room)
 
+        event = Event(self.parent.name, u'source')
+        event.status = u'connected'
+        ibid.dispatcher.dispatch(event)
+
+    def connectionLost(self, reason):
+        self.parent.log.info(u"Disconnected (%s)", reason)
+
+        event = Event(self.parent.name, u'source')
+        event.status = u'disconnected'
+        ibid.dispatcher.dispatch(event)
+
+        subprotocols.XMPPHandler.connectionLost(self, reason)
+
+    def _state_event(self, entity, state):
+        event = Event(self.name, u'state')
+        event.state = state
+        if entity.userhost().lower() in self.rooms:
+            nick = entity.full().split('/')[1]
+            event.channel = entity.userhost()
+            if nick == self.parent.nick:
+                event.type = u'connection'
+                event.status = state == u'online' and u'joined' or u'left'
+            else:
+                event.sender['connection'] = entity.full()
+                event.sender['id'] = event.sender['connection']
+                event.sender['nick'] = nick
+                event.public = True
+        else:
+            event.sender['connection'] = entity.full()
+            event.sender['id'] = event.sender['connection'].split('/')[0]
+            event.sender['nick'] = event.sender['connection'].split('@')[0]
+            event.channel = entity.full()
+            event.public = False
+        ibid.dispatcher.dispatch(event).addCallback(self.respond)
+
     def availableReceived(self, entity, show=None, statuses=None, priority=0):
-        event = Event(self.name, u'state')
-        event.sender['connection'] = entity.full()
-        event.sender['id'] = event.sender['connection'].split('/')[0]
-        event.sender['nick'] = event.sender['connection'].split('@')[0]
-        event.state = show or u'online'
-        event.public = False
-        event.channel = entity.full()
-        self.parent.log.debug(u"Received available presence from %s (%s)", event.sender['connection'], event.state)
-        ibid.dispatcher.dispatch(event).addCallback(self.respond)
+        self.parent.log.debug(u"Received available presence from %s (%s)", entity.full(), show)
+        self._state_event(entity, u'online')
 
     def unavailableReceived(self, entity, statuses):
-        event = Event(self.name, u'state')
-        event.sender['connection'] = entity.full()
-        event.sender['id'] = event.sender['connection'].split('/')[0]
-        event.sender['nick'] = event.sender['connection'].split('@')[0]
-        event.state = u'offline'
-        event.public = False
-        event.channel = entity.full()
-        self.parent.log.debug(u"Received unavailable presence from %s", event.sender['connection'])
-        ibid.dispatcher.dispatch(event).addCallback(self.respond)
+        self.parent.log.debug(u"Received unavailable presence from %s", entity.full())
+        self._state_event(entity, u'offline')
 
     def subscribeReceived(self, entity):
         response = xmppim.Presence(to=entity, type='subscribed')
@@ -121,18 +142,18 @@
         self.parent.log.debug(u"Sent %s message to %s: %s", message['type'], message['to'], message.body)
 
     def join(self, room):
+        self.parent.log.info(u"Joining %s", room)
         jid = JID('%s/%s' % (room, self.parent.nick))
         presence = xmppim.AvailablePresence(to=jid)
         self.xmlstream.send(presence)
-        self.rooms.append(room)
-        self.parent.log.info(u"Joining %s", room)
+        self.rooms.append(room.lower())
 
-    def part(self, room):
+    def leave(self, room):
+        self.parent.log.info(u"Leaving %s", room)
         jid = JID('%s/%s' % (room, self.parent.nick))
         presence = xmppim.UnavailablePresence(to=jid)
         self.xmlstream.send(presence)
-        self.rooms.remove(room)
-        self.parent.log.info(u"Leaving %s", room)
+        self.rooms.remove(room.lower())
 
 class SourceFactory(client.DeferredClientFactory, IbidSourceFactory):
 
@@ -182,8 +203,8 @@
     def join(self, room):
         return self.proto.join(room)
 
-    def part(self, room):
-        return self.proto.part(room)
+    def leave(self, room):
+        return self.proto.leave(room)
 
     def url(self):
         return u'xmpp://%s' % (self.jid_str,)

=== modified file 'ibid/source/silc.py'
--- ibid/source/silc.py	2009-12-30 18:34:43 +0000
+++ ibid/source/silc.py	2009-12-30 22:21:13 +0000
@@ -20,7 +20,7 @@
         self.users = {}
 
         self.factory.join = self.join
-        self.factory.part = self.part
+        self.factory.leave = self.leave
         self.factory.send = self.send
 
     def _create_event(self, type, user, channel):
@@ -34,7 +34,6 @@
         else:
             event.channel = event.sender['connection']
         event.public = True
-        event.source = self.factory.name
 
         self.users[event.sender['connection']] = user
         self.users[event.sender['id']] = user
@@ -115,7 +114,7 @@
         self.command_call('JOIN %s' % channel)
         return True
 
-    def part(self, channel):
+    def leave(self, channel):
         if channel not in self.channels:
             return False
 
@@ -147,6 +146,19 @@
         del self.users[self._to_hex(user.user_id)]
         del self.users[self._to_hex(user.fingerprint)]
 
+    def notify_nick_change(self, user, old_nick, new_nick):
+        event = self._create_event(u'state', user, None)
+        event.state = u'offline'
+        event.sender['nick'] = unicode(old_nick, 'utf-8', 'replace')
+        event.othername = unicode(new_nick, 'utf-8', 'replace')
+        ibid.dispatcher.dispatch(event).addCallback(self.respond)
+
+        event = self._create_event(u'state', user, None)
+        event.state = u'online'
+        event.sender['nick'] = unicode(new_nick, 'utf-8', 'replace')
+        event.othername = unicode(old_nick, 'utf-8', 'replace')
+        ibid.dispatcher.dispatch(event).addCallback(self.respond)
+
     def notify_kicked(self, user, message, kicker, channel):
         self._state_event(user, channel, u'kicked', kicker, message)
 
@@ -162,13 +174,25 @@
         for channel in self.factory.channels:
             self.join(channel)
 
+        event = Event(self.factory.name, u'source')
+        event.status = u'connected'
+        ibid.dispatcher.dispatch(event)
+
     def command_reply_join(self, channel, name, topic, hmac, x, y, users):
         self.channels[name] = channel
+        for user in users:
+            self._state_event(user, channel, u'online')
 
     def disconnect(self):
         self.command_call('QUIT')
 
     def disconnected(self, message):
+        self.factory.log.info(u"Disconnected (%s)", reason)
+
+        event = Event(self.factory.name, u'source')
+        event.status = u'disconnected'
+        ibid.dispatcher.dispatch(event)
+
         self.factory.s.stopService()
         self.channels.clear()
         self.users.clear()