Merge lp:~super-friends/friends/raring into lp:friends

[Ken VanDine]

* Stop deduplicating messages across protocols, simplifying model
    schema (LP: #1156941)
  * Add schema columns for latitude, longitude, and location name.
  * Fix 'likes' column from gdouble to guint64.
  * Add geotagging support from foursquare, facebook, flickr.
  * Implement since= for Facebook, reducing bandwidth usage.
  * Automatically prepend the required @mention to Twitter
    replies (LP: #1156829)
  * Automatically linkify URLs that get published to the model.
  * Fix the publishing of Facebook Stories (LP: #1155785)

Merge queued up changes for raring to trunk now that the FFe bug 1156979 was approved

[Ken VanDine (ken-vandine)]

All the changes have been reviewed before merging into the raring branch.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-19 05:03:07 +0000
+++ debian/changelog	2013-03-20 13:27:53 +0000
@@ -1,3 +1,21 @@
+friends (0.1.3-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Robert Bruce Park ]
+  * Keep the Dispatcher alive for 30s beyond the return of the final
+    method invocation.
+  * Stop deduplicating messages across protocols, simplifying model 
+    schema (LP: #1156941)
+  * Add schema columns for latitude, longitude, and location name.
+  * Fix 'likes' column from gdouble to guint64.
+  * Add geotagging support from foursquare, facebook, flickr.
+  * Implement since= for Facebook, reducing bandwidth usage.
+  * Automatically prepend the required @mention to Twitter 
+    replies (LP: #1156829)
+  * Automatically linkify URLs that get published to the model.
+  * Fix the publishing of Facebook Stories (LP: #1155785)
+
+ -- Ken VanDine <[e-mail]>  Wed, 20 Mar 2013 09:14:15 -0400
+
 friends (0.1.2daily13.03.19-0ubuntu1) raring; urgency=low
 
   [ Martin Pitt ]

=== modified file 'debian/friends-dispatcher.install'
--- debian/friends-dispatcher.install	2013-02-05 01:25:43 +0000
+++ debian/friends-dispatcher.install	2013-03-20 13:27:53 +0000
@@ -5,4 +5,7 @@
 usr/lib/python3/dist-packages/friends/service/*
 usr/lib/python3/dist-packages/friends/shorteners/*
 usr/lib/python3/dist-packages/friends/utils/*
+usr/lib/python3/dist-packages/friends/tests/mocks.py
+usr/lib/python3/dist-packages/friends/tests/__init__.py
+usr/lib/python3/dist-packages/friends/tests/data/*
 usr/share/dbus-1/services/com.canonical.Friends.Dispatcher.service

=== modified file 'debian/rules'
--- debian/rules	2013-02-13 05:43:57 +0000
+++ debian/rules	2013-03-20 13:27:53 +0000
@@ -18,8 +18,11 @@
 override_dh_auto_install:
 	python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 	python3 setup.py install_service_files -d $(CURDIR)/debian/tmp/usr
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/friends/tests/test*
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/friends/*/__pycache__
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/friends/__pycache__
 	dh_auto_install -D service
-	dh_install --list-missing
+	dh_install --fail-missing
 
 override_dh_auto_test:
 	dbus-test-runner -t make -p check -m 300

=== modified file 'friends/main.py'
--- friends/main.py	2013-03-01 20:28:27 +0000
+++ friends/main.py	2013-03-20 13:27:53 +0000
@@ -43,11 +43,16 @@
 
 if args.test:
     from friends.service.mock_service import Dispatcher
+    from friends.tests.mocks import populate_fake_data
+
+    populate_fake_data()
     Dispatcher()
+
     try:
         loop.run()
     except KeyboardInterrupt:
         pass
+
     sys.exit(0)
 
 
@@ -57,11 +62,9 @@
 GObject.threads_init(None)
 
 from friends.service.dispatcher import Dispatcher, DBUS_INTERFACE
-from friends.utils.base import _OperationThread, _publish_lock
-from friends.utils.base import Base, initialize_caches
+from friends.utils.base import Base, initialize_caches, _publish_lock
 from friends.utils.model import Model, prune_model
 from friends.utils.logging import initialize
-from friends.utils.avatar import Avatar
 
 
 # Optional performance profiling module.
@@ -84,10 +87,6 @@
             print(class_name)
         return
 
-    # Our threading implementation needs to know how to quit the
-    # application once all threads have completed.
-    _OperationThread.shutdown = loop.quit
-
     # Disallow multiple instances of friends-dispatcher
     bus = dbus.SessionBus()
     obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
@@ -140,7 +139,9 @@
         log.info('Starting friends-dispatcher main loop')
         loop.run()
     except KeyboardInterrupt:
-        log.info('Stopped friends-dispatcher main loop')
+        pass
+
+    log.info('Stopped friends-dispatcher main loop')
 
     # This bit doesn't run until after the mainloop exits.
     if args.performance and yappi is not None:

=== modified file 'friends/protocols/facebook.py'
--- friends/protocols/facebook.py	2013-02-27 22:22:38 +0000
+++ friends/protocols/facebook.py	2013-03-20 13:27:53 +0000
@@ -24,10 +24,9 @@
 import time
 import logging
 
-from datetime import datetime, timedelta
-
 from friends.utils.avatar import Avatar
 from friends.utils.base import Base, feature
+from friends.utils.cache import JsonCache
 from friends.utils.http import Downloader, Uploader
 from friends.utils.time import parsetime, iso8601utc
 from friends.errors import FriendsError
@@ -42,10 +41,17 @@
 FACEBOOK_ADDRESS_BOOK = 'friends-facebook-contacts'
 
 
+TEN_DAYS = 864000 # seconds
+
+
 log = logging.getLogger(__name__)
 
 
 class Facebook(Base):
+    def __init__(self, account):
+        super().__init__(account)
+        self._timestamps = PostIdCache(self._name + '_ids')
+
     def _whoami(self, authdata):
         """Identify the authenticating user."""
         me_data = Downloader(
@@ -59,15 +65,22 @@
             # We can't do much with this entry.
             return
 
+        place = entry.get('place', {})
+        location = place.get('location', {})
+
         args = dict(
+            message_id=message_id,
             stream=stream,
-            message=entry.get('message', ''),
+            message=entry.get('message', '') or entry.get('story', ''),
             icon_uri=entry.get('icon', ''),
             link_picture=entry.get('picture', ''),
             link_name=entry.get('name', ''),
             link_url=entry.get('link', ''),
             link_desc=entry.get('description', ''),
             link_caption=entry.get('caption', ''),
+            location=place.get('name', ''),
+            latitude=location.get('latitude', 0.0),
+            longitude=location.get('longitude', 0.0),
             )
 
         # Posts gives us a likes dict, while replies give us an int.
@@ -89,10 +102,16 @@
         # Normalize the timestamp.
         timestamp = entry.get('updated_time', entry.get('created_time'))
         if timestamp is not None:
-            args['timestamp'] = iso8601utc(parsetime(timestamp))
+            timestamp = args['timestamp'] = iso8601utc(parsetime(timestamp))
+            # We need to record timestamps for use with since=. Note that
+            # _timestamps is a special dict subclass that only accepts
+            # timestamps that are larger than the existing value, so at any
+            # given time it will map the stream to the most
+            # recent timestamp we've seen for that stream.
+            self._timestamps[stream] = timestamp
 
         # Publish this message into the SharedModel.
-        self._publish(message_id, **args)
+        self._publish(**args)
 
         # If there are any replies, publish them as well.
         for comment in entry.get('comments', {}).get('data', []):
@@ -109,6 +128,7 @@
 
         while True:
             response = Downloader(url, params).get_json()
+
             if self._is_error(response):
                 break
 
@@ -137,24 +157,18 @@
         # We've gotten everything Facebook is going to give us.
         return entries
 
-    def _get(self, url, stream, since=None):
+    def _get(self, url, stream):
         """Retrieve a list of Facebook objects.
 
         A maximum of 50 objects are requested.
-
-        :param since: Only get objects posted since this date.  If not given,
-            then only objects younger than 10 days are retrieved.  The value
-            is a number seconds since the epoch.
-        :type since: float
         """
         access_token = self._get_access_token()
-        if since is None:
-            when = datetime.now() - timedelta(days=10)
-        else:
-            when = datetime.fromtimestamp(since)
+        since = self._timestamps.get(
+            stream, iso8601utc(int(time.time()) - TEN_DAYS))
+
         entries = []
         params = dict(access_token=access_token,
-                      since=when.isoformat(),
+                      since=since,
                       limit=self._DOWNLOAD_LIMIT)
 
         entries = self._follow_pagination(url, params)
@@ -163,15 +177,15 @@
             self._publish_entry(entry, stream=stream)
 
     @feature
-    def home(self, since=None):
+    def home(self):
         """Gather and publish public timeline messages."""
-        self._get(ME_URL + '/home', 'messages', since)
+        self._get(ME_URL + '/home', 'messages')
         return self._get_n_rows()
 
     @feature
-    def wall(self, since=None):
+    def wall(self):
         """Gather and publish messages written on user's wall."""
-        self._get(ME_URL + '/feed', 'mentions', since)
+        self._get(ME_URL + '/feed', 'mentions')
         return self._get_n_rows()
 
     @feature
@@ -369,3 +383,16 @@
     def delete_contacts(self):
         source = self._get_eds_source(FACEBOOK_ADDRESS_BOOK)
         return self._delete_service_contacts(source)
+
+
+class PostIdCache(JsonCache):
+    """Persist most-recent timestamps as JSON."""
+
+    def __setitem__(self, key, value):
+        if key.find('/') >= 0:
+            # Don't flood the cache with irrelevant "reply_to/..." and
+            # "search/..." streams, we only need the main streams.
+            return
+        # Thank SCIENCE for lexically-sortable timestamp strings!
+        if value > self.get(key, ''):
+            JsonCache.__setitem__(self, key, value)

=== modified file 'friends/protocols/flickr.py'
--- friends/protocols/flickr.py	2013-02-27 23:04:36 +0000
+++ friends/protocols/flickr.py	2013-03-20 13:27:53 +0000
@@ -113,7 +113,7 @@
             method='flickr.photos.getContactsPhotos',
             format='json',
             nojsoncallback='1',
-            extras='date_upload,owner_name,icon_server',
+            extras='date_upload,owner_name,icon_server,geo',
             )
 
         response = self._get_url(args)
@@ -166,7 +166,10 @@
                 link_caption=data.get('title', ''),
                 link_url=img_url,
                 link_picture=img_src,
-                link_icon=img_thumb)
+                link_icon=img_thumb,
+                latitude=data.get('latitude', 0.0),
+                longitude=data.get('longitude', 0.0),
+                )
         return self._get_n_rows()
 
 # http://www.flickr.com/services/api/upload.api.html

=== modified file 'friends/protocols/foursquare.py'
--- friends/protocols/foursquare.py	2013-02-26 19:05:10 +0000
+++ friends/protocols/foursquare.py	2013-03-20 13:27:53 +0000
@@ -85,6 +85,8 @@
             checkin_id = checkin.get('id', '')
             tz_offset = checkin.get('timeZoneOffset', 0)
             epoch = checkin.get('createdAt', 0)
+            venue = checkin.get('venue', {})
+            location = venue.get('location', {})
             self._publish(
                 message_id=checkin_id,
                 stream='messages',
@@ -94,6 +96,9 @@
                 message=checkin.get('shout', ''),
                 likes=checkin.get('likes', {}).get('count', 0),
                 icon_uri=Avatar.get_image(avatar_url),
-                url=checkin.get('venue', {}).get('canonicalUrl', ''),
+                url=venue.get('canonicalUrl', ''),
+                location=venue.get('name', ''),
+                latitude=location.get('lat', 0.0),
+                longitude=location.get('lng', 0.0),
                 )
         return self._get_n_rows()

=== modified file 'friends/protocols/twitter.py'
--- friends/protocols/twitter.py	2013-03-08 02:31:15 +0000
+++ friends/protocols/twitter.py	2013-03-20 13:27:53 +0000
@@ -26,12 +26,10 @@
 import logging
 
 from urllib.parse import quote
-from gi.repository import GLib
 
 from friends.utils.avatar import Avatar
 from friends.utils.base import Base, feature
 from friends.utils.cache import JsonCache
-from friends.utils.model import Model
 from friends.utils.http import BaseRateLimiter, Downloader
 from friends.utils.time import parsetime, iso8601utc
 from friends.errors import FriendsError
@@ -70,7 +68,7 @@
         super().__init__(account)
         self._rate_limiter = RateLimiter()
         # Can be 'twitter_ids' or 'identica_ids'
-        self._tweet_ids = TweetIdCache(self.__class__.__name__.lower() + '_ids')
+        self._tweet_ids = TweetIdCache(self._name + '_ids')
 
     def _whoami(self, authdata):
         """Identify the authenticating user."""
@@ -254,6 +252,12 @@
         order for Twitter to actually accept this as a reply.  Otherwise it
         will just be an ordinary tweet.
         """
+        try:
+            sender = '@{}'.format(self._fetch_cell(message_id, 'sender_nick'))
+            if message.find(sender) < 0:
+                message = sender + ' ' + message
+        except FriendsError:
+            pass
         url = self._api_base.format(endpoint='statuses/update')
         tweet = self._get_url(url, dict(in_reply_to_status_id=message_id,
                                         status=message))

=== modified file 'friends/service/dispatcher.py'
--- friends/service/dispatcher.py	2013-02-20 13:08:27 +0000
+++ friends/service/dispatcher.py	2013-03-20 13:27:53 +0000
@@ -28,12 +28,13 @@
 import dbus.service
 
 from gi.repository import GLib
+from contextlib import ContextDecorator
 
 from friends.utils.avatar import Avatar
 from friends.utils.account import AccountManager
 from friends.utils.manager import protocol_manager
 from friends.utils.menus import MenuManager
-from friends.utils.model import Model
+from friends.utils.model import Model, persist_model
 from friends.shorteners import lookup
 
 
@@ -43,6 +44,48 @@
 STUB = lambda *ignore, **kwignore: None
 
 
+# Avoid race condition during shut-down
+_exit_lock = threading.Lock()
+
+
+class ManageTimers(ContextDecorator):
+    """Exit the dispatcher 30s after the most recent method call returns."""
+    timers = set()
+    callback = STUB
+
+    def __enter__(self):
+        self.clear_all_timers()
+
+    def __exit__(self, *ignore):
+        self.set_new_timer()
+
+    def clear_all_timers(self):
+        log.debug('Clearing {} shutdown timer(s)...'.format(len(self.timers)))
+        while self.timers:
+            GLib.source_remove(self.timers.pop())
+
+    def set_new_timer(self):
+        # Concurrency will cause two methods to exit near each other,
+        # causing two timers to be set, so we have to clear them again.
+        self.clear_all_timers()
+        log.debug('Starting new shutdown timer...')
+        self.timers.add(GLib.timeout_add_seconds(30, self.terminate))
+
+    def terminate(self, *ignore):
+        """Exit the dispatcher, but only if there are no active subthreads."""
+        with _exit_lock:
+            if threading.activeCount() < 2:
+                log.debug('No threads found, shutting down.')
+                persist_model()
+                self.timers.add(GLib.idle_add(self.callback))
+            else:
+                log.debug('Delaying shutdown because active threads found.')
+                self.set_new_timer()
+
+
+exit_after_idle = ManageTimers()
+
+
 class Dispatcher(dbus.service.Object):
     """This is the primary handler of dbus method calls."""
     __dbus_object_path__ = '/com/canonical/friends/Dispatcher'
@@ -59,10 +102,13 @@
         self.menu_manager = MenuManager(self.Refresh, self.mainloop.quit)
         Model.connect('row-added', self._increment_unread_count)
 
+        ManageTimers.callback = mainloop.quit
+
     def _increment_unread_count(self, model, itr):
         self._unread_count += 1
         self.menu_manager.update_unread_count(self._unread_count)
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE)
     def Refresh(self):
         """Download new messages from each connected protocol."""
@@ -80,6 +126,7 @@
                 # If a protocol doesn't support receive then ignore it.
                 pass
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE)
     def ClearIndicators(self):
         """Indicate that messages have been read.
@@ -92,8 +139,8 @@
             service.ClearIndicators()
         """
         self.menu_manager.update_unread_count(0)
-        GLib.idle_add(self.mainloop.quit)
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE,
                          in_signature='sss',
                          out_signature='s',
@@ -117,7 +164,7 @@
         """
         if account_id:
             accounts = [self.account_manager.get(account_id)]
-            if accounts == [None]:
+            if None in accounts:
                 message = 'Could not find account: {}'.format(account_id)
                 failure(message)
                 log.error(message)
@@ -138,6 +185,7 @@
         if not called:
             failure('No accounts supporting {} found.'.format(action))
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE,
                          in_signature='s',
                          out_signature='s',
@@ -162,7 +210,7 @@
                 sent = True
                 log.debug(
                     'Sending message to {}'.format(
-                        account.protocol.__class__.__name__))
+                        account.protocol._Name))
                 account.protocol(
                     'send',
                     message,
@@ -172,6 +220,7 @@
         if not sent:
             failure('No send_enabled accounts found.')
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE,
                          in_signature='sss',
                          out_signature='s',
@@ -205,6 +254,7 @@
             failure(message)
             log.error(message)
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE,
                          in_signature='sss',
                          out_signature='s',
@@ -262,6 +312,7 @@
             failure(message)
             log.error(message)
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE, in_signature='s', out_signature='s')
     def GetFeatures(self, protocol_name):
         """Returns a list of features supported by service as json string.
@@ -274,9 +325,9 @@
             features = json.loads(service.GetFeatures('facebook'))
         """
         protocol = protocol_manager.protocols.get(protocol_name)
-        GLib.idle_add(self.mainloop.quit)
-        return json.dumps(protocol.get_features())
+        return json.dumps(protocol.get_features() if protocol else [])
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE, in_signature='s', out_signature='s')
     def URLShorten(self, url):
         """Shorten a URL.
@@ -291,7 +342,6 @@
             service = dbus.Interface(obj, DBUS_INTERFACE)
             short_url = service.URLShorten(url)
         """
-        GLib.idle_add(self.mainloop.quit)
         service_name = self.settings.get_string('urlshorter')
         log.info('Shortening URL {} with {}'.format(url, service_name))
         if (lookup.is_shortened(url) or
@@ -305,7 +355,7 @@
             log.exception('URL shortening class: {}'.format(service))
             return url
 
+    @exit_after_idle
     @dbus.service.method(DBUS_INTERFACE)
     def ExpireAvatars(self):
         Avatar.expire_old_avatars()
-        GLib.idle_add(self.mainloop.quit)

=== modified file 'friends/tests/data/facebook-full.dat'
--- friends/tests/data/facebook-full.dat	2012-10-13 01:27:15 +0000
+++ friends/tests/data/facebook-full.dat	2013-03-20 13:27:53 +0000
@@ -1,1 +1,366 @@
-{"paging": {"previous": "https://graph.facebook.com/101/home?access_token=ABC&limit=25&since=1348682101&__previous=1"}, "data": [{"picture": "https://fbexternal-a.akamaihd.net/rush.jpg", "from": {"category": "Entertainment", "name": "Rush is a Band", "id": "117402931676347"}, "name": "Rush is a Band Blog", "comments": {"count": 0}, "actions": [{"link": "https://www.facebook.com/117402931676347/posts/287578798009078", "name": "Comment"}, {"link": "https://www.facebook.com/117402931676347/posts/287578798009078", "name": "Like"}], "updated_time": "2012-09-26T17:34:00+0000", "caption": "www.rushisaband.com", "link": "http://www.rushisaband.com/blog/Rush-Clockwork-Angels-tour", "likes": {"count": 16, "data": [{"name": "Alex Lifeson", "id": "801"}, {"name": "Vlada Lee", "id": "801"}, {"name": "Richard Peart", "id": "803"}, {"name": "Eric Lifeson", "id": "804"}]}, "created_time": "2012-09-26T17:34:00+0000", "message": "Rush takes off to the Great White North", "icon": "https://s-static.ak.facebook.com/rsrc.php/v2/yD/r/a.gif", "type": "link", "id": "108", "status_type": "shared_story", "description": "Rush is a Band: Neil Peart, Geddy Lee, Alex Lifeson"}, {"picture": "https://images.gibson.com/Rush_Clockwork-Angels_t.jpg", "likes": {"count": 27, "data": [{"name": "Tracy Lee", "id": "805"}, {"name": "Wendy Peart", "id": "806"}, {"name": "Vlada Lifeson", "id": "807"}, {"name": "Chevy Lee", "id": "808"}]}, "from": {"category": "Entertainment", "name": "Rush is a Band", "id": "117402931676347"}, "name": "Top 10 Alex Lifeson Guitar Moments", "comments": {"count": 5, "data": [{"created_time": "2012-09-26T17:16:00+0000", "message": "OK Don...10) Headlong Flight", "from": {"name": "Bruce Peart", "id": "809"}, "id": "117402931676347_386054134801436_3235476"}, {"created_time": "2012-09-26T17:49:06+0000", "message": "No Cygnus X-1 Bruce?  I call shenanigans!", "from": {"name": "Don Lee", "id": "810"}, "id": "117402931676347_386054134801436_3235539"}]}, "actions": [{"link": "https://www.facebook.com/117402931676347/posts/386054134801436", "name": "Comment"}, {"link": "https://www.facebook.com/117402931676347/posts/386054134801436", "name": "Like"}], "updated_time": "2012-09-26T17:49:06+0000", "caption": "www2.gibson.com", "link": "http://www2.gibson.com/Alex-Lifeson.aspx", "shares": {"count": 11}, "created_time": "2012-09-26T16:42:15+0000", "message": "http://www2.gibson.com/Alex-Lifeson-0225-2011.aspx", "icon": "https://s-static.ak.facebook.com/rsrc.php/v2/yD/r/a.gif", "type": "link", "id": "109", "status_type": "shared_story", "description": "For millions of Rush fans old and new, it\u2019s a pleasure"}]}
\ No newline at end of file
+{
+  "data": [
+    {
+      "id": "fake_id",
+      "from": {
+        "name": "Yours Truly",
+        "id": "56789"
+      },
+      "message": "Writing code that supports geotagging data from facebook. If y'all could make some geotagged facebook posts for me to test with, that'd be super.",
+      "actions": [
+        {
+          "name": "Comment",
+          "link": "https://www.facebook.com/fake/posts/id"
+        },
+        {
+          "name": "Like",
+          "link": "https://www.facebook.com/fake/posts/id"
+        }
+      ],
+      "privacy": {
+        "value": ""
+      },
+      "place": {
+        "id": "103135879727382",
+        "name": "Victoria, British Columbia",
+        "location": {
+          "street": "",
+          "zip": "",
+          "latitude": 48.4333,
+          "longitude": -123.35
+        }
+      },
+      "type": "status",
+      "status_type": "mobile_status_update",
+      "created_time": "2013-03-12T21:27:56+0000",
+      "updated_time": "2013-03-13T23:29:07+0000",
+      "likes": {
+        "data": [
+          {
+            "name": "Anna",
+            "id": "12345"
+          }
+        ],
+        "count": 1
+      },
+      "comments": {
+        "data": [
+          {
+            "id": "fake as a snake",
+            "from": {
+              "name": "Grandma",
+              "id": "9876"
+            },
+            "message": "If I knew what a geotagged facebook post was I might be able to comply!",
+            "created_time": "2013-03-12T22:56:17+0000"
+          },
+          {
+            "id": "faker than cake!",
+            "from": {
+              "name": "Father",
+              "id": "234"
+            },
+            "message": "don't know how",
+            "created_time": "2013-03-12T23:29:45+0000"
+          },
+          {
+            "id": "still fake",
+            "from": {
+              "name": "Mother",
+              "id": "456"
+            },
+            "message": "HUH!!!!",
+            "created_time": "2013-03-13T02:20:27+0000"
+          },
+          {
+            "id": "this one is real",
+            "from": {
+              "name": "Yours Truly",
+              "id": "56789"
+            },
+            "message": "Coming up with tons of fake data is hard!",
+            "created_time": "2013-03-13T23:29:07+0000"
+          }
+        ],
+        "count": 4
+      }
+    },
+    {
+      "id": "270843027745_10151370303782746",
+      "from": {
+        "category": "Shopping/retail",
+        "category_list": [
+          {
+            "id": "128003127270269",
+            "name": "Bike Shop"
+          }
+        ],
+        "name": "Western Cycle Source for Sports",
+        "id": "270843027745"
+      },
+      "story": "Western Cycle Source for Sports updated their cover photo.",
+      "story_tags": {
+        "0": [
+          {
+            "id": "270843027745",
+            "name": "Western Cycle Source for Sports",
+            "offset": 0,
+            "length": 31,
+            "type": "page"
+          }
+        ]
+      },
+      "picture": "https://fbcdn-photos-a.akamaihd.net/hphotos-ak-snc7/482418_10151370303672746_1924798223_s.jpg",
+      "link": "https://www.facebook.com/photo.php?fbid=10151370303672746&set=a.10150598301902746.381693.270843027745&type=1&relevant_count=1",
+      "icon": "https://fbstatic-a.akamaihd.net/rsrc.php/v2/yz/r/StEh3RhPvjk.gif",
+      "actions": [
+        {
+          "name": "Comment",
+          "link": "https://www.facebook.com/270843027745/posts/10151370303782746"
+        },
+        {
+          "name": "Like",
+          "link": "https://www.facebook.com/270843027745/posts/10151370303782746"
+        }
+      ],
+      "privacy": {
+        "value": ""
+      },
+      "place": {
+        "id": "270843027745",
+        "name": "Western Cycle Source for Sports",
+        "location": {
+          "street": "1550 8th Ave",
+          "city": "Regina",
+          "state": "SK",
+          "country": "Canada",
+          "zip": "S4R 1E4",
+          "latitude": 50.45679,
+          "longitude": -104.60276
+        }
+      },
+      "type": "photo",
+      "object_id": "10151370303672746",
+      "created_time": "2013-03-11T23:46:06+0000",
+      "updated_time": "2013-03-11T23:46:06+0000",
+      "likes": {
+        "data": [
+          {
+            "name": "Lou Schwindt",
+            "id": "57"
+          },
+          {
+            "name": "Maureen Daniel",
+            "id": "72"
+          },
+          {
+            "name": "Lee Watson",
+            "id": "696"
+          },
+          {
+            "name": "Rob Nelson",
+            "id": "40"
+          }
+        ],
+        "count": 10
+      },
+      "comments": {
+        "count": 0
+      }
+    },
+    {
+      "id": "161247843901324_629147610444676",
+      "from": {
+        "category": "Hotel",
+        "category_list": [
+          {
+            "id": "164243073639257",
+            "name": "Hotel"
+          }
+        ],
+        "name": "Best Western Denver Southwest",
+        "id": "161247843901324"
+      },
+      "message": "Today only -- Come meet Caroline and Meredith and Stanley the Stegosaurus (& Greg & Joe, too!) at the TechZulu Trend Lounge, Hilton Garden Inn 18th floor, 500 N Interstate 35, Austin, Texas. Monday, March 11th, 4:00pm to 7:00 pm. Also here Hannah Hart (My Drunk Kitchen) and Angry Video Game Nerd producer, Sean Keegan. Stanley is in the lobby.",
+      "picture": "https://fbcdn-photos-a.akamaihd.net/hphotos-ak-snc7/601266_629147587111345_968504279_s.jpg",
+      "link": "https://www.facebook.com/photo.php?fbid=629147587111345&set=a.173256162700492.47377.161247843901324&type=1&relevant_count=1",
+      "icon": "https://fbstatic-a.akamaihd.net/rsrc.php/v2/yz/r/StEh3RhPvjk.gif",
+      "actions": [
+        {
+          "name": "Comment",
+          "link": "https://www.facebook.com/161247843901324/posts/629147610444676"
+        },
+        {
+          "name": "Like",
+          "link": "https://www.facebook.com/161247843901324/posts/629147610444676"
+        }
+      ],
+      "privacy": {
+        "value": ""
+      },
+      "place": {
+        "id": "132709090079327",
+        "name": "Hilton Garden Inn Austin Downtown/Convention Center",
+        "location": {
+          "street": "500 North Interstate 35",
+          "city": "Austin",
+          "state": "TX",
+          "country": "United States",
+          "zip": "78701",
+          "latitude": 30.265384957204,
+          "longitude": -97.735604602521
+        }
+      },
+      "type": "photo",
+      "status_type": "added_photos",
+      "object_id": "629147587111345",
+      "created_time": "2013-03-11T20:49:10+0000",
+      "updated_time": "2013-03-11T23:51:25+0000",
+      "likes": {
+        "data": [
+          {
+            "name": "Andrew Henninger",
+            "id": "11"
+          },
+          {
+            "name": "Sarah Brents",
+            "id": "22"
+          },
+          {
+            "name": "Thomas Bush",
+            "id": "33"
+          },
+          {
+            "name": "Jennifer Tornetta",
+            "id": "44"
+          }
+        ],
+        "count": 84
+      },
+      "comments": {
+        "data": [
+          {
+            "id": "1612484301324_6294760444676_1126376",
+            "from": {
+              "name": "Amy Gibbs",
+              "id": "55"
+            },
+            "message": "You have to love a family that travels with their stegasaurus.",
+            "created_time": "2013-03-11T23:51:05+0000",
+            "likes": 2
+          },
+          {
+            "id": "1612843901324_6294761044676_1124378",
+            "from": {
+              "name": "Amy Gibbs",
+              "id": "55"
+            },
+            "message": "*stegosaurus...sorry!",
+            "created_time": "2013-03-11T23:51:25+0000",
+            "likes": 1
+          }
+        ],
+        "count": 11
+      }
+    },
+    {
+      "id": "104443_100085049977",
+      "from": {
+        "name": "Guy Frenchie",
+        "id": "1244414"
+      },
+      "story": "Guy Frenchie did some things with some stuff.",
+      "story_tags": {
+        "0": [
+          {
+            "id": "1244414",
+            "name": "Guy Frenchie",
+            "offset": 0,
+            "length": 16,
+            "type": "user"
+          }
+        ],
+        "26": [
+          {
+            "id": "37067557",
+            "name": "somebody",
+            "offset": 26,
+            "length": 10,
+            "type": "page"
+          }
+        ],
+        "48": [
+          {
+            "id": "50681138",
+            "name": "What do you think about things and stuff?",
+            "offset": 48,
+            "length": 52
+          }
+        ]
+      },
+      "icon": "https://fbstatic-a.akamaihd.net/rsrc.php/v2/yg/r/5PpICR5KcPe.png",
+      "actions": [
+        {
+          "name": "Comment",
+          "link": "https://www.facebook.com/1244414/posts/100085049977"
+        },
+        {
+          "name": "Like",
+          "link": "https://www.facebook.com/1244414/posts/100085049977"
+        }
+      ],
+      "privacy": {
+        "value": ""
+      },
+      "type": "question",
+      "object_id": "584616119",
+      "application": {
+        "name": "Questions",
+        "id": "101502535258"
+      },
+      "created_time": "2013-03-15T19:57:14+0000",
+      "updated_time": "2013-03-15T19:57:14+0000",
+      "likes": {
+        "data": [
+          {
+            "name": "Kevin Diner",
+            "id": "55520"
+          },
+          {
+            "name": "Bozo the Clown",
+            "id": "13960"
+          }
+        ],
+        "count": 3
+      },
+      "comments": {
+        "data": [
+          {
+            "id": "14446143_102008355988977_100927",
+            "from": {
+              "name": "Seymour Butts",
+              "id": "505677"
+            },
+            "message": "seems legit",
+            "created_time": "2013-03-13T12:20:19+0000",
+            "likes": 2
+          },
+          {
+            "id": "120143_1020035588977_1019440",
+            "from": {
+              "name": "Andre the Giant",
+              "id": "100390199"
+            },
+            "message": "Anybody want a peanut?",
+            "created_time": "2013-03-13T12:23:25+0000"
+          }
+        ],
+        "count": 22
+      }
+    }
+  ],
+  "paging": {
+    "previous": "https://graph.facebook.com/me/home&limit=25&since=1234",
+    "next": "https://graph.facebook.com/me/home&limit=25&until=4321"
+  }
+}

=== modified file 'friends/tests/data/flickr-full.dat'
--- friends/tests/data/flickr-full.dat	2012-10-20 15:35:30 +0000
+++ friends/tests/data/flickr-full.dat	2013-03-20 13:27:53 +0000
@@ -1,1 +1,13 @@
-{"photos": {"photo": [{"username": "Geddy Lee", "secret": "abc", "title": "ant", "owner": "123", "id": "801", "dateupload": "2012-05-10T13:36:45", "server": "1"}, {"username": "Alex Lifeson", "secret": "def", "ownername": "Alex Lifeson", "title": "bee", "owner": "456", "id": "802", "server": "1"}, {"username": "Neil Peart", "title": "cat", "farm": "animalz", "server": "1", "iconserver": "9", "secret": "ghi", "ownername": "Bob Dobbs", "owner": "789", "id": "803", "iconfarm": "iconz"}]}}
+{ "photos": {
+    "photo": [
+      { "id": "8552892154", "secret": "a", "server": "8378", "farm": 9, "owner": "47303164@N00", "username": "raise my voice", "title": "Chocolate chai #yegcoffee", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363117902", "ownername": "raise my voice", "iconserver": 93, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8552845358", "secret": "b", "server": "8085", "farm": 9, "owner": "47303164@N00", "username": "raise my voice", "title": "Torah ark #yegjew", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363116818", "ownername": "raise my voice", "iconserver": 93, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8552661200", "secret": "c", "server": "8522", "farm": 9, "owner": "60551783@N00", "username": "Reinhard.Pantke", "title": "Henningsvaer", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363112533", "ownername": "Reinhard.Pantke", "iconserver": 8, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8550946245", "secret": "d", "server": "8107", "farm": 9, "owner": "60551783@N00", "username": "Reinhard.Pantke", "title": "Summerfeeling on Lofoten", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363098878", "ownername": "Reinhard.Pantke", "iconserver": 8, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8550829193", "secret": "e", "server": "8246", "farm": 9, "owner": "27204141@N05", "username": "Nelson Webb", "title": "St. Michael - The Archangel", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363096450", "ownername": "Nelson Webb", "iconserver": "2047", "iconfarm": 3, "latitude": 53.833156, "longitude": -112.330784, "accuracy": 15, "context": 0, "place_id": "4Y55lnhZVrNO", "woeid": "8496", "geo_is_family": 0, "geo_is_friend": 0, "geo_is_contact": 0, "geo_is_public": 1 },
+      { "id": "8551930826", "secret": "f", "server": "8247", "farm": 9, "owner": "27204141@N05", "username": "Nelson Webb", "title": "Pine scented air freshener", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363096449", "ownername": "Nelson Webb", "iconserver": "2047", "iconfarm": 3, "latitude": 53.878136, "longitude": -112.335162, "accuracy": 15, "context": 0, "place_id": "4Y55lnhZVrNO", "woeid": "8496", "geo_is_family": 0, "geo_is_friend": 0, "geo_is_contact": 0, "geo_is_public": 1 },
+      { "id": "8549658873", "secret": "g", "server": "8239", "farm": 9, "owner": "30584843@N00", "username": "Mark Iocchelli", "title": "Sleepy Hollow", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363055714", "ownername": "Mark Iocchelli", "iconserver": 22, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8548811967", "secret": "h", "server": "8229", "farm": 9, "owner": "47303164@N00", "username": "raise my voice", "title": "Trying out The Wokkery #yegfood", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363028798", "ownername": "raise my voice", "iconserver": 93, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8548753789", "secret": "i", "server": "8512", "farm": 9, "owner": "30584843@N00", "username": "Mark Iocchelli", "title": "Alberta Rail Pipeline", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363027071", "ownername": "Mark Iocchelli", "iconserver": 22, "iconfarm": 1, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 },
+      { "id": "8549607582", "secret": "j", "server": "8087", "farm": 9, "owner": "60404254@N00", "username": "tavis_mcnally", "title": "26 weeks", "ispublic": 1, "isfriend": 0, "isfamily": 0, "dateupload": "1363022277", "ownername": "tavis_mcnally", "iconserver": "2182", "iconfarm": 3, "latitude": 0, "longitude": 0, "accuracy": 0, "context": 0 }
+    ], "total": "290", "page": 1, "per_page": 10, "pages": 29 }, "stat": "ok" }

=== modified file 'friends/tests/mocks.py'
--- friends/tests/mocks.py	2013-02-19 17:00:41 +0000
+++ friends/tests/mocks.py	2013-03-20 13:27:53 +0000
@@ -30,15 +30,19 @@
 import hashlib
 import logging
 import threading
+import tempfile
+import shutil
 
 from io import StringIO
 from logging.handlers import QueueHandler
 from pkg_resources import resource_listdir, resource_string
 from queue import Empty, Queue
 from urllib.parse import urlsplit
+from gi.repository import Dee
 
 from friends.utils.base import Base
 from friends.utils.logging import LOG_FORMAT
+from friends.utils.model import COLUMN_TYPES
 
 
 try:
@@ -51,6 +55,50 @@
 NEWLINE = '\n'
 
 
+# Create a test model that will not interfere with the user's environment.
+# We'll use this object as a mock of the real model.
+TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
+TestModel.set_schema_full(COLUMN_TYPES)
+
+
[e-mail]('friends.utils.http._soup', mock.Mock())
[e-mail]('friends.utils.base.Model', TestModel)
[e-mail]('friends.utils.base.Base._get_access_token',
+            mock.Mock(return_value='Access Tolkien'))
+def populate_fake_data():
+    """Dump a mixture of random data from our testsuite into TestModel.
+
+    This is invoked by running 'friends-dispatcher --test' so that you
+    can have some phony data in the model to test against.
+
+    Just remember that the data appears in a separate model so as not
+    to interfere with the user's official DeeModel stream.
+    """
+    from friends.utils.cache import JsonCache
+    from friends.protocols.facebook import Facebook
+    from friends.protocols.flickr import Flickr
+    from friends.protocols.twitter import Twitter
+    from gi.repository import Dee
+
+    temp_cache = tempfile.mkdtemp()
+    root = JsonCache._root = os.path.join(temp_cache, '{}.json')
+
+    protocols = {
+        'facebook-full.dat': Facebook(FakeAccount(account_id=1)),
+        'flickr-full.dat': Flickr(FakeAccount(account_id=2)),
+        'twitter-home.dat': Twitter(FakeAccount(account_id=3)),
+        }
+
+    for fake_name, protocol in protocols.items():
+        protocol.source_registry = EDSRegistry()
+        with mock.patch('friends.utils.http.Soup.Message',
+                        FakeSoupMessage('friends.tests.data',
+                                        fake_name)) as fake:
+            protocol.receive()
+
+    shutil.rmtree(temp_cache)
+
+
 class FakeAuth:
     id = 'fakeauth id'
     method = 'fakeauth method'
@@ -61,7 +109,7 @@
 class FakeAccount:
     """A fake account object for testing purposes."""
 
-    def __init__(self, service=None):
+    def __init__(self, service=None, account_id=88):
         self.access_token = None
         self.secret_token = None
         self.user_full_name = None
@@ -69,7 +117,7 @@
         self.user_id = None
         self.auth = FakeAuth()
         self.login_lock = threading.Lock()
-        self.id = '1234'
+        self.id = account_id
         self.protocol = Base(self)
 
 

=== modified file 'friends/tests/test_account.py'
--- friends/tests/test_account.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_account.py	2013-03-20 13:27:53 +0000
@@ -23,19 +23,11 @@
 
 import unittest
 
-from gi.repository import Dee
-
 from friends.errors import UnsupportedProtocolError
 from friends.protocols.flickr import Flickr
-from friends.tests.mocks import FakeAccount, LogMock, SettingsIterMock, mock
+from friends.tests.mocks import FakeAccount, LogMock, SettingsIterMock
+from friends.tests.mocks import TestModel, mock
 from friends.utils.account import Account, AccountManager
-from friends.utils.model import COLUMN_TYPES
-
-
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
 
 
 class TestAccount(unittest.TestCase):
@@ -159,7 +151,6 @@
         assert self.account != None
 
 
-
 accounts_manager = mock.Mock()
 accounts_manager.new_for_service_type(
     'microblogging').get_enabled_account_services.return_value = []
@@ -199,7 +190,7 @@
         # the account manager's mapping.
         manager = AccountManager()
         manager._add_new_account(self.account_service)
-        self.assertIn('1234', manager._accounts)
+        self.assertIn(88, manager._accounts)
 
     def test_account_manager_enabled_event(self):
         manager = AccountManager()
@@ -210,56 +201,6 @@
         manager._on_enabled_event(accounts_manager, 2)
         account.protocol.assert_called_once_with('receive')
 
-    def test_account_manager_delete_account_no_account(self):
-        # Deleting an account removes the global_id from the mapping.  But if
-        # that global id is missing, then it does not cause an exception.
-        manager = AccountManager()
-        manager._get_service = mock.Mock()
-        manager._get_service.return_value = self.account_service
-        self.assertNotIn('1234', manager._accounts)
-        manager._on_account_deleted(accounts_manager, '1234')
-        self.assertNotIn('1234', manager._accounts)
-
-    @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_ids', {})
-    def test_account_manager_delete_account(self):
-        # Deleting an account removes the id from the mapping. But if
-        # that id is missing, then it does not cause an exception.
-        manager = AccountManager()
-        manager._get_service = mock.Mock()
-        manager._get_service.return_value = self.account_service
-        manager._add_new_account(self.account_service)
-        self.assertIn('1234', manager._accounts)
-        manager._on_account_deleted(accounts_manager, '1234')
-        self.assertNotIn('1234', manager._accounts)
-
-    @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_ids', {})
-    def test_account_manager_delete_account_preserve_messages(self):
-        # Deleting an Account should not delete messages from the row
-        # that exist on other protocols too.
-        manager = AccountManager()
-        manager._get_service = mock.Mock()
-        manager._get_service.return_value = self.account_service
-        manager._add_new_account(self.account_service)
-        example_row = [[['twitter', '6', '1234'],
-             ['base', '1234', '5678']],
-            'messages', 'Fred Flintstone', '', 'fred', True,
-            '2012-08-28T19:59:34', 'Yabba dabba dooooo!', '', '',
-            0.0, False, '', '', '', '', '', '']
-        result_row = [[['twitter', '6', '1234']],
-            'messages', 'Fred Flintstone', '', 'fred', True,
-            '2012-08-28T19:59:34', 'Yabba dabba dooooo!', '', '',
-            0.0, False, '', '', '', '', '', '']
-        row_iter = TestModel.append(*example_row)
-        from friends.utils.base import _seen_ids
-        _seen_ids[
-            ('base', '1234', '5678')
-            ] = TestModel.get_position(row_iter)
-        self.assertEqual(list(TestModel.get_row(0)), example_row)
-        manager._on_account_deleted(accounts_manager, '1234')
-        self.assertEqual(list(TestModel.get_row(0)), result_row)
-
 
 @mock.patch('gi.repository.Accounts.Manager', accounts_manager)
 class TestAccountManagerRealAccount(unittest.TestCase):

=== modified file 'friends/tests/test_cache.py'
--- friends/tests/test_cache.py	2013-03-08 02:31:15 +0000
+++ friends/tests/test_cache.py	2013-03-20 13:27:53 +0000
@@ -21,14 +21,10 @@
 
 
 import os
-import time
 import shutil
 import tempfile
 import unittest
 
-from datetime import date, timedelta
-from pkg_resources import resource_filename
-
 from friends.utils.cache import JsonCache
 
 

=== modified file 'friends/tests/test_dispatcher.py'
--- friends/tests/test_dispatcher.py	2013-02-19 17:00:41 +0000
+++ friends/tests/test_dispatcher.py	2013-03-20 13:27:53 +0000
@@ -26,7 +26,7 @@
 
 from dbus.mainloop.glib import DBusGMainLoop
 
-from friends.service.dispatcher import Dispatcher, STUB
+from friends.service.dispatcher import Dispatcher, ManageTimers, STUB
 from friends.tests.mocks import LogMock, mock
 
 
@@ -61,7 +61,11 @@
         self.dispatcher.account_manager.get_all.assert_called_once_with()
         account.protocol.assert_called_once_with('receive')
 
-        self.assertEqual(self.log_mock.empty(), 'Refresh requested\n')
+        self.assertEqual(self.log_mock.empty(),
+                         'Clearing 1 shutdown timer(s)...\n'
+                         'Refresh requested\n'
+                         'Clearing 0 shutdown timer(s)...\n'
+                         'Starting new shutdown timer...\n')
 
     def test_clear_indicators(self):
         self.dispatcher.menu_manager = mock.Mock()
@@ -81,7 +85,10 @@
             'like', '23346356767354626', success=STUB, failure=STUB)
 
         self.assertEqual(self.log_mock.empty(),
-                         '345: like 23346356767354626\n')
+                         'Clearing 1 shutdown timer(s)...\n'
+                         '345: like 23346356767354626\n'
+                         'Clearing 0 shutdown timer(s)...\n'
+                         'Starting new shutdown timer...\n')
 
     def test_failing_do(self):
         account = mock.Mock()
@@ -93,7 +100,10 @@
         self.assertEqual(account.protocol.call_count, 0)
 
         self.assertEqual(self.log_mock.empty(),
-                         'Could not find account: 6\n')
+                         'Clearing 1 shutdown timer(s)...\n'
+                         'Could not find account: 6\n'
+                         'Clearing 0 shutdown timer(s)...\n'
+                         'Starting new shutdown timer...\n')
 
     def test_send_message(self):
         account1 = mock.Mock()
@@ -128,7 +138,10 @@
             success=STUB, failure=STUB)
 
         self.assertEqual(self.log_mock.empty(),
-                         'Replying to 2, objid\n')
+                         'Clearing 1 shutdown timer(s)...\n'
+                         'Replying to 2, objid\n'
+                         'Clearing 0 shutdown timer(s)...\n'
+                         'Starting new shutdown timer...\n')
 
     def test_send_reply_failed(self):
         account = mock.Mock()
@@ -140,8 +153,11 @@
         self.assertEqual(account.protocol.call_count, 0)
 
         self.assertEqual(self.log_mock.empty(),
-                         'Replying to 2, objid\n' +
-                         'Could not find account: 2\n')
+                         'Clearing 1 shutdown timer(s)...\n'
+                         'Replying to 2, objid\n'
+                         'Could not find account: 2\n'
+                         'Clearing 0 shutdown timer(s)...\n'
+                         'Starting new shutdown timer...\n')
 
     def test_upload_async(self):
         account = mock.Mock()
@@ -166,7 +182,10 @@
             )
 
         self.assertEqual(self.log_mock.empty(),
-                         'Uploading file://path/to/image.png to 2\n')
+                         'Clearing 1 shutdown timer(s)...\n'
+                         'Uploading file://path/to/image.png to 2\n'
+                         'Clearing 0 shutdown timer(s)...\n'
+                         'Starting new shutdown timer...\n')
 
     def test_get_features(self):
         self.assertEqual(json.loads(self.dispatcher.GetFeatures('facebook')),
@@ -205,6 +224,52 @@
             self.dispatcher.URLShorten(long_url),
             'short url')
         lookup_mock.is_shortened.assert_called_once_with(long_url)
-        self.dispatcher.settings.get_boolean.assert_called_once_with('shorten-urls')
+        self.dispatcher.settings.get_boolean.assert_called_once_with(
+            'shorten-urls')
         lookup_mock.lookup.assert_called_once_with('is.gd')
-        lookup_mock.lookup.return_value.shorten.assert_called_once_with(long_url)
+        lookup_mock.lookup.return_value.shorten.assert_called_once_with(
+            long_url)
+
+    @mock.patch('friends.service.dispatcher.GLib')
+    def test_manage_timers_clear(self, glib):
+        manager = ManageTimers()
+        manager.timers = {1}
+        manager.__enter__()
+        glib.source_remove.assert_called_once_with(1)
+        manager.timers = {1, 2, 3}
+        manager.clear_all_timers()
+        self.assertEqual(glib.source_remove.call_count, 4)
+
+    @mock.patch('friends.service.dispatcher.GLib')
+    def test_manage_timers_set(self, glib):
+        manager = ManageTimers()
+        manager.timers = set()
+        manager.clear_all_timers = mock.Mock()
+        manager.__exit__()
+        glib.timeout_add_seconds.assert_called_once_with(30, manager.terminate)
+        manager.clear_all_timers.assert_called_once_with()
+        self.assertEqual(len(manager.timers), 1)
+
+    @mock.patch('friends.service.dispatcher.persist_model')
+    @mock.patch('friends.service.dispatcher.threading')
+    @mock.patch('friends.service.dispatcher.GLib')
+    def test_manage_timers_terminate(self, glib, thread, persist):
+        manager = ManageTimers()
+        manager.timers = set()
+        thread.activeCount.return_value = 1
+        manager.terminate()
+        thread.activeCount.assert_called_once_with()
+        persist.assert_called_once_with()
+        glib.idle_add.assert_called_once_with(manager.callback)
+
+    @mock.patch('friends.service.dispatcher.persist_model')
+    @mock.patch('friends.service.dispatcher.threading')
+    @mock.patch('friends.service.dispatcher.GLib')
+    def test_manage_timers_dont_kill_threads(self, glib, thread, persist):
+        manager = ManageTimers()
+        manager.timers = set()
+        manager.set_new_timer = mock.Mock()
+        thread.activeCount.return_value = 10
+        manager.terminate()
+        thread.activeCount.assert_called_once_with()
+        manager.set_new_timer.assert_called_once_with()

=== modified file 'friends/tests/test_facebook.py'
--- friends/tests/test_facebook.py	2013-02-27 22:22:38 +0000
+++ friends/tests/test_facebook.py	2013-03-20 13:27:53 +0000
@@ -15,27 +15,26 @@
 
 """Test the Facebook plugin."""
 
+
 __all__ = [
     'TestFacebook',
     ]
 
 
+import os
+import tempfile
 import unittest
+import shutil
 
-from gi.repository import Dee, GLib
+from gi.repository import GLib
 from pkg_resources import resource_filename
 
 from friends.protocols.facebook import Facebook
-from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock, mock
+from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock
+from friends.tests.mocks import TestModel, mock
 from friends.tests.mocks import EDSBookClientMock, EDSSource, EDSRegistry
 from friends.errors import ContactsError, FriendsError, AuthorizationError
-from friends.utils.model import COLUMN_TYPES
-
-
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
+from friends.utils.cache import JsonCache
 
 
 @mock.patch('friends.utils.http._soup', mock.Mock())
@@ -44,12 +43,16 @@
     """Test the Facebook API."""
 
     def setUp(self):
+        self._temp_cache = tempfile.mkdtemp()
+        self._root = JsonCache._root = os.path.join(
+            self._temp_cache, '{}.json')
         self.account = FakeAccount()
         self.protocol = Facebook(self.account)
         self.protocol.source_registry = EDSRegistry()
 
     def tearDown(self):
         TestModel.clear()
+        shutil.rmtree(self._temp_cache)
 
     def test_features(self):
         # The set of public features.
@@ -106,75 +109,153 @@
         # Receive the wall feed for a user.
         self.maxDiff = None
         self.account.access_token = 'abc'
-        self.assertEqual(self.protocol.receive(), 4)
-        self.assertEqual(TestModel.get_n_rows(), 4)
+        self.assertEqual(self.protocol.receive(), 12)
+        self.assertEqual(TestModel.get_n_rows(), 12)
+        self.assertEqual(list(TestModel.get_row(0)), [
+            'facebook',
+            88,
+            'fake_id',
+            'mentions',
+            'Yours Truly',
+            '56789',
+            'Yours Truly',
+            False,
+            '2013-03-13T23:29:07Z',
+            'Writing code that supports geotagging data from facebook. ' +
+            'If y\'all could make some geotagged facebook posts for me ' +
+            'to test with, that\'d be super.',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/5c4e74c64b1a09343558afc1046c2b1d176a2ba2',
+            'https://www.facebook.com/56789',
+            1,
+            False,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            'Victoria, British Columbia',
+            48.4333,
+            -123.35,
+            ])
         self.assertEqual(list(TestModel.get_row(2)), [
-            [['facebook',
-              '1234',
-              '117402931676347_386054134801436_3235476']],
-            'reply_to/109',
-            'Bruce Peart',
-            '809',
-            'Bruce Peart',
-            False,
-            '2012-09-26T17:16:00Z',
-            'OK Don...10) Headlong Flight',
-            GLib.get_user_cache_dir() +
-            '/friends/avatars/b688c8def0455d4a3853d5fcdfaf0708645cfd3e',
-            'https://www.facebook.com/809',
-            0.0,
-            False,
-            '',
-            '',
-            '',
-            '',
-            '',
-            ''])
-        self.assertEqual(list(TestModel.get_row(0)), [
-            [['facebook', '1234', '108']],
-            'mentions',
-            'Rush is a Band',
-            '117402931676347',
-            'Rush is a Band',
-            False,
-            '2012-09-26T17:34:00Z',
-            'Rush takes off to the Great White North',
-            GLib.get_user_cache_dir() +
-            '/friends/avatars/7d1a70e6998f4a38954e93ca03d689463f71d63b',
-            'https://www.facebook.com/117402931676347',
-            16.0,
-            False,
-            'https://fbexternal-a.akamaihd.net/rush.jpg',
-            'Rush is a Band Blog',
-            'http://www.rushisaband.com/blog/Rush-Clockwork-Angels-tour',
-            'Rush is a Band: Neil Peart, Geddy Lee, Alex Lifeson',
-            'www.rushisaband.com',
-            ''])
-        self.assertEqual(list(TestModel.get_row(1)), [
-            [['facebook', '1234', '109']],
-            'mentions',
-            'Rush is a Band',
-            '117402931676347',
-            'Rush is a Band',
-            False,
-            '2012-09-26T17:49:06Z',
-            'http://www2.gibson.com/Alex-Lifeson-0225-2011.aspx',
-            GLib.get_user_cache_dir() +
-            '/friends/avatars/7d1a70e6998f4a38954e93ca03d689463f71d63b',
-            'https://www.facebook.com/117402931676347',
-            27.0,
-            False,
-            'https://images.gibson.com/Rush_Clockwork-Angels_t.jpg',
-            'Top 10 Alex Lifeson Guitar Moments',
-            'http://www2.gibson.com/Alex-Lifeson.aspx',
-            'For millions of Rush fans old and new, it’s a pleasure',
-            'www2.gibson.com',
-            ''])
+            'facebook',
+            88,
+            'faker than cake!',
+            'reply_to/fake_id',
+            'Father',
+            '234',
+            'Father',
+            False,
+            '2013-03-12T23:29:45Z',
+            'don\'t know how',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/9b9379ccc7948e4804dff7914bfa4c6de3974df5',
+            'https://www.facebook.com/234',
+            0,
+            False,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0.0,
+            0.0,
+            ])
+        self.assertEqual(list(TestModel.get_row(6)), [
+            'facebook',
+            88,
+            '161247843901324_629147610444676',
+            'mentions',
+            'Best Western Denver Southwest',
+            '161247843901324',
+            'Best Western Denver Southwest',
+            False,
+            '2013-03-11T23:51:25Z',
+            'Today only -- Come meet Caroline and Meredith and Stanley the ' +
+            'Stegosaurus (& Greg & Joe, too!) at the TechZulu Trend Lounge, ' +
+            'Hilton Garden Inn 18th floor, 500 N Interstate 35, Austin, ' +
+            'Texas. Monday, March 11th, 4:00pm to 7:00 pm. Also here ' +
+            'Hannah Hart (My Drunk Kitchen) and Angry Video Game Nerd ' +
+            'producer, Sean Keegan. Stanley is in the lobby.',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/5b2d70e788df790b9c8db4c6a138fc4a1f433ec9',
+            'https://www.facebook.com/161247843901324',
+            84,
+            False,
+            'https://fbcdn-photos-a.akamaihd.net/hphotos-ak-snc7/' +
+            '601266_629147587111345_968504279_s.jpg',
+            '',
+            'https://www.facebook.com/photo.php?fbid=629147587111345&set=a.173256162700492.47377.161247843901324&type=1&relevant_count=1',
+            '',
+            '',
+            '',
+            'Hilton Garden Inn Austin Downtown/Convention Center',
+            30.265384957204,
+            -97.735604602521,
+            ])
+        self.assertEqual(list(TestModel.get_row(9)), [
+            'facebook',
+            88,
+            '104443_100085049977',
+            'mentions',
+            'Guy Frenchie',
+            '1244414',
+            'Guy Frenchie',
+            False,
+            '2013-03-15T19:57:14Z',
+            'Guy Frenchie did some things with some stuff.',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/3f5e276af0c43f6411d931b829123825ede1968e',
+            'https://www.facebook.com/1244414',
+            3,
+            False,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0.0,
+            0.0,
+            ])
 
     # XXX We really need full coverage of the receive() method, including
     # cases where some data is missing, or can't be converted
     # (e.g. timestamps), and paginations.
 
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.http.Soup.Message',
+                FakeSoupMessage('friends.tests.data', 'facebook-full.dat'))
+    @mock.patch('friends.protocols.facebook.Facebook._login',
+                return_value=True)
+    @mock.patch('friends.utils.base._seen_ids', {})
+    def test_home_since_id(self, *mocks):
+        self.account.access_token = 'access'
+        self.account.secret_token = 'secret'
+        self.account.auth.parameters = dict(
+            ConsumerKey='key',
+            ConsumerSecret='secret')
+        self.assertEqual(self.protocol.home(), 12)
+
+        with open(self._root.format('facebook_ids'), 'r') as fd:
+            self.assertEqual(fd.read(), '{"messages": "2013-03-15T19:57:14Z"}')
+
+        follow = self.protocol._follow_pagination = mock.Mock()
+        follow.return_value = []
+        self.assertEqual(self.protocol.home(), 12)
+        follow.assert_called_once_with(
+            'https://graph.facebook.com/me/home',
+            dict(limit=50,
+                 since='2013-03-15T19:57:14Z',
+                 access_token='access',
+                 )
+            )
+
     @mock.patch('friends.protocols.facebook.Downloader')
     def test_send_to_my_wall(self, dload):
         dload().get_json.return_value = dict(id='post_id')

=== modified file 'friends/tests/test_flickr.py'
--- friends/tests/test_flickr.py	2013-02-27 23:04:36 +0000
+++ friends/tests/test_flickr.py	2013-03-20 13:27:53 +0000
@@ -22,18 +22,12 @@
 
 import unittest
 
-from gi.repository import GLib, Dee
+from gi.repository import GLib
 
 from friends.errors import AuthorizationError, FriendsError
 from friends.protocols.flickr import Flickr
-from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock, mock
-from friends.utils.model import COLUMN_INDICES, COLUMN_TYPES
-
-
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
+from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock
+from friends.tests.mocks import TestModel, mock
 
 
 @mock.patch('friends.utils.http._soup', mock.Mock())
@@ -133,7 +127,7 @@
             'http://api.flickr.com/services/rest',
             method='GET',
             params=dict(
-                extras='date_upload,owner_name,icon_server',
+                extras='date_upload,owner_name,icon_server,geo',
                 format='json',
                 nojsoncallback='1',
                 api_key='fake',
@@ -157,77 +151,66 @@
     @mock.patch('friends.utils.base.Model', TestModel)
     def test_flickr_data(self):
         # Start by setting up a fake account id.
-        self.account.id = 'lerxst'
+        self.account.id = 69
         with mock.patch.object(self.protocol, '_get_access_token',
                                return_value='token'):
-            self.assertEqual(self.protocol.receive(), 3)
-        self.assertEqual(TestModel.get_n_rows(), 3)
+            self.assertEqual(self.protocol.receive(), 10)
+        self.assertEqual(TestModel.get_n_rows(), 10)
 
         self.assertEqual(
             list(TestModel.get_row(0)),
-            [[['flickr', 'lerxst', '801']],
-             'images',
-             '',
-             '123',
-             '',
-             False,
-             '2012-05-10T13:36:45Z',
-             '',
-             '',
-             '',
-             0.0,
-             False,
-             '',
-             '',
-             '',
-             '',
-             'ant',
-             '',
-             ])
-
-        self.assertEqual(
-            list(TestModel.get_row(1)),
-            [[['flickr', 'lerxst', '802']],
-             'images',
-             'Alex Lifeson',
-             '456',
-             'Alex Lifeson',
-             True,
-             '',
-             '',
-             '',
-             '',
-             0.0,
-             False,
-             '',
-             '',
-             '',
-             '',
-             'bee',
-             '',
-             ])
-
-        self.assertEqual(
-            list(TestModel.get_row(2)),
-            [[['flickr', 'lerxst', '803']],
-             'images',
-             'Bob Dobbs',
-             '789',
-             'Bob Dobbs',
-             False,
-             '',
-             '',
-             GLib.get_user_cache_dir() +
-             '/friends/avatars/b913501d6face9d13f3006b731a711b596d23099',
-             'http://www.flickr.com/people/789',
-             0.0,
-             False,
-             'http://farmanimalz.static.flickr.com/1/789_ghi_m.jpg',
-             '',
-             'http://farmanimalz.static.flickr.com/1/789_ghi_b.jpg',
-             '',
-             'cat',
-             'http://farmanimalz.static.flickr.com/1/789_ghi_t.jpg',
+            ['flickr',
+             69,
+             '8552892154',
+             'images',
+             'raise my voice',
+             '47303164@N00',
+             'raise my voice',
+             True,
+             '2013-03-12T19:51:42Z',
+             '',
+             GLib.get_user_cache_dir() +
+             '/friends/avatars/7b30ff0140dd9b80f2b1782a2802c3ce785fa0ce',
+             'http://www.flickr.com/people/47303164@N00',
+             0,
+             False,
+             'http://farm9.static.flickr.com/8378/47303164@N00_a_m.jpg',
+             '',
+             'http://farm9.static.flickr.com/8378/47303164@N00_a_b.jpg',
+             '',
+             'Chocolate chai #yegcoffee',
+             'http://farm9.static.flickr.com/8378/47303164@N00_a_t.jpg',
+             '',
+             0.0,
+             0.0,
+             ])
+
+        self.assertEqual(
+            list(TestModel.get_row(4)),
+            ['flickr',
+             69,
+             '8550829193',
+             'images',
+             'Nelson Webb',
+             '27204141@N05',
+             'Nelson Webb',
+             True,
+             '2013-03-12T13:54:10Z',
+             '',
+             GLib.get_user_cache_dir() +
+             '/friends/avatars/cae2939354a33fea5f008df91bb8e25920be5dc3',
+             'http://www.flickr.com/people/27204141@N05',
+             0,
+             False,
+             'http://farm9.static.flickr.com/8246/27204141@N05_e_m.jpg',
+             '',
+             'http://farm9.static.flickr.com/8246/27204141@N05_e_b.jpg',
+             '',
+             'St. Michael - The Archangel',
+             'http://farm9.static.flickr.com/8246/27204141@N05_e_t.jpg',
+             '',
+             53.833156,
+             -112.330784,
              ])
 
     @mock.patch('friends.utils.http.Soup.form_request_new_from_multipart',

=== modified file 'friends/tests/test_foursquare.py'
--- friends/tests/test_foursquare.py	2013-02-26 19:13:31 +0000
+++ friends/tests/test_foursquare.py	2013-03-20 13:27:53 +0000
@@ -22,20 +22,12 @@
 
 import unittest
 
-from gi.repository import Dee
-
 from friends.protocols.foursquare import FourSquare
-from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock, mock
-from friends.utils.model import COLUMN_TYPES
+from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock
+from friends.tests.mocks import TestModel, mock
 from friends.errors import AuthorizationError
 
 
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
-
-
 @mock.patch('friends.utils.http._soup', mock.Mock())
 @mock.patch('friends.utils.base.notify', mock.Mock())
 class TestFourSquare(unittest.TestCase):
@@ -93,11 +85,11 @@
         self.assertEqual(self.protocol.receive(), 1)
         self.assertEqual(1, TestModel.get_n_rows())
         expected = [
-            [['foursquare', '1234', '50574c9ce4b0a9a6e84433a0']],
+            'foursquare', 88, '50574c9ce4b0a9a6e84433a0',
             'messages', 'Jimbob Smith', '', '', True, '2012-09-17T19:15:24Z',
             "Working on friends's foursquare plugin.",
-            '~/.cache/friends/avatar/hash', '', 0.0, False, '', '', '',
-            '', '', '',
+            '~/.cache/friends/avatar/hash', '', 0, False, '', '', '',
+            '', '', '', 'Pop Soda\'s Coffee House & Gallery',
+            49.88873164336725, -97.158043384552,
             ]
-        for got, want in zip(TestModel.get_row(0), expected):
-            self.assertEqual(got, want)
+        self.assertEqual(list(TestModel.get_row(0)), expected)

=== modified file 'friends/tests/test_identica.py'
--- friends/tests/test_identica.py	2013-03-08 02:31:15 +0000
+++ friends/tests/test_identica.py	2013-03-20 13:27:53 +0000
@@ -26,23 +26,15 @@
 import unittest
 import shutil
 
-from gi.repository import Dee
-
 from friends.protocols.identica import Identica
-from friends.tests.mocks import FakeAccount, LogMock, mock
+from friends.tests.mocks import FakeAccount, LogMock, TestModel, mock
 from friends.utils.cache import JsonCache
-from friends.utils.model import COLUMN_TYPES
 from friends.errors import AuthorizationError
 
 
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
-
-
 @mock.patch('friends.utils.http._soup', mock.Mock())
 @mock.patch('friends.utils.base.notify', mock.Mock())
[e-mail]('friends.utils.base.Model', TestModel)
 class TestIdentica(unittest.TestCase):
     """Test the Identica API."""
 

=== modified file 'friends/tests/test_mock_dispatcher.py'
--- friends/tests/test_mock_dispatcher.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_mock_dispatcher.py	2013-03-20 13:27:53 +0000
@@ -22,13 +22,11 @@
 
 import dbus.service
 import unittest
-import json
 
 from dbus.mainloop.glib import DBusGMainLoop
 
 from friends.service.mock_service import Dispatcher as MockDispatcher
 from friends.service.dispatcher import Dispatcher
-from friends.tests.mocks import LogMock, mock
 
 
 # Set up the DBus main loop.

=== modified file 'friends/tests/test_model.py'
--- friends/tests/test_model.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_model.py	2013-03-20 13:27:53 +0000
@@ -26,10 +26,8 @@
 
 import unittest
 
-from friends.utils.model import Model
 from friends.utils.model import prune_model, persist_model
 from friends.tests.mocks import LogMock, mock
-from gi.repository import Dee
 
 
 class TestModel(unittest.TestCase):
@@ -42,6 +40,17 @@
         self.log_mock.stop()
 
     @mock.patch('friends.utils.model.Model')
+    def test_persist_model(self, model):
+        model.__len__.return_value = 500
+        model.is_synchronized.return_value = True
+        persist_model()
+        model.is_synchronized.assert_called_once_with()
+        model.flush_revision_queue.assert_called_once_with()
+        self.assertEqual(self.log_mock.empty(),
+                         'Trying to save Dee.SharedModel with 500 rows.\n' +
+                         'Saving Dee.SharedModel with 500 rows.\n')
+
+    @mock.patch('friends.utils.model.Model')
     @mock.patch('friends.utils.model.persist_model')
     def test_prune_one(self, persist, model):
         model.get_n_rows.return_value = 8001

=== modified file 'friends/tests/test_notify.py'
--- friends/tests/test_notify.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_notify.py	2013-03-20 13:27:53 +0000
@@ -22,20 +22,11 @@
 
 import unittest
 
-from gi.repository import Dee
-
-from friends.tests.mocks import FakeAccount, mock
+from friends.tests.mocks import FakeAccount, TestModel, mock
 from friends.utils.base import Base
-from friends.utils.model import COLUMN_TYPES
 from friends.utils.notify import notify
 
 
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
-
-
 class TestNotifications(unittest.TestCase):
     """Test notification details."""
 
@@ -43,7 +34,6 @@
         TestModel.clear()
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     @mock.patch('friends.utils.base.notify')
     def test_publish_all(self, notify):
@@ -57,7 +47,6 @@
         notify.assert_called_once_with('Benjamin', 'notify!', '')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     @mock.patch('friends.utils.base.notify')
     def test_publish_mentions_private(self, notify):
@@ -73,7 +62,6 @@
         notify.assert_called_once_with('Benjamin', 'This message is private!', '')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     @mock.patch('friends.utils.base.notify')
     def test_publish_mention_fail(self, notify):
@@ -89,7 +77,6 @@
         self.assertEqual(notify.call_count, 0)
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     @mock.patch('friends.utils.base.notify')
     def test_publish_mention_none(self, notify):

=== modified file 'friends/tests/test_protocols.py'
--- friends/tests/test_protocols.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_protocols.py	2013-03-20 13:27:53 +0000
@@ -24,21 +24,12 @@
 import unittest
 import threading
 
-from gi.repository import Dee
-
 from friends.protocols.flickr import Flickr
 from friends.protocols.twitter import Twitter
-from friends.tests.mocks import FakeAccount, LogMock, mock
-from friends.utils.base import Base, feature
+from friends.tests.mocks import FakeAccount, LogMock, TestModel, mock
+from friends.utils.base import Base, feature, linkify_string
 from friends.utils.manager import ProtocolManager
-from friends.utils.model import (
-    COLUMN_INDICES, COLUMN_NAMES, COLUMN_TYPES, Model)
-
-
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
+from friends.utils.model import COLUMN_INDICES, Model
 
 
 class TestProtocolManager(unittest.TestCase):
@@ -147,42 +138,39 @@
         count = Model.get_n_rows()
         self.assertEqual(TestModel.get_n_rows(), 0)
         base = Base(FakeAccount())
-        base._publish('alpha', message='a')
-        base._publish('beta', message='b')
-        base._publish('omega', message='c')
+        base._publish(message_id='alpha', message='a')
+        base._publish(message_id='beta', message='b')
+        base._publish(message_id='omega', message='c')
         self.assertEqual(Model.get_n_rows(), count)
         self.assertEqual(TestModel.get_n_rows(), 3)
 
     @mock.patch('friends.utils.base.Model', TestModel)
     @mock.patch('friends.utils.base._seen_ids', {})
-    @mock.patch('friends.utils.base._seen_messages', {})
     def test_seen_dicts_successfully_instantiated(self):
-        from friends.utils.base import _seen_ids, _seen_messages
+        from friends.utils.base import _seen_ids
         from friends.utils.base import initialize_caches
         self.assertEqual(TestModel.get_n_rows(), 0)
         base = Base(FakeAccount())
-        base._publish('alpha', sender='a', message='a')
-        base._publish('beta', sender='a', message='a')
-        base._publish('omega', sender='a', message='b')
-        self.assertEqual(TestModel.get_n_rows(), 2)
+        base._publish(message_id='alpha', sender='a', message='a')
+        base._publish(message_id='beta', sender='a', message='a')
+        base._publish(message_id='omega', sender='a', message='b')
+        self.assertEqual(TestModel.get_n_rows(), 3)
         _seen_ids.clear()
-        _seen_messages.clear()
         initialize_caches()
-        self.assertEqual(sorted(list(_seen_messages.keys())), ['aa', 'ab'])
-        self.assertEqual(sorted(list(_seen_ids.keys())),
-                         [('base', '1234', 'alpha'),
-                          ('base', '1234', 'beta'),
-                          ('base', '1234', 'omega')])
-        # These two point at the same row because sender+message are identical
-        self.assertEqual(_seen_ids[('base', '1234', 'alpha')],
-                         _seen_ids[('base', '1234', 'beta')])
+        self.assertEqual(
+            _seen_ids,
+            dict(alpha=0,
+                 beta=1,
+                 omega=2,
+                 )
+            )
 
     @mock.patch('friends.utils.base.Model', TestModel)
     def test_invalid_argument(self):
         base = Base(FakeAccount())
         self.assertEqual(0, TestModel.get_n_rows())
         with self.assertRaises(TypeError) as cm:
-            base._publish('message_id', invalid_argument='not good')
+            base._publish(message_id='message_id', invalid_argument='not good')
         self.assertEqual(str(cm.exception),
                          'Unexpected keyword arguments: invalid_argument')
 
@@ -192,12 +180,11 @@
         base = Base(FakeAccount())
         self.assertEqual(0, TestModel.get_n_rows())
         with self.assertRaises(TypeError) as cm:
-            base._publish('p.middy', bad='no', wrong='yes')
+            base._publish(message_id='p.middy', bad='no', wrong='yes')
         self.assertEqual(str(cm.exception),
                          'Unexpected keyword arguments: bad, wrong')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_one_message(self):
         # Test that publishing a message inserts a row into the model.
@@ -215,28 +202,34 @@
             liked=True))
         self.assertEqual(1, TestModel.get_n_rows())
         row = TestModel.get_row(0)
-        # For convenience.
-        def V(column_name):
-            return row[COLUMN_INDICES[column_name]]
-        self.assertEqual(V('message_ids'),
-                         [['base', '1234', '1234']])
-        self.assertEqual(V('stream'), 'messages')
-        self.assertEqual(V('sender'), 'fred')
-        self.assertEqual(V('sender_nick'), 'freddy')
-        self.assertTrue(V('from_me'))
-        self.assertEqual(V('timestamp'), 'today')
-        self.assertEqual(V('message'), 'hello, @jimmy')
-        self.assertEqual(V('likes'), 10)
-        self.assertTrue(V('liked'))
-        # All the other columns have empty string values.
-        empty_columns = set(COLUMN_NAMES) - set(
-            ['message_ids', 'stream', 'sender', 'sender_nick', 'from_me',
-             'timestamp', 'comments', 'message', 'likes', 'liked'])
-        for column_name in empty_columns:
-            self.assertEqual(row[COLUMN_INDICES[column_name]], '')
+        self.assertEqual(
+            list(row),
+            ['base',
+             88,
+             '1234',
+             'messages',
+             'fred',
+             '',
+             'freddy',
+             True,
+             'today',
+             'hello, @jimmy',
+             '',
+             '',
+             10,
+             True,
+             '',
+             '',
+             '',
+             '',
+             '',
+             '',
+             '',
+             0.0,
+             0.0,
+             ])
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_unpublish(self):
         base = Base(FakeAccount())
@@ -246,32 +239,24 @@
             sender='fred',
             message='hello, @jimmy'))
         self.assertTrue(base._publish(
+            message_id='1234',
+            sender='fred',
+            message='hello, @jimmy'))
+        self.assertTrue(base._publish(
             message_id='5678',
             sender='fred',
             message='hello, +jimmy'))
-        self.assertEqual(1, TestModel.get_n_rows())
-        self.assertEqual(TestModel[0][0],
-                         [['base', '1234', '1234'],
-                          ['base', '1234', '5678']])
+        self.assertEqual(2, TestModel.get_n_rows())
         base._unpublish('1234')
         self.assertEqual(1, TestModel.get_n_rows())
-        self.assertEqual(TestModel[0][0],
-                         [['base', '1234', '5678']])
         base._unpublish('5678')
         self.assertEqual(0, TestModel.get_n_rows())
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_duplicate_messages_identified(self):
-        # When two messages which are deemed identical, by way of the
-        # _make_key() test in base.py, are published, only one ends up in the
-        # model.  However, the message_ids list-of-lists gets both sets of
-        # identifiers.
         base = Base(FakeAccount())
         self.assertEqual(0, TestModel.get_n_rows())
-        # Insert the first message into the table.  The key will be the string
-        # 'fredhellojimmy'
         self.assertTrue(base._publish(
             message_id='1234',
             stream='messages',
@@ -282,11 +267,9 @@
             message='hello, @jimmy',
             likes=10,
             liked=True))
-        # Insert the second message into the table.  Note that because
-        # punctuation was stripped from the above message, this one will also
-        # have the key 'fredhellojimmy', thus it will be deemed a duplicate.
+        # Duplicate
         self.assertTrue(base._publish(
-            message_id='5678',
+            message_id='1234',
             stream='messages',
             sender='fred',
             sender_nick='freddy',
@@ -300,13 +283,8 @@
         # The first published message wins.
         row = TestModel.get_row(0)
         self.assertEqual(row[COLUMN_INDICES['message']], 'hello, @jimmy')
-        # Both message ids will be present, in the order they were published.
-        self.assertEqual(row[COLUMN_INDICES['message_ids']],
-                         [['base', '1234', '1234'],
-                          ['base', '1234', '5678']])
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_duplicate_ids_not_duplicated(self):
         # When two messages are actually identical (same ids and all),
@@ -325,12 +303,34 @@
             message='hello, @jimmy'))
         self.assertEqual(1, TestModel.get_n_rows())
         row = TestModel.get_row(0)
-        # The same message_id should not appear twice.
-        self.assertEqual(row[COLUMN_INDICES['message_ids']],
-                         [['base', '1234', '1234']])
+        self.assertEqual(
+            list(row),
+            ['base',
+             88,
+             '1234',
+             'messages',
+             'fred',
+             '',
+             '',
+             False,
+             '',
+             'hello, @jimmy',
+             '',
+             '',
+             0,
+             False,
+             '',
+             '',
+             '',
+             '',
+             '',
+             '',
+             '',
+             0.0,
+             0.0,
+             ])
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_similar_messages_allowed(self):
         # Because both the sender and message contribute to the unique key we
@@ -392,3 +392,78 @@
 
     def test_features(self):
         self.assertEqual(MyProtocol.get_features(), ['feature_1', 'feature_2'])
+
+    def test_linkify_string(self):
+        # String with no URL is unchanged.
+        self.assertEqual('Hello!', linkify_string('Hello!'))
+        # http:// works.
+        self.assertEqual(
+            '<a href="http://www.example.com">http://www.example.com</a>',
+            linkify_string('http://www.example.com'))
+        # https:// works, too.
+        self.assertEqual(
+            '<a href="https://www.example.com">https://www.example.com</a>',
+            linkify_string('https://www.example.com'))
+        # http:// is optional if you include www.
+        self.assertEqual(
+            '<a href="www.example.com">www.example.com</a>',
+            linkify_string('www.example.com'))
+        # Haha, nobody uses ftp anymore!
+        self.assertEqual(
+            '<a href="ftp://example.com/">ftp://example.com/</a>',
+            linkify_string('ftp://example.com/'))
+        # Trailing periods are not linkified.
+        self.assertEqual(
+            '<a href="http://example.com">http://example.com</a>.',
+            linkify_string('http://example.com.'))
+        # URL can contain periods without getting cut off.
+        self.assertEqual(
+            '<a href="http://example.com/products/buy.html">'
+            'http://example.com/products/buy.html</a>.',
+            linkify_string('http://example.com/products/buy.html.'))
+        # Don't linkify trailing brackets.
+        self.assertEqual(
+            'Example Co (<a href="http://example.com">http://example.com</a>).',
+            linkify_string('Example Co (http://example.com).'))
+        # Don't linkify trailing exclamation marks.
+        self.assertEqual(
+            'Go to <a href="https://example.com">https://example.com</a>!',
+            linkify_string('Go to https://example.com!'))
+        # Don't linkify trailing commas, also ensure all links are found.
+        self.assertEqual(
+            '<a href="www.example.com">www.example.com</a>, <a '
+            'href="http://example.com/stuff">http://example.com/stuff</a>, and '
+            '<a href="http://example.com/things">http://example.com/things</a> '
+            'are my favorite sites.',
+            linkify_string('www.example.com, http://example.com/stuff, and '
+                           'http://example.com/things are my favorite sites.'))
+        # Don't linkify trailing question marks.
+        self.assertEqual(
+            'Ever been to <a href="www.example.com">www.example.com</a>?',
+            linkify_string('Ever been to www.example.com?'))
+        # URLs can contain question marks ok.
+        self.assertEqual(
+            'Like <a href="http://example.com?foo=bar&grill=true">'
+            'http://example.com?foo=bar&grill=true</a>?',
+            linkify_string('Like http://example.com?foo=bar&grill=true?'))
+        # Multi-line strings are also supported.
+        self.assertEqual(
+            'Hey, visit us online!\n\n'
+            '<a href="http://example.com">http://example.com</a>',
+            linkify_string('Hey, visit us online!\n\nhttp://example.com'))
+        # Don't accidentally duplicate linkification.
+        self.assertEqual(
+            '<a href="www.example.com">click here!</a>',
+            linkify_string('<a href="www.example.com">click here!</a>'))
+        self.assertEqual(
+            '<a href="www.example.com">www.example.com</a>',
+            linkify_string('<a href="www.example.com">www.example.com</a>'))
+        self.assertEqual(
+            '<a href="www.example.com">www.example.com</a> is our website',
+            linkify_string(
+                '<a href="www.example.com">www.example.com</a> is our website'))
+        # This, apparently, is valid HTML.
+        self.assertEqual(
+            '<a href = "www.example.com">www.example.com</a>',
+            linkify_string(
+                '<a href = "www.example.com">www.example.com</a>'))

=== modified file 'friends/tests/test_shortener.py'
--- friends/tests/test_shortener.py	2013-02-13 02:05:37 +0000
+++ friends/tests/test_shortener.py	2013-03-20 13:27:53 +0000
@@ -22,8 +22,6 @@
 
 import unittest
 
-from operator import getitem
-
 from friends.shorteners import isgd, ougd, linkeecom, lookup, tinyurlcom
 from friends.tests.mocks import FakeSoupMessage, mock
 

=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2013-03-08 02:31:15 +0000
+++ friends/tests/test_twitter.py	2013-03-20 13:27:53 +0000
@@ -26,22 +26,16 @@
 import unittest
 import shutil
 
-from gi.repository import GLib, Dee
+from gi.repository import GLib
 from urllib.error import HTTPError
 
 from friends.protocols.twitter import RateLimiter, Twitter
-from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock, mock
+from friends.tests.mocks import FakeAccount, FakeSoupMessage, LogMock
+from friends.tests.mocks import TestModel, mock
 from friends.utils.cache import JsonCache
-from friends.utils.model import COLUMN_TYPES
 from friends.errors import AuthorizationError
 
 
-# Create a test model that will not interfere with the user's environment.
-# We'll use this object as a mock of the real model.
-TestModel = Dee.SharedModel.new('com.canonical.Friends.TestSharedModel')
-TestModel.set_schema_full(COLUMN_TYPES)
-
-
 @mock.patch('friends.utils.http._soup', mock.Mock())
 @mock.patch('friends.utils.base.notify', mock.Mock())
 class TestTwitter(unittest.TestCase):
@@ -124,7 +118,6 @@
                 FakeSoupMessage('friends.tests.data', 'twitter-home.dat'))
     @mock.patch('friends.protocols.twitter.Twitter._login',
                 return_value=True)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_home(self, *mocks):
         self.account.access_token = 'access'
@@ -138,31 +131,32 @@
 
         # This test data was ripped directly from Twitter's API docs.
         expected = [
-            [[['twitter', '1234', '240558470661799936']],
+            ['twitter', 88, '240558470661799936',
              'messages', 'OAuth Dancer', '119476949', 'oauth_dancer', False,
              '2012-08-28T21:16:23Z', 'just another test',
              GLib.get_user_cache_dir() +
              '/friends/avatars/ded4ba3c00583ee511f399d0b2537731ca14c39d',
              'https://twitter.com/oauth_dancer/status/240558470661799936',
-             0.0, False, '', '', '', '', '', '',
+             0, False, '', '', '', '', '', '', '', 0.0, 0.0,
              ],
-            [[['twitter', '1234', '240556426106372096']],
+            ['twitter', 88, '240556426106372096',
              'messages', 'Raffi Krikorian', '8285392', 'raffi', False,
-             '2012-08-28T21:08:15Z', 'lecturing at the "analyzing big data ' +
-             'with twitter" class at @cal with @othman  http://t.co/bfj7zkDJ',
+             '2012-08-28T21:08:15Z', 'lecturing at the "analyzing big data '
+             'with twitter" class at @cal with @othman  '
+             '<a href="http://t.co/bfj7zkDJ">http://t.co/bfj7zkDJ</a>',
              GLib.get_user_cache_dir() +
              '/friends/avatars/0219effc03a3049a622476e6e001a4014f33dc31',
              'https://twitter.com/raffi/status/240556426106372096',
-             0.0, False, '', '', '', '', '', '',
+             0, False, '', '', '', '', '', '', '', 0.0, 0.0,
              ],
-            [[['twitter', '1234', '240539141056638977']],
+            ['twitter', 88, '240539141056638977',
              'messages', 'Taylor Singletary', '819797', 'episod', False,
              '2012-08-28T19:59:34Z',
              'You\'d be right more often if you thought you were wrong.',
              GLib.get_user_cache_dir() +
              '/friends/avatars/0c829cb2934ad76489be21ee5e103735d9b7b034',
              'https://twitter.com/episod/status/240539141056638977',
-             0.0, False, '', '', '', '', '', '',
+             0, False, '', '', '', '', '', '', '', 0.0, 0.0,
              ],
             ]
         for i, expected_row in enumerate(expected):
@@ -173,7 +167,6 @@
                 FakeSoupMessage('friends.tests.data', 'twitter-home.dat'))
     @mock.patch('friends.protocols.twitter.Twitter._login',
                 return_value=True)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_home_since_id(self, *mocks):
         self.account.access_token = 'access'
@@ -193,13 +186,11 @@
             'https://api.twitter.com/1.1/statuses/' +
             'home_timeline.json?count=50&since_id=240558470661799936')
 
-
     @mock.patch('friends.utils.base.Model', TestModel)
     @mock.patch('friends.utils.http.Soup.Message',
                 FakeSoupMessage('friends.tests.data', 'twitter-send.dat'))
     @mock.patch('friends.protocols.twitter.Twitter._login',
                 return_value=True)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_from_me(self, *mocks):
         self.account.access_token = 'access'
@@ -216,18 +207,17 @@
 
         # This test data was ripped directly from Twitter's API docs.
         expected_row = [
-            [['twitter', '1234', '240558470661799936']],
+            'twitter', 88, '240558470661799936',
             'messages', 'OAuth Dancer', '119476949', 'oauth_dancer', True,
             '2012-08-28T21:16:23Z', 'just another test',
             GLib.get_user_cache_dir() +
             '/friends/avatars/ded4ba3c00583ee511f399d0b2537731ca14c39d',
             'https://twitter.com/oauth_dancer/status/240558470661799936',
-            0.0, False, '', '', '', '', '', '',
+            0, False, '', '', '', '', '', '', '', 0.0, 0.0,
             ]
         self.assertEqual(list(TestModel.get_row(0)), expected_row)
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_home_url(self):
         get_url = self.protocol._get_url = mock.Mock(return_value=['tweet'])
@@ -240,7 +230,6 @@
             'https://api.twitter.com/1.1/statuses/home_timeline.json?count=50')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_mentions(self):
         get_url = self.protocol._get_url = mock.Mock(return_value=['tweet'])
@@ -254,7 +243,6 @@
             'mentions_timeline.json?count=50')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_user(self):
         get_url = self.protocol._get_url = mock.Mock(return_value=['tweet'])
@@ -267,7 +255,6 @@
         'https://api.twitter.com/1.1/statuses/user_timeline.json?screen_name=')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_list(self):
         get_url = self.protocol._get_url = mock.Mock(return_value=['tweet'])
@@ -280,7 +267,6 @@
         'https://api.twitter.com/1.1/lists/statuses.json?list_id=some_list_id')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_lists(self):
         get_url = self.protocol._get_url = mock.Mock(
@@ -294,7 +280,6 @@
             'https://api.twitter.com/1.1/lists/list.json')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_private(self):
         get_url = self.protocol._get_url = mock.Mock(return_value=['tweet'])
@@ -346,7 +331,6 @@
              ])
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_send_private(self):
         get_url = self.protocol._get_url = mock.Mock(return_value='tweet')
@@ -406,6 +390,44 @@
                         'tweet @pumpichank!',
                  in_reply_to_status_id='1234'))
 
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.http.Soup.Message',
+                FakeSoupMessage('friends.tests.data', 'twitter-home.dat'))
+    @mock.patch('friends.protocols.twitter.Twitter._login',
+                return_value=True)
+    @mock.patch('friends.utils.base._seen_ids', {})
+    def test_send_thread_prepend_nick(self, *mocks):
+        self.account.access_token = 'access'
+        self.account.secret_token = 'secret'
+        self.account.auth.parameters = dict(
+            ConsumerKey='key',
+            ConsumerSecret='secret')
+        self.assertEqual(0, TestModel.get_n_rows())
+        self.assertEqual(self.protocol.home(), 3)
+        self.assertEqual(3, TestModel.get_n_rows())
+
+        # If you forgot to @mention in your reply, we add it for you.
+        get = self.protocol._get_url = mock.Mock()
+        self.protocol._publish_tweet = mock.Mock()
+        self.protocol.send_thread(
+            '240556426106372096',
+            'Exciting and original response!')
+        get.assert_called_once_with(
+            'https://api.twitter.com/1.1/statuses/update.json',
+            dict(status='@raffi Exciting and original response!',
+                 in_reply_to_status_id='240556426106372096'))
+
+        # If you remembered the @mention, we won't duplicate it.
+        get.reset_mock()
+        self.protocol.send_thread(
+            '240556426106372096',
+            'You are the greatest, @raffi!')
+        get.assert_called_once_with(
+            'https://api.twitter.com/1.1/statuses/update.json',
+            dict(status='You are the greatest, @raffi!',
+                 in_reply_to_status_id='240556426106372096'))
+
+
     def test_delete(self):
         get_url = self.protocol._get_url = mock.Mock(return_value='tweet')
         publish = self.protocol._unpublish = mock.Mock()
@@ -466,7 +488,6 @@
             dict(id='1234'))
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_tag(self):
         get_url = self.protocol._get_url = mock.Mock(
@@ -486,7 +507,6 @@
             'https://api.twitter.com/1.1/search/tweets.json?q=%23yegbike')
 
     @mock.patch('friends.utils.base.Model', TestModel)
-    @mock.patch('friends.utils.base._seen_messages', {})
     @mock.patch('friends.utils.base._seen_ids', {})
     def test_search(self):
         get_url = self.protocol._get_url = mock.Mock(

=== modified file 'friends/utils/account.py'
--- friends/utils/account.py	2013-02-05 01:11:35 +0000
+++ friends/utils/account.py	2013-03-20 13:27:53 +0000
@@ -43,7 +43,6 @@
         # are added or deleted.
         manager = Accounts.Manager.new_for_service_type('microblogging')
         manager.connect('enabled-event', self._on_enabled_event)
-        manager.connect('account-deleted', self._on_account_deleted)
         # Add all the currently known accounts.
         for account_service in manager.get_enabled_account_services():
             self._add_new_account(account_service)
@@ -63,25 +62,6 @@
             account = self._add_new_account(account_service)
             if account is not None:
                 account.protocol('receive')
-        else:
-            # If an account has been disabled in UOA, we should remove
-            # it's messages from the SharedModel.
-            self._unpublish_entire_account(account_id)
-
-    def _on_account_deleted(self, manager, account_id):
-        account_service = self._get_service(manager, account_id)
-        if account_service is not None:
-            log.debug('Deleting account {}'.format(account_id))
-            self._unpublish_entire_account(account_id)
-        else:
-            log.error('Tried to delete invalid account: {}'.format(account_id))
-
-    def _unpublish_entire_account(self, account_id):
-        """Delete all the account's messages from the SharedModel."""
-        log.debug('Deleting all messages from {}.'.format(account_id))
-        account = self._accounts.pop(str(account_id), None)
-        if account is not None:
-            account.protocol._unpublish_all()
 
     def _add_new_account(self, account_service):
         try:
@@ -89,14 +69,14 @@
         except UnsupportedProtocolError as error:
             log.info(error)
         else:
-            self._accounts[str(new_account.id)] = new_account
+            self._accounts[new_account.id] = new_account
             return new_account
 
     def get_all(self):
         return self._accounts.values()
 
     def get(self, account_id, default=None):
-        return self._accounts.get(str(account_id), default)
+        return self._accounts.get(int(account_id), default)
 
 
 class AuthData:
@@ -132,12 +112,12 @@
         self.auth = AuthData(account_service.get_auth_data())
         # The provider in libaccounts should match the name of our protocol.
         account = account_service.get_account()
+        self.id = account.id
         self.protocol_name = account.get_provider_name()
         protocol_class = protocol_manager.protocols.get(self.protocol_name)
         if protocol_class is None:
             raise UnsupportedProtocolError(self.protocol_name)
         self.protocol = protocol_class(self)
-        self.id = str(account.id)
         # Connect responders to changes in the account information.
         account_service.connect('changed', self._on_account_changed, account)
         self._on_account_changed(account_service, account)

=== modified file 'friends/utils/authentication.py'
--- friends/utils/authentication.py	2013-02-05 01:11:35 +0000
+++ friends/utils/authentication.py	2013-03-20 13:27:53 +0000
@@ -66,5 +66,10 @@
     def _login_cb(self, session, reply, error, user_data):
         self._reply = reply
         if error:
-            raise AuthorizationError(self.account.id, error.message)
+            exception = AuthorizationError(self.account.id, error.message)
+            # Mardy says this error can happen during normal operation.
+            if error.message.endswith('userActionFinished error: 10'):
+                log.error(str(exception))
+            else:
+                raise exception
         log.debug('Login completed')

=== modified file 'friends/utils/base.py'
--- friends/utils/base.py	2013-03-08 02:31:15 +0000
+++ friends/utils/base.py	2013-03-20 13:27:53 +0000
@@ -25,7 +25,6 @@
 
 import re
 import time
-import string
 import logging
 import threading
 
@@ -43,23 +42,49 @@
 
 
 STUB = lambda *ignore, **kwignore: None
-IGNORED = string.punctuation + string.whitespace
-SCHEME_RE = re.compile('http[s]?://|friends:/', re.IGNORECASE)
-EMPTY_STRING = ''
 COMMA_SPACE = ', '
 AVATAR_IDX = COLUMN_INDICES['icon_uri']
 FROM_ME_IDX = COLUMN_INDICES['from_me']
 STREAM_IDX = COLUMN_INDICES['stream']
 SENDER_IDX = COLUMN_INDICES['sender']
 MESSAGE_IDX = COLUMN_INDICES['message']
-IDS_IDX = COLUMN_INDICES['message_ids']
+ID_IDX = COLUMN_INDICES['message_id']
+ACCT_IDX = COLUMN_INDICES['account_id']
 TIME_IDX = COLUMN_INDICES['timestamp']
 
-
-# This is a mapping from Dee.SharedModel row keys to the DeeModelIters
-# representing the rows matching those keys.  It is used for quickly finding
-# duplicates when we want to insert new rows into the model.
-_seen_messages = {}
+# See friends/tests/test_protocols.py for further documentation
+LINKIFY_REGEX = re.compile(
+    r"""
+    # Do not match if URL is preceded by '"' or '>'
+    # This is used to prevent duplication of linkification.
+    (?<![\"\>])
+    # Record everything that we're about to match.
+    (
+      # URLs can start with 'http://', 'https://', 'ftp://', or 'www.'
+      (?:(?:https?|ftp)://|www\.)
+      # Match many non-whitespace characters, but not greedily.
+      (?:\S+?)
+    # Stop recording the match.
+    )
+    # This section will peek ahead (without matching) in order to
+    # determine precisely where the URL actually *ends*.
+    (?=
+      # Do not include any trailing period, comma, exclamation mark,
+      # question mark, or closing parentheses, if any are present.
+      [.,!?\)]*
+      # With "trailing" defined as immediately preceding the first
+      # space, or end-of-string.
+      (?:\s|$)
+      # But abort the whole thing if the URL ends with '</a>',
+      # again to prevent duplication of linkification.
+      (?!</a>)
+    )""",
+    flags=re.VERBOSE).sub
+
+
+# This is a mapping from message_ids to DeeModel row index ints. It is
+# used for quickly and easily preventing the same message from being
+# published multiple times by mistake.
 _seen_ids = {}
 
 
@@ -67,9 +92,6 @@
 # publishing new data into the SharedModel.
 _publish_lock = threading.Lock()
 
-# Avoid race condition during shut-down
-_exit_lock = threading.Lock()
-
 
 log = logging.getLogger(__name__)
 
@@ -92,56 +114,27 @@
     return method
 
 
-def _make_key(row):
-    """Return a unique key for a row in the model.
-
-    This is used for fuzzy comparisons with messages that are already in the
-    model.  We don't want duplicate messages to show up in the stream of
-    messages that are visible to the user.  But different social media sites
-    attach different semantic meanings to different punctuation marks, so we
-    want to ignore those for the sake of determining whether one message is
-    actually identical to another or not.  Thus, we need to strip out this
-    punctuation for the sake of comparing the strings.  For example:
-
-    Fred uses Friends to post identical messages on Twitter and Google+
-    (pretend that we support G+ for a moment).  Fred writes 'Hey jimbob, been
-    to http://example.com lately?', and this message might show up on Twitter
-    like 'Hey @jimbob, been to example.com lately?', but it might show up on
-    G+ like 'Hey +jimbob, been to http://example.com lately?'.  So we need to
-    strip out all the possibly different bits in order to identify that these
-    messages are the same for our purposes.  In both of these cases, the
-    string is converted into 'Heyjimbobbeentoexamplecomlately' and then they
-    compare equally, so we've identified a duplicate message.
-    """
-    # Given a 'row' of data, the sender and message fields are concatenated
-    # together to form the raw key.  Then we strip out details such as url
-    # schemes, punctuation, and whitespace, that allow for the fuzzy matching.
-    key = SCHEME_RE.sub('', row[SENDER_IDX] + row[MESSAGE_IDX])
-    # Now remove all punctuation and whitespace.
-    return EMPTY_STRING.join([char for char in key if char not in IGNORED])
-
-
 def initialize_caches():
-    """Populate _seen_ids and _seen_messages with Model data.
+    """Populate _seen_ids with Model data.
 
     Our Dee.SharedModel persists across instances, so we need to
-    populate these caches at launch.
+    populate this cache at launch.
     """
-    for i in range(Model.get_n_rows()):
-        row_iter = Model.get_iter_at_row(i)
-        row = Model.get_row(row_iter)
-        _seen_messages[_make_key(row)] = i
-        for triple in row[IDS_IDX]:
-            _seen_ids[tuple(triple)] = i
-    log.debug(
-        '_seen_ids: {}, _seen_messages: {}'.format(
-            len(_seen_ids), len(_seen_messages)))
+    # Don't create a new dict; we need to keep the same dict object in
+    # memory since it gets imported into a few different places that
+    # would not get the updated reference to the new dict.
+    _seen_ids.clear()
+    _seen_ids.update({row[ID_IDX]: i for i, row in enumerate(Model)})
+    log.debug('_seen_ids: {}'.format(len(_seen_ids)))
+
+
+def linkify_string(string):
+    """Finds all URLs in a string and turns them into HTML links."""
+    return LINKIFY_REGEX(r'<a href="\1">\1</a>', string)
 
 
 class _OperationThread(threading.Thread):
     """Manage async callbacks, and log subthread exceptions."""
-    # main.py will replace this with a reference to the mainloop.quit method
-    shutdown = lambda: log.error('Failed to exit friends-dispatcher main loop')
 
     def __init__(self, *args, id=None, success=STUB, failure=STUB, **kws):
         self._id = id
@@ -173,13 +166,6 @@
         log.debug('{} has completed in {:.2f}s, thread exiting.'.format(
                 self._id, elapsed))
 
-        # If this is the last thread to exit, then the refresh is
-        # completed and we should save the model, and then exit.
-        with _exit_lock:
-            if threading.activeCount() < 3:
-                persist_model()
-                GLib.idle_add(self.shutdown)
-
 
 class Base:
     """Parent class for any protocol plugin such as Facebook or Twitter.
@@ -213,6 +199,8 @@
 
     def __init__(self, account):
         self._account = account
+        self._Name = self.__class__.__name__
+        self._name = self._Name.lower()
 
     def _whoami(self, result):
         """Use OAuth login results to identify the authenticating user.
@@ -240,7 +228,7 @@
         """
         raise NotImplementedError(
             '{} protocol has no _whoami() method.'.format(
-                self.__class__.__name__))
+                self._Name))
 
     def receive(self):
         """Poll the social network for new messages.
@@ -279,7 +267,7 @@
         """
         raise NotImplementedError(
             '{} protocol has no receive() method.'.format(
-                self.__class__.__name__))
+                self._Name))
 
     def __call__(self, operation, *args, success=STUB, failure=STUB, **kwargs):
         """Call an operation, i.e. a method, with arguments in a sub-thread.
@@ -311,7 +299,7 @@
             raise NotImplementedError(operation)
         method = getattr(self, operation)
         _OperationThread(
-            id='{}.{}'.format(self.__class__.__name__, operation),
+            id='{}.{}'.format(self._Name, operation),
             target=method,
             success=success,
             failure=failure,
@@ -323,7 +311,7 @@
         """Return the number of rows in the Dee.SharedModel."""
         return len(Model)
 
-    def _publish(self, message_id, **kwargs):
+    def _publish(self, **kwargs):
         """Publish fresh data into the model, ignoring duplicates.
 
         This method inserts a new full row into the Dee.SharedModel
@@ -352,35 +340,31 @@
             present.  Otherwise, False is returned if the message could not be
             appended.
         """
-        # Initialize the row of arguments to contain the message_ids value.
-        # The column value is a list of lists (see friends/utils/model.py for
-        # details), and because the arguments are themselves a list, this gets
-        # initialized as a triply-nested list.
-        triple = [self.__class__.__name__.lower(),
-                  self._account.id,
-                  message_id]
-        args = [[triple]]
-        # Now iterate through all the column names listed in the SCHEMA,
-        # except for the first, since we just composed its value in the
-        # preceding line.  Pop matching column values from the kwargs, in the
-        # order which they appear in the SCHEMA.  If any are left over at the
-        # end of this, raise a TypeError indicating the unexpected column
-        # names.
-        #
-        # Missing column values default to the empty string.
-        for column_name, column_type in SCHEMA[1:]:
+        # These bits don't need to be set by the caller; we can infer them.
+        kwargs.update(
+            dict(
+                protocol=self._name,
+                account_id=self._account.id
+                )
+            )
+        # linkify the message
+        kwargs['message'] = linkify_string(kwargs.get('message', ''))
+        args = []
+        # Now iterate through all the column names listed in the
+        # SCHEMA, and pop matching column values from the kwargs, in
+        # the order which they appear in the SCHEMA. If any are left
+        # over at the end of this, raise a TypeError indicating the
+        # unexpected column names.
+        for column_name, column_type in SCHEMA:
             args.append(kwargs.pop(column_name, DEFAULTS[column_type]))
         if len(kwargs) > 0:
             raise TypeError('Unexpected keyword arguments: {}'.format(
                 COMMA_SPACE.join(sorted(kwargs))))
         with _publish_lock:
-            # Don't let duplicate messages into the model, but do record the
-            # unique message ids of each duplicate message.
-            key = _make_key(args)
-            row_idx = _seen_messages.get(key)
-            if row_idx is None:
-                # We haven't seen this message before.
-                _seen_messages[key] = Model.get_position(Model.append(*args))
+            message_id = args[ID_IDX]
+            # Don't let duplicate messages into the model
+            if message_id not in _seen_ids:
+                _seen_ids[message_id] = Model.get_position(Model.append(*args))
                 # I think it's safe not to notify the user about
                 # messages that they sent themselves...
                 if not args[FROM_ME_IDX] and self._do_notify(args[STREAM_IDX]):
@@ -389,25 +373,7 @@
                         args[MESSAGE_IDX],
                         args[AVATAR_IDX],
                         )
-            else:
-                # We have seen this before, so append to the matching column's
-                # message_ids list, this message's id.
-                row = Model.get_row(Model.get_iter_at_row(row_idx))
-                # Remember that row[IDS] is the nested list-of-lists of
-                # message_ids.  args[IDS] is the nested list-of-lists for the
-                # message that we're publishing.  The outer list of the latter
-                # will always be of size 1.  We want to take the inner list
-                # from args and append it to the list-of-lists (i.e.
-                # message_ids) of the row already in the model.  To make sure
-                # the model gets updated, we need to insert into the row, thus
-                # it's best to concatenate the two lists together and store it
-                # back into the column.
-                if triple not in row[IDS_IDX]:
-                    row[IDS_IDX] = row[IDS_IDX] + args[IDS_IDX]
-            # Tuple-ize triple because lists, being mutable, cannot be used as
-            # dictionary keys.
-            _seen_ids[tuple(triple)] = _seen_messages.get(key)
-            return key in _seen_messages
+            return message_id in _seen_ids
 
     def _unpublish(self, message_id):
         """Remove message_id from the Dee.SharedModel.
@@ -416,45 +382,24 @@
             published.
         :type message_id: string
         """
-        triple = (self.__class__.__name__.lower(),
-                  self._account.id,
-                  message_id)
-        log.debug('Unpublishing {}!'.format(triple))
+        log.debug('Unpublishing {}!'.format(message_id))
 
-        row_idx = _seen_ids.pop(triple, None)
+        row_idx = _seen_ids.pop(message_id, None)
         if row_idx is None:
             raise FriendsError('Tried to delete an invalid message id.')
 
-        row_iter = Model.get_iter_at_row(row_idx)
-        row = Model.get_row(row_iter)
-
-        if len(row[IDS_IDX]) == 1:
-            # Message only exists on one protocol, delete it
-            del _seen_messages[_make_key(row)]
-            Model.remove(row_iter)
-            # Shift our cached indexes up one, when one gets deleted.
-            for key, value in _seen_ids.items():
-                if value > row_idx:
-                    _seen_ids[key] = value - 1
-        else:
-            # Message exists on other protocols too, only drop id
-            row[IDS_IDX] = [ids for ids
-                            in row[IDS_IDX]
-                            if ids[-1] != message_id]
-
-    def _unpublish_all(self):
-        """Remove all of this account's messages from the Model.
-
-        Saves the Model to disk after it is done purging rows."""
-        for triple in _seen_ids.copy():
-            if self._account.id in triple:
-                self._unpublish(triple[-1])
-        persist_model()
+        Model.remove(Model.get_iter_at_row(row_idx))
+
+        # Shift our cached indexes up one, when one gets deleted.
+        for key, value in _seen_ids.items():
+            if value > row_idx:
+                _seen_ids[key] = value - 1
 
     def _get_access_token(self):
         """Return an access token, logging in if necessary.
 
-        :return: The access_token, if we are successfully logged in."""
+        :return: The access_token, if we are successfully logged in.
+        """
         if self._account.access_token is None:
             self._login()
 
@@ -512,15 +457,14 @@
         subthread needs to log in. You do not have to worry about
         subthread race conditions inside this method.
         """
-        protocol = self.__class__.__name__
         log.debug('{} to {}'.format(
-                'Re-authenticating' if old_token else 'Logging in', protocol))
+                'Re-authenticating' if old_token else 'Logging in', self._Name))
 
         result = Authentication(self._account).login()
 
         self._account.access_token = result.get('AccessToken')
         self._whoami(result)
-        log.debug('{} UID: {}'.format(protocol, self._account.user_id))
+        log.debug('{} UID: {}'.format(self._Name, self._account.user_id))
 
     def _get_oauth_headers(self, method, url, data=None, headers=None):
         """Basic wrapper around oauthlib that we use for Twitter and Flickr."""
@@ -559,6 +503,16 @@
             message = None
         raise FriendsError(message or str(error))
 
+    def _fetch_cell(self, message_id, column_name):
+        """Find a column value associated with a specific message_id."""
+        row_id = _seen_ids.get(message_id)
+        col_idx = COLUMN_INDICES.get(column_name)
+        if None not in (row_id, col_idx):
+            row = Model.get_row(row_id)
+            return row[col_idx]
+        else:
+            raise FriendsError('Value could not be found.')
+
     def _new_book_client(self, source):
         client = EBook.BookClient.new(source)
         client.open_sync(False, None)

=== modified file 'friends/utils/model.py'
--- friends/utils/model.py	2013-02-05 01:11:35 +0000
+++ friends/utils/model.py	2013-03-20 13:27:53 +0000
@@ -41,26 +41,11 @@
 log = logging.getLogger(__name__)
 
 
-# Most of this schema is very straightforward, but the 'message_ids' column
-# needs a bit of explanation:
-#
-# It is a two-dimensional array (ie, an array of arrays). Each inner
-# array contains three elements: the name of the protocol
-# (introspected from the name of the class that implements the
-# protocol), the account_id as a string (like '6' or '3'), followed by
-# the message_id for that particular service.
-#
-# Then, there will be one of these triples present for every service on which
-# the message exists.  So for example, if the user posts the same message to
-# both facebook and twitter, that message will appear as a single row in this
-# schema, and the 'message_ids' column will look something like this:
-#
-# [
-#     ['facebook', '2', '12345'],
-#     ['twitter', '3', '987654'],
-# ]
+# DO NOT EDIT THIS WITHOUT ADJUSTING service.vala IN LOCKSTEP
 SCHEMA = (
-    ('message_ids',    'aas'),
+    ('protocol',       's'), # Same as UOA 'provider_name'
+    ('account_id',     't'), # Same as UOA account id
+    ('message_id',     's'),
     ('stream',         's'),
     ('sender',         's'),
     ('sender_id',      's'),
@@ -70,7 +55,7 @@
     ('message',        's'),
     ('icon_uri',       's'),
     ('url',            's'),
-    ('likes',          'd'),
+    ('likes',          't'),
     ('liked',          'b'),
     ('link_picture',   's'),
     ('link_name',      's'),
@@ -78,6 +63,9 @@
     ('link_desc',      's'),
     ('link_caption',   's'),
     ('link_icon',      's'),
+    ('location',       's'),
+    ('latitude',       'd'),
+    ('longitude',      'd'),
     )
 
 
@@ -91,6 +79,7 @@
     'b': False,
     's': '',
     'd': 0,
+    't': 0,
     }
 
 

=== modified file 'service/configure.ac'
--- service/configure.ac	2013-02-07 23:36:14 +0000
+++ service/configure.ac	2013-03-20 13:27:53 +0000
@@ -18,6 +18,7 @@
 
 DEE_REQUIRED=1.0.0
 PKG_CHECK_MODULES(BASE,
+                  libaccounts-glib
                   gio-2.0
                   dee-1.0 >= $DEE_REQUIRED)
 

=== modified file 'service/src/Makefile.am'
--- service/src/Makefile.am	2013-02-04 19:42:37 +0000
+++ service/src/Makefile.am	2013-03-20 13:27:53 +0000
@@ -2,14 +2,15 @@
 	friends-service
 
 INCLUDES = \
-	$(BASE_CFLAGS) 
+	$(BASE_CFLAGS)
 
 VALAFLAGS = \
+	--pkg accounts \
 	--pkg dee-1.0 \
 	--pkg gio-2.0
 
 friends_service_LDADD = \
-	$(BASE_LIBS) 
+	$(BASE_LIBS)
 
 friends_service_SOURCES = \
 	service.vala

=== modified file 'service/src/service.vala'
--- service/src/service.vala	2013-02-20 13:24:44 +0000
+++ service/src/service.vala	2013-03-20 13:27:53 +0000
@@ -16,6 +16,7 @@
  * Authored by Ken VanDine <[e-mail]>
  */
 
+using Ag;
 
 [DBus (name = "com.canonical.Friends.Dispatcher")]
 private interface Dispatcher : GLib.Object {
@@ -35,11 +36,34 @@
     private Dee.Model model;
     private Dee.SharedModel shared_model;
     private unowned Dee.ResourceManager resources;
+    private Ag.Manager acct_manager;
     private Dispatcher dispatcher;
     public int interval { get; set; }
 
     public Master ()
     {
+        acct_manager = new Ag.Manager.for_service_type ("microblogging");
+        acct_manager.account_deleted.connect ((manager, account_id) => {
+                debug ("Account %u deleted from UOA, purging...", account_id);
+                uint purged = 0;
+                uint rows = model.get_n_rows ();
+                // Destructively iterate over the Model from back to
+                // front; I know "i < rows" looks kinda goofy here,
+                // but what's happening is that i is unsigned, so once
+                // it hits 0, i-- will overflow to a very large
+                // number, and then "i < rows" will fail, stopping the
+                // iteration at index 0.
+                for (uint i = rows - 1; i < rows; i--) {
+                    var itr = model.get_iter_at_row (i);
+                    if (model.get_uint64 (itr, 1) == account_id) {
+                        model.remove (itr);
+                        purged++;
+                    }
+                }
+                debug ("Purged %u rows.", purged);
+            }
+        );
+
         resources = Dee.ResourceManager.get_default ();
         model = new Dee.SequenceModel ();
         Dee.SequenceModel? _m = null;
@@ -50,24 +74,29 @@
             debug ("Failed to load model from resource manager: %s", e.message);
         }
 
-        string[] SCHEMA = {"aas",
-                           "s",
-                           "s",
-                           "s",
-                           "s",
-                           "b",
+        string[] SCHEMA = {"s",
+                           "t",
+                           "s",
+                           "s",
+                           "s",
+                           "s",
+                           "s",
+                           "b",
+                           "s",
+                           "s",
+                           "s",
+                           "s",
+                           "t",
+                           "b",
+                           "s",
+                           "s",
+                           "s",
                            "s",
                            "s",
                            "s",
                            "s",
                            "d",
-                           "b",
-                           "s",
-                           "s",
-                           "s",
-                           "s",
-                           "s",
-                           "s"};
+                           "d"};
 
         bool schemaReset = false;
 
@@ -77,7 +106,7 @@
             // Compare columns from cached model's schema
             string[] _SCHEMA = _m.get_schema ();
             if (_SCHEMA.length != SCHEMA.length)
-                schemaReset = true; 
+                schemaReset = true;
             else
             {
                 for (int i=0; i < _SCHEMA.length;i++ )
@@ -87,7 +116,6 @@
                         debug ("SCHEMA MISMATCH");
                         schemaReset = true;
                     }
-                  
                 }
             }
             if (!schemaReset)

=== modified file 'setup.py'
--- setup.py	2013-02-05 01:11:35 +0000
+++ setup.py	2013-03-20 13:27:53 +0000
@@ -29,6 +29,7 @@
     include_package_data=True,
     package_data = {
         'friends.service.templates': ['*.service.in'],
+        'friends.tests.data': ['*.dat'],
         },
     data_files = [
         ('/usr/share/glib-2.0/schemas',

=== modified file 'tools/debug_live.py'
--- tools/debug_live.py	2013-02-19 09:27:53 +0000
+++ tools/debug_live.py	2013-03-20 13:27:53 +0000
@@ -59,7 +59,7 @@
     Model.connect('row-added', row_added)
 
     for account in a._accounts.values():
-        if account.protocol.__class__.__name__.lower() == protocol.lower():
+        if account.protocol._name == protocol.lower():
             found = True
             account.protocol(*args)