Merge lp:~robru/friends/avatar-cache into lp:friends

[Robert Bruce Park]

Move avatar cache under /tmp

Stop caching avatar URLs locally; change icon_uri model schema to contain the original URL rather than the local cache. Delete all avatar cache expiry logic. Move the avatar cache under /tmp so that the system will clear it at each boot.

How to test this change:

1. build a package from this branch and install it.
2. delete ~/.local/share/resources/com.canonical.Friends.Streams
3. start friends-app
4. ensure that friends-app scrolls very smoothly through the list of tweets
5. watch out for notifications, ensure that the avatar icon appears in them. (maybe set com.canonical.friends.notifications to 'all' so that you're more likely to see a notification when you do a refresh).

Oh, and of course, run 'make check' ;-)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:208
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robru/friends/avatar-cache/+merge/170206/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/friends-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/46/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks great and works well, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'friends/protocols/facebook.py'
--- friends/protocols/facebook.py	2013-06-17 21:01:36 +0000
+++ friends/protocols/facebook.py	2013-06-18 22:10:33 +0000
@@ -24,7 +24,6 @@
 import time
 import logging
 
-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
@@ -99,8 +98,8 @@
             args['sender_id'] = sender_id = from_record.get('id', '')
             args['url'] = STORY_PERMALINK.format(
                 id=sender_id, post_id=post_id)
-            args['icon_uri'] = Avatar.get_image(
-                API_BASE.format(id=sender_id) + '/picture?width=840&height=840')
+            args['icon_uri'] = (API_BASE.format(id=sender_id) +
+                                '/picture?width=840&height=840')
             args['sender_nick'] = from_record.get('name', '')
             args['from_me'] = (sender_id == self._account.user_id)
 
@@ -322,9 +321,8 @@
                 sender_nick=self._account.user_name,
                 timestamp=iso8601utc(int(time.time())),
                 url=destination_url,
-                icon_uri=Avatar.get_image(
-                    API_BASE.format(id=self._account.user_id) +
-                    '/picture?type=large'))
+                icon_uri=(API_BASE.format(id=self._account.user_id) +
+                          '/picture?type=large'))
             return destination_url
         else:
             raise FriendsError(str(response))
 
=== modified file 'friends/protocols/flickr.py'
--- friends/protocols/flickr.py	2013-03-25 23:37:08 +0000
+++ friends/protocols/flickr.py	2013-06-18 22:10:33 +0000
@@ -25,7 +25,6 @@
 import time
 import logging
 
-from friends.utils.avatar import Avatar
 from friends.utils.base import Base, feature
 from friends.utils.http import Downloader, Uploader
 from friends.utils.time import iso8601utc, parsetime
@@ -93,13 +92,11 @@
         iconfarm = person.get('iconfarm')
         iconserver = person.get('iconserver')
         if None in (iconfarm, iconserver):
-            return Avatar.get_image(
-                'http://www.flickr.com/images/buddyicon.gif')
-        avatar = BUDDY_ICON_URL.format(
+            return 'http://www.flickr.com/images/buddyicon.gif'
+        return BUDDY_ICON_URL.format(
             farm=iconfarm,
             server=iconserver,
             nsid=nsid)
-        return Avatar.get_image(avatar)
 
 # http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html
     @feature
@@ -135,8 +132,8 @@
             url = ''
             from_me = (ownername == username)
             if None not in (icon_farm, icon_server, owner):
-                icon_uri = Avatar.get_image(BUDDY_ICON_URL.format(
-                    farm=icon_farm, server=icon_server, nsid=owner))
+                icon_uri = BUDDY_ICON_URL.format(
+                    farm=icon_farm, server=icon_server, nsid=owner)
                 url = IMAGE_PAGE_URL.format(owner=owner, photo=photo_id)
 
             # Calculate the ISO 8601 UTC time string.
 
=== modified file 'friends/protocols/foursquare.py'
--- friends/protocols/foursquare.py	2013-03-12 04:04:07 +0000
+++ friends/protocols/foursquare.py	2013-06-18 22:10:33 +0000
@@ -22,7 +22,6 @@
 
 import logging
 
-from friends.utils.avatar import Avatar
 from friends.utils.base import Base, feature
 from friends.utils.http import Downloader
 from friends.utils.time import iso8601utc
@@ -81,7 +80,6 @@
         for checkin in checkins:
             user = checkin.get('user', {})
             avatar = user.get('photo', {})
-            avatar_url = '{prefix}100x100{suffix}'.format(**avatar)
             checkin_id = checkin.get('id', '')
             tz_offset = checkin.get('timeZoneOffset', 0)
             epoch = checkin.get('createdAt', 0)
@@ -95,7 +93,7 @@
                 timestamp=iso8601utc(epoch, tz_offset),
                 message=checkin.get('shout', ''),
                 likes=checkin.get('likes', {}).get('count', 0),
-                icon_uri=Avatar.get_image(avatar_url),
+                icon_uri='{prefix}100x100{suffix}'.format(**avatar),
                 url=venue.get('canonicalUrl', ''),
                 location=venue.get('name', ''),
                 latitude=location.get('lat', 0.0),
 
=== modified file 'friends/protocols/twitter.py'
--- friends/protocols/twitter.py	2013-04-17 06:13:49 +0000
+++ friends/protocols/twitter.py	2013-06-18 22:10:33 +0000
@@ -27,7 +27,6 @@
 
 from urllib.parse import quote
 
-from friends.utils.avatar import Avatar
 from friends.utils.base import Base, feature
 from friends.utils.cache import JsonCache
 from friends.utils.http import BaseRateLimiter, Downloader
@@ -142,8 +141,7 @@
             sender_id=str(user.get('id', '')),
             sender_nick=screen_name,
             from_me=(screen_name == self._account.user_name),
-            icon_uri=Avatar.get_image(
-                avatar_url.replace('_normal.', '.')),
+            icon_uri=avatar_url.replace('_normal.', '.'),
             liked=tweet.get('favorited', False),
             url=permalink,
             )
 
=== modified file 'friends/service/dispatcher.py'
--- friends/service/dispatcher.py	2013-04-02 21:54:24 +0000
+++ friends/service/dispatcher.py	2013-06-18 22:10:33 +0000
@@ -30,7 +30,6 @@
 from gi.repository import GLib
 from contextlib import ContextDecorator
 
-from friends.utils.avatar import Avatar
 from friends.utils.account import find_accounts
 from friends.utils.manager import protocol_manager
 from friends.utils.menus import MenuManager
@@ -347,11 +346,3 @@
         if not self.settings.get_boolean('shorten-urls'):
             return message
         return Short(service_name).sub(message)
-
-    @exit_after_idle
-    @dbus.service.method(DBUS_INTERFACE)
-    def ExpireAvatars(self):
-        pass
-        # Disabled because we don't currently have a way of re-fetching
-        # expired avatars if they're needed again later.
-        # Avatar.expire_old_avatars()
 
=== modified file 'friends/service/mock_service.py'
--- friends/service/mock_service.py	2013-03-13 04:36:33 +0000
+++ friends/service/mock_service.py	2013-06-18 22:10:33 +0000
@@ -95,7 +95,3 @@
     @dbus.service.method(DBUS_INTERFACE, in_signature='s', out_signature='s')
     def URLShorten(self, url):
         return str(len(url))
-
-    @dbus.service.method(DBUS_INTERFACE)
-    def ExpireAvatars(self):
-        pass
 
=== modified file 'friends/tests/test_avatars.py'
--- friends/tests/test_avatars.py	2013-02-28 19:10:20 +0000
+++ friends/tests/test_avatars.py	2013-06-18 22:10:33 +0000
@@ -130,32 +130,3 @@
             # This is the PNG file format magic number, living in the first 8
             # bytes of the file.
             self.assertEqual(raw.read(8), bytes.fromhex('89504E470D0A1A0A'))
-
-    def test_cache_expiration(self):
-        # Cache files which are more than 4 weeks old get expired.
-        #
-        # Start by copying two copies of ubuntu.png to the temporary cache
-        # dir.  Fiddle with their mtimes. so that one is just younger than 4
-        # weeks old and one is just older than 4 weeks old.  Run the cache
-        # eviction method and ensure that the young one is retained while the
-        # old one is removed.
-        with mock.patch('friends.utils.avatar.CACHE_DIR',
-                        self._avatar_cache) as cache_dir:
-            os.makedirs(cache_dir)
-            src = resource_filename('friends.tests.data', 'ubuntu.png')
-            aaa = os.path.join(cache_dir, 'aaa')
-            shutil.copyfile(src, aaa)
-            bbb = os.path.join(cache_dir, 'bbb')
-            shutil.copyfile(src, bbb)
-            # Leave the atime unchanged.
-            four_weeks_ago = date.today() - timedelta(weeks=4)
-            young = four_weeks_ago + timedelta(days=1)
-            old = four_weeks_ago - timedelta(days=1)
-            # aaa will be young enough to keep (i.e. 4 weeks less one day ago)
-            os.utime(aaa,
-                     (os.stat(aaa).st_atime, time.mktime(young.timetuple())))
-            # bbb will be too old to keep (i.e. 4 weeks plus one day ago)
-            os.utime(bbb,
-                     (os.stat(bbb).st_atime, time.mktime(old.timetuple())))
-            Avatar.expire_old_avatars()
-            self.assertEqual(os.listdir(cache_dir), ['aaa'])
 
=== modified file 'friends/tests/test_facebook.py'
--- friends/tests/test_facebook.py	2013-06-11 19:58:29 +0000
+++ friends/tests/test_facebook.py	2013-06-18 22:10:33 +0000
@@ -129,8 +129,7 @@
             '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://graph.facebook.com/56789/picture?width=840&height=840',
             'https://www.facebook.com/56789/posts/postid1',
             1,
             False,
@@ -155,8 +154,7 @@
             False,
             '2013-03-12T23:29:45Z',
             'don\'t know how',
-            GLib.get_user_cache_dir() +
-            '/friends/avatars/9b9379ccc7948e4804dff7914bfa4c6de3974df5',
+            'https://graph.facebook.com/234/picture?width=840&height=840',
             'https://www.facebook.com/234/posts/commentid2',
             0,
             False,
@@ -186,8 +184,7 @@
             '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://graph.facebook.com/161247843901324/picture?width=840&height=840',
             'https://www.facebook.com/161247843901324/posts/629147610444676',
             84,
             False,
@@ -213,8 +210,7 @@
             False,
             '2013-03-15T19:57:14Z',
             'Guy Frenchie did some things with some stuff.',
-            GLib.get_user_cache_dir() +
-            '/friends/avatars/3f5e276af0c43f6411d931b829123825ede1968e',
+            'https://graph.facebook.com/1244414/picture?width=840&height=840',
             'https://www.facebook.com/1244414/posts/100085049977',
             3,
             False,
@@ -370,8 +366,7 @@
             timestamp='2012-11-06T13:49:08Z',
             sender_id=None,
             from_me=True,
-            icon_uri=GLib.get_user_cache_dir() +
-            '/friends/avatars/d49d72a384d50adf7c736ba27ca55bfa9fa5782d',
+            icon_uri='https://graph.facebook.com/None/picture?type=large',
             message='This is Ubuntu!',
             message_id='234125',
             sender=None)
 
=== modified file 'friends/tests/test_flickr.py'
--- friends/tests/test_flickr.py	2013-03-25 23:37:08 +0000
+++ friends/tests/test_flickr.py	2013-06-18 22:10:33 +0000
@@ -22,8 +22,6 @@
 
 import unittest
 
-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
@@ -176,8 +174,7 @@
              True,
              '2013-03-12T19:51:42Z',
              'Chocolate chai #yegcoffee',
-             GLib.get_user_cache_dir() +
-             '/friends/avatars/7b30ff0140dd9b80f2b1782a2802c3ce785fa0ce',
+             'http://farm1.static.flickr.com/93/buddyicons/[e-mail]',
              'http://www.flickr.com/photos/47303164@N00/8552892154',
              0,
              False,
@@ -204,8 +201,7 @@
              True,
              '2013-03-12T13:54:10Z',
              'St. Michael - The Archangel',
-             GLib.get_user_cache_dir() +
-             '/friends/avatars/cae2939354a33fea5f008df91bb8e25920be5dc3',
+             'http://farm3.static.flickr.com/2047/buddyicons/[e-mail]',
              'http://www.flickr.com/photos/27204141@N05/8550829193',
              0,
              False,
 
=== modified file 'friends/tests/test_foursquare.py'
--- friends/tests/test_foursquare.py	2013-03-21 21:49:26 +0000
+++ friends/tests/test_foursquare.py	2013-06-18 22:10:33 +0000
@@ -83,8 +83,6 @@
                 FakeSoupMessage('friends.tests.data', 'foursquare-full.dat'))
     @mock.patch('friends.protocols.foursquare.FourSquare._login',
                 return_value=True)
-    @mock.patch('friends.protocols.foursquare.Avatar.get_image',
-                return_value='~/.cache/friends/avatar/hash')
     def test_receive(self, *mocks):
         self.account.access_token = 'tokeny goodness'
         self.assertEqual(0, TestModel.get_n_rows())
@@ -94,8 +92,9 @@
             'foursquare', 88, '50574c9ce4b0a9a6e84433a0',
             'messages', 'Jimbob Smith', '', '', True, '2012-09-17T19:15:24Z',
             "Working on friends's foursquare plugin.",
-            '~/.cache/friends/avatar/hash', '', 0, False, '', '', '',
-            '', '', '', 'Pop Soda\'s Coffee House & Gallery',
+            'https://irs0.4sqi.net/img/user/100x100/5IEW3VIX55BBEXAO.jpg',
+            '', 0, False, '', '', '', '', '', '',
+            'Pop Soda\'s Coffee House & Gallery',
             49.88873164336725, -97.158043384552,
             ]
         self.assertEqual(list(TestModel.get_row(0)), expected)
 
=== modified file 'friends/tests/test_notify.py'
--- friends/tests/test_notify.py	2013-04-16 17:55:01 +0000
+++ friends/tests/test_notify.py	2013-06-18 22:10:33 +0000
@@ -40,6 +40,25 @@
 
     @mock.patch('friends.utils.base.Model', TestModel)
     @mock.patch('friends.utils.base._seen_ids', {})
+    @mock.patch('friends.utils.notify.Avatar')
+    @mock.patch('friends.utils.notify.GdkPixbuf')
+    @mock.patch('friends.utils.notify.Notify')
+    def test_publish_avatar_cache(self, notify, gdkpixbuf, avatar):
+        Base._do_notify = lambda protocol, stream: True
+        base = Base(FakeAccount())
+        base._publish(
+            message='http://example.com!',
+            message_id='1234',
+            sender='Benjamin',
+            timestamp=RIGHT_NOW,
+            icon_uri='http://example.com/bob.jpg',
+            )
+        avatar.get_image.assert_called_once_with('http://example.com/bob.jpg')
+        gdkpixbuf.Pixbuf.new_from_file_at_size.assert_called_once_with(
+            avatar.get_image(), 48, 48)
+
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.base._seen_ids', {})
     @mock.patch('friends.utils.base.notify')
     def test_publish_no_html(self, notify):
         Base._do_notify = lambda protocol, stream: True
 
=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2013-04-17 06:13:49 +0000
+++ friends/tests/test_twitter.py	2013-06-18 22:10:33 +0000
@@ -26,7 +26,6 @@
 import unittest
 import shutil
 
-from gi.repository import GLib
 from urllib.error import HTTPError
 
 from friends.protocols.twitter import RateLimiter, Twitter
@@ -138,8 +137,7 @@
             ['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://si0.twimg.com/profile_images/730275945/oauth-dancer.jpg',
              'https://twitter.com/oauth_dancer/status/240558470661799936',
              0, False, '', '', '', '', '', '', '', 0.0, 0.0,
              ],
@@ -149,8 +147,8 @@
              'with twitter" class at @cal with @othman  '
              '<a href="http://blogs.ischool.berkeley.edu/i290-abdt-s12/">'
              'http://blogs.ischool.berkeley.edu/i290-abdt-s12/</a>',
-             GLib.get_user_cache_dir() +
-             '/friends/avatars/0219effc03a3049a622476e6e001a4014f33dc31',
+             'https://si0.twimg.com/profile_images/1270234259/'
+             'raffi-headshot-casual.png',
              'https://twitter.com/raffi/status/240556426106372096',
              0, False, '', '', '', '', '', '', '', 0.0, 0.0,
              ],
@@ -158,8 +156,8 @@
              '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://si0.twimg.com/profile_images/2546730059/'
+             'f6a8zq58mg1hn0ha8vie.jpeg',
              'https://twitter.com/episod/status/240539141056638977',
              0, False, '', '', '', '', '', '', '', 0.0, 0.0,
              ],
@@ -209,8 +207,7 @@
             '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://si0.twimg.com/profile_images/730275945/oauth-dancer.jpg',
             'https://twitter.com/oauth_dancer/status/240558470661799936',
             0, False, '', '', '', '', '', '', '', 0.0, 0.0,
             ]
@@ -295,9 +292,7 @@
                        'direct_messages/sent.json?count=50')
              ])
 
-    @mock.patch('friends.protocols.twitter.Avatar.get_image',
-                return_value='~/.cache/friends/avatars/hash')
-    def test_private_avatars(self, image_mock):
+    def test_private_avatars(self):
         get_url = self.protocol._get_url = mock.Mock(
             return_value=[
                 dict(
@@ -317,7 +312,7 @@
         publish.assert_called_with(
             liked=False, sender='Bob', stream='private',
             url='https://twitter.com/some_guy/status/1452456',
-            icon_uri='~/.cache/friends/avatars/hash',
+            icon_uri='https://example.com/bob.jpg',
             sender_nick='some_guy', sender_id='', from_me=False,
             timestamp='2012-11-04T17:14:52Z', message='Does my avatar show up?',
             message_id='1452456')
@@ -474,8 +469,8 @@
             '2013-04-16T17:58:26Z', 'RT @tarek_ziade: Just found a "Notification '
             'of Inspection" card in the bottom of my bag. looks like they were '
             'curious about those raspbe ...',
-            GLib.get_user_cache_dir() +
-            '/friends/avatars/1444c8a86dbbe7a6f5f89a8135e770824d7b22bc',
+            'https://si0.twimg.com/profile_images/2631306428/'
+            '2a509db8a05b4310394b832d34a137a4.png',
             'https://twitter.com/therealrobru/status/324220250889543682',
             0, False, '', '', '', '', '', '', '', 0.0, 0.0,
             ]
 
=== modified file 'friends/utils/avatar.py'
--- friends/utils/avatar.py	2013-04-03 21:22:57 +0000
+++ friends/utils/avatar.py	2013-06-18 22:10:33 +0000
@@ -23,17 +23,15 @@
 import os
 import logging
 
-from datetime import date, timedelta
 from gi.repository import Gio, GLib, GdkPixbuf
+from tempfile import gettempdir
 from hashlib import sha1
 
 from friends.utils.http import Downloader
 from friends.errors import ignored
 
 
-CACHE_DIR = os.path.realpath(os.path.join(
-    GLib.get_user_cache_dir(), 'friends', 'avatars'))
-AGE_LIMIT = date.today() - timedelta(weeks=4)
+CACHE_DIR = os.path.join(gettempdir(), 'friends-avatars')
 
 
 with ignored(FileExistsError):
@@ -54,14 +52,11 @@
             return url
         local_path = Avatar.get_path(url)
         size = 0
-        mtime = date.fromtimestamp(0)
 
         with ignored(FileNotFoundError):
-            stat = os.stat(local_path)
-            size = stat.st_size
-            mtime = date.fromtimestamp(stat.st_mtime)
+            size = os.stat(local_path).st_size
 
-        if size == 0 or mtime < AGE_LIMIT:
+        if size == 0:
             log.debug('Getting: {}'.format(url))
             image_data = Downloader(url).get_bytes()
 
@@ -79,18 +74,3 @@
             except GLib.GError:
                 log.error('Failed to scale image: {}'.format(url))
         return local_path
-
-    @staticmethod
-    def expire_old_avatars():
-        """Evict old files from the cache."""
-        log.debug('Checking if anything needs to expire.')
-        for filename in os.listdir(CACHE_DIR):
-            path = os.path.join(CACHE_DIR, filename)
-            mtime = date.fromtimestamp(os.stat(path).st_mtime)
-            if mtime < AGE_LIMIT:
-                # The file's last modification time is earlier than the oldest
-                # time we'll allow in the cache.  However, due to race
-                # conditions, ignore it if the file has already been removed.
-                with ignored(FileNotFoundError):
-                    log.debug('Expiring: {}'.format(path))
-                    os.remove(path)
 
=== modified file 'friends/utils/notify.py'
--- friends/utils/notify.py	2013-04-17 06:13:49 +0000
+++ friends/utils/notify.py	2013-06-18 22:10:33 +0000
@@ -27,6 +27,7 @@
 
 from gi.repository import GObject, GdkPixbuf
 
+from friends.utils.avatar import Avatar
 from friends.errors import ignored
 
 
@@ -45,7 +46,7 @@
 
     with ignored(GObject.GError):
         pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
-            icon_uri, 48, 48)
+            Avatar.get_image(icon_uri), 48, 48)
 
     if pixbuf is not None:
         notification.set_icon_from_pixbuf(pixbuf)
@@ -58,6 +59,7 @@
         # not much we can do about that.
         notification.show()
 
+
 # Optional dependency on Notify library.
 try:
     from gi.repository import Notify
 
=== modified file 'service/src/service.vala'
--- service/src/service.vala	2013-04-17 18:23:44 +0000
+++ service/src/service.vala	2013-06-18 22:10:33 +0000
@@ -21,7 +21,6 @@
 [DBus (name = "com.canonical.Friends.Dispatcher")]
 private interface Dispatcher : GLib.Object {
         public abstract void Refresh () throws GLib.IOError;
-        public abstract void ExpireAvatars () throws GLib.IOError;
         public abstract async void Do (
             string action,
             string account_id,
@@ -184,7 +183,6 @@
         try {
             dispatcher = Bus.get_proxy.end(res);
             Timeout.add_seconds (120, fetch_contacts);
-            Timeout.add_seconds (300, expire_avatars);
             var ret = on_refresh ();
         } catch (IOError e) {
             warning (e.message);
@@ -218,20 +216,6 @@
         }
         return false;
     }
-
-    bool expire_avatars ()
-    {
-        debug ("Expiring old avatars...");
-        // By default, this happens 5 minutes after startup, and then
-        // every 7 days thereafter.
-        Timeout.add_seconds (604800, expire_avatars);
-        try {
-            dispatcher.ExpireAvatars ();
-        } catch (IOError e) {
-            warning ("Failed to expire avatars - %s", e.message);
-        }
-        return false;
-    }
 }
 
 void on_bus_aquired (DBusConnection conn) {