Merge lp:~andrewsomething/friends/instagram into lp:~super-friends/friends/trunk-next

[Andrew Starr-Bochicchio]

Comment posting isn't completely tested yet. Instagram returns:

{'meta': {'error_message': 'Please visit http://bit.ly/instacomments for commenting access', 'error_type': 'APIError', 'code': 400}}

I've visited the link and asked for access, but I haven't gotten a response
yet. Will have to wait on that...

I also have one question. Is there annyway to make pictures a first class
citizen? Instagram doesn't have messages perse. Currently I just use
'foo shared a picture on Instagram.' as the message and then you need to
click to see the picture. It would be nice if it we possible to use
the picture as the message.

[Robert Bruce Park (robru)]

Wow, quite speedy ;-)

I don't have time to review this right now (and it's too late to make it into raring anyway), but I promise I'll look at it soon and we'll land it early in the S cycle.

[Andrew Starr-Bochicchio (andrewsomething)]

Ya, I wanted to get it done while my motivation was at its height even though its too late for raring.

I filed a bug about the issue liking things (LP: #1168536).

[Robert Bruce Park (robru)]

Oh, andrew, can you rebase this on lp:~super-friends/friends/trunk-next? That is where we're landing new features before S opens for development. Shouldn't be any merge conflicts as far as I know.

review: Needs Resubmitting

[Robert Bruce Park (robru)]

Thanks for the resubmit. In terms of photos being "first class", I agree that should happen (flickr has the same problem). There's nothing to be done about it on the lp:friends side of things, it's entirely determined by how friends-app decides to display the messages. I'd like to avoid protocol-specific code in lp:friends-app, so maybe what we should do is just make the image thumbnails always visible, regardless of protocol. i've filed a bug for that here:

https://bugs.launchpad.net/ubuntu/+source/friends-app/+bug/1169679

[Robert Bruce Park (robru)]

Wow, testsuite is looking really nice, I can't wait to get some time to properly review this. Thursday is raring final freeze, so maybe next week!

[lp:~andrewsomething/friends/instagram]

199. By Andrew Starr-Bochicchio on 2013-04-16

Add test_error_response

[Robert Bruce Park (robru)]

I've done the work of rebasing this on trunk, and I've resubmitted it myself here: https://code.launchpad.net/~robru/friends/instagram/+merge/173277

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-16 03:04:48 +0000
+++ debian/changelog	2013-04-16 19:33:26 +0000
@@ -1,7 +1,11 @@
 friends (0.2.0-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Robert Bruce Park ]
   * Version bump for the next development series.
 
+  [Andrew Starr-Bochicchio]
+  * Add support for Instagram (LP: #1167449).
+
  -- Robert Bruce Park <[e-mail]>  Tue, 19 Mar 2013 15:03:58 -0700
 
 friends (0.1.3daily13.04.10.1-0ubuntu1) raring; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-02-22 00:06:42 +0000
+++ debian/control	2013-04-16 19:33:26 +0000
@@ -103,3 +103,9 @@
 Depends: friends, ${misc:Depends}, ${python3:Depends}
 Description: Social integration with the desktop - Flickr
  Provides social networking integration with the desktop
+
+Package: friends-instagram
+Architecture: all
+Depends: friends, ${misc:Depends}, ${python3:Depends}
+Description: Social integration with the desktop - Instagram
+ Provides social networking integration with the desktop

=== added file 'debian/friends-instagram.install'
--- debian/friends-instagram.install	1970-01-01 00:00:00 +0000
+++ debian/friends-instagram.install	2013-04-16 19:33:26 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3/dist-packages/friends/protocols/instagram*

=== added file 'friends/protocols/instagram.py'
--- friends/protocols/instagram.py	1970-01-01 00:00:00 +0000
+++ friends/protocols/instagram.py	2013-04-16 19:33:26 +0000
@@ -0,0 +1,200 @@
+# friends-dispatcher -- send & receive messages from any social network
+# Copyright (C) 2013  Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""The Instagram protocol plugin."""
+
+
+__all__ = [
+    'Instagram',
+    ]
+
+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
+from friends.utils.time import parsetime, iso8601utc
+from friends.errors import FriendsError
+
+log = logging.getLogger(__name__)
+
+class Instagram(Base):
+    _api_base = 'https://api.instagram.com/v1/{endpoint}?access_token={token}'
+    def _whoami(self, authdata):
+        """Identify the authenticating user."""
+        url = self._api_base.format(
+            endpoint='users/self',
+            token=self._get_access_token())
+        result = Downloader(url).get_json()
+        self._account.user_id = result.get('data').get('id')
+        self._account.user_name = result.get('data').get('username')
+
+    def _publish_entry(self, entry, stream='messages'):
+        """Publish a single update into the Dee.SharedModel."""
+        message_id = entry.get('id')
+
+        if message_id is None:
+            # We can't do much with this entry.
+            return
+
+        person = entry.get('user')
+        nick = person.get('username')
+        name = person.get('full_name')
+        person_id = person.get('id')
+        message= '%s shared a picture on Instagram.' % nick
+        person_icon = Avatar.get_image(person.get('profile_picture'))
+        person_url = 'http://instagram.com/' + nick
+        picture = entry.get('images').get('thumbnail').get('url')
+        if entry.get('caption'):
+            desc = entry.get('caption').get('text', '')
+        else:
+            desc = ''
+        url = entry.get('link')
+        timestamp = entry.get('created_time')
+        if timestamp is not None:
+            timestamp = iso8601utc(parsetime(timestamp))
+        likes = entry.get('likes').get('count')
+        liked = entry.get('user_has_liked')
+        location = entry.get('location', {})
+        if location:
+            latitude = location.get('latitude', '')
+            longitude = location.get('longitude', '')
+        else:
+            latitude = 0
+            longitude = 0
+
+        args = dict(
+             message_id=message_id,
+             message=message,
+             stream=stream,
+             likes=likes,
+             sender_id=person_id,
+             sender=name,
+             sender_nick=nick,
+             url=person_url,
+             icon_uri=person_icon,
+             link_url=url,
+             link_picture=picture,
+             link_desc=desc,
+             timestamp=timestamp,
+             liked=liked,
+             latitude=latitude,
+             longitude=longitude
+             )
+
+        self._publish(**args)
+
+        # If there are any replies, publish them as well.
+        parent_id = message_id
+        for comment in entry.get('comments', {}).get('data', []):
+            if comment:
+                self._publish_comment(
+                    comment, stream='reply_to/{}'.format(parent_id))
+        return args['url']
+
+    def _publish_comment(self, comment, stream):
+        message_id = comment.get('id')
+        if message_id is None:
+            return
+        message = comment.get('text', '')
+        person = comment.get('from', {})
+        sender_nick = person.get('username')
+        timestamp = comment.get('created_time')
+        if timestamp is not None:
+            timestamp = iso8601utc(parsetime(timestamp))
+        icon_uri = Avatar.get_image(person.get('profile_picture'))
+        sender_id = person.get('id')
+        sender = person.get('full_name')
+
+        args = dict(
+             stream=stream,
+             message_id=message_id,
+             message=message,
+             timestamp=timestamp,
+             sender_nick=sender_nick,
+             icon_uri=icon_uri,
+             sender_id=sender_id,
+             sender=sender,
+             )
+#                print(args)
+        self._publish(**args)
+
+    @feature
+    def home(self):
+        """Gather and publish public timeline messages."""
+        url = self._api_base.format(
+            endpoint='users/self/feed',
+            token=self._get_access_token())
+        result = Downloader(url).get_json()
+        values = result.get('data', {})
+        for update in values:
+            self._publish_entry(update)
+    
+    @feature
+    def receive(self):
+        """Gather and publish all incoming messages."""
+        self.home()
+        return self._get_n_rows()
+
+    def _send(self, obj_id, message, endpoint, stream='messages'):
+        token = self._get_access_token()
+
+        url = self._api_base.format(endpoint=endpoint, token=token)
+
+        result = Downloader(
+            url,
+            method='POST',
+            params=dict(access_token=token, text=message)).get_json()
+        new_id = result.get('id')
+        if new_id is None:
+            raise FriendsError('Failed sending to Instagram: {!r}'.format(result))
+        enpoint = 'media/{}/comments'.format(new_id)
+        url = self._api_base.format(endpoint=endpoint, token=token)
+        comment = Downloader(url, params=dict(access_token=token)).get_json()
+        return self._publish_entry(entry=comment, stream=stream)
+
+    @feature
+    def send_thread(self, obj_id, message):
+        """Write a comment on some existing picture.
+        """
+        return self._send(obj_id, message, 'media/{}/comments'.format(obj_id),
+                          stream='reply_to/{}'.format(obj_id))
+
+    def _like(self, obj_id, endpoint, method):
+        token = self._get_access_token()
+        url = self._api_base.format(endpoint=endpoint, token=token)
+
+        if not Downloader(url, method=method,
+                          params=dict(access_token=token)).get_json():
+            raise FriendsError('Failed to {} like {} on Instagram'.format(
+                method, obj_id))
+
+    @feature
+    def like(self, obj_id):
+        endpoint = 'media/{}/likes'.format(obj_id)
+        self._like(obj_id, endpoint, 'POST')
+        self._inc_cell(obj_id, 'likes')
+        self._set_cell(obj_id, 'liked', True)
+        return obj_id
+
+    @feature
+    def unlike(self, obj_id):
+        endpoint = 'media/{}/likes'.format(obj_id)
+        self._like(obj_id, endpoint, 'DELETE')
+        self._dec_cell(obj_id, 'likes')
+        self._set_cell(obj_id, 'liked', False)
+        return obj_id

=== added file 'friends/tests/data/instagram-full.dat'
--- friends/tests/data/instagram-full.dat	1970-01-01 00:00:00 +0000
+++ friends/tests/data/instagram-full.dat	2013-04-16 19:33:26 +0000
@@ -0,0 +1,473 @@
+{
+  "pagination": {
+    "next_url": "https://api.instagram.com/v1/users/self/feed?access_token=4abc&max_id=431429392441037546_46931811",
+    "next_max_id": "431429392441037546_46931811"
+  },
+  "meta": {
+    "code": 200
+  },
+  "data": [
+    {
+      "attribution": null,
+      "tags": [],
+      "type": "image",
+      "location": null,
+      "comments": {
+        "count": 1,
+        "data": [
+          {
+            "created_time": "1365680633",
+            "text": "Wtf is that from?",
+            "from": {
+              "username": "ellllliottttt",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_13811917_75sq_1322106636.jpg",
+              "id": "13811917",
+              "full_name": "Elliott Markowitz"
+            },
+            "id": "431682899841631793"
+          }
+        ]
+      },
+      "filter": "Normal",
+      "created_time": "1365655801",
+      "link": "http://instagram.com/p/X859raK8fx/",
+      "likes": {
+        "count": 8,
+        "data": [
+          {
+            "username": "noahvargass",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_1037856_75sq_1354178959.jpg",
+            "id": "1037856",
+            "full_name": "Noah Vargas"
+          },
+          {
+            "username": "deniboring",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_16828740_75sq_1345748703.jpg",
+            "id": "16828740",
+            "full_name": "deniboring"
+          },
+          {
+            "username": "gabriel_cordero",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_185127499_75sq_1340358021.jpg",
+            "id": "185127499",
+            "full_name": "cheeseburger pocket"
+          },
+          {
+            "username": "inmyheadache",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_22645548_75sq_1343529900.jpg",
+            "id": "22645548",
+            "full_name": "Tim F"
+          },
+          {
+            "username": "ellllliottttt",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_13811917_75sq_1322106636.jpg",
+            "id": "13811917",
+            "full_name": "Elliott Markowitz"
+          },
+          {
+            "username": "eyesofsatan",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_2526196_75sq_1352254863.jpg",
+            "id": "2526196",
+            "full_name": "Christopher Hansell"
+          },
+          {
+            "username": "lakeswimming",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_3610143_75sq_1363648525.jpg",
+            "id": "3610143",
+            "full_name": "lakeswimming"
+          },
+          {
+            "username": "jtesnakis",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_214679263_75sq_1346185198.jpg",
+            "id": "214679263",
+            "full_name": "Jonathan"
+          }
+        ]
+      },
+      "images": {
+        "low_resolution": {
+          "url": "http://distilleryimage9.s3.amazonaws.com/44ad8486a26311e2872722000a1fd26f_6.jpg",
+          "width": 306,
+          "height": 306
+        },
+        "thumbnail": {
+          "url": "http://distilleryimage9.s3.amazonaws.com/44ad8486a26311e2872722000a1fd26f_5.jpg",
+          "width": 150,
+          "height": 150
+        },
+        "standard_resolution": {
+          "url": "http://distilleryimage9.s3.amazonaws.com/44ad8486a26311e2872722000a1fd26f_7.jpg",
+          "width": 612,
+          "height": 612
+        }
+      },
+      "caption": null,
+      "user_has_liked": false,
+      "id": "431474591469914097_223207800",
+      "user": {
+        "username": "joshwolp",
+        "website": "",
+        "profile_picture": "http://images.ak.instagram.com/profiles/profile_223207800_75sq_1347753109.jpg",
+        "full_name": "Josh",
+        "bio": "",
+        "id": "223207800"
+      }
+    },
+    {
+      "attribution": null,
+      "tags": [
+        "nofilter"
+      ],
+      "type": "image",
+      "location": {
+        "latitude": 40.702485554,
+        "longitude": -73.929230548
+      },
+      "comments": {
+        "count": 3,
+        "data": [
+          {
+            "created_time": "1365654315",
+            "text": "I remember pushing that little guy of the swings a few times....",
+            "from": {
+              "username": "squidneylol",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_5917696_75sq_1336705905.jpg",
+              "id": "5917696",
+              "full_name": "Syd"
+            },
+            "id": "431462132263145102"
+          },
+          {
+            "created_time": "1365665741",
+            "text": "Stop it!!!",
+            "from": {
+              "username": "nightruiner",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_31239607_75sq_1358968326.jpg",
+              "id": "31239607",
+              "full_name": "meredith gaydosh"
+            },
+            "id": "431557973837598336"
+          },
+          {
+            "created_time": "1365691283",
+            "text": "You know I hate being held.",
+            "from": {
+              "username": "piratemaddi",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_191388805_75sq_1341897870.jpg",
+              "id": "191388805",
+              "full_name": "piratemaddi"
+            },
+            "id": "431772240369143639"
+          }
+        ]
+      },
+      "filter": "Normal",
+      "created_time": "1365651440",
+      "link": "http://instagram.com/p/X8xpYwk82w/",
+      "likes": {
+        "count": 17,
+        "data": [
+          {
+            "username": "meaghanlou",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_41007792_75sq_1334443633.jpg",
+            "id": "41007792",
+            "full_name": "meaghanlou"
+          },
+          {
+            "username": "shahwiththat",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_40353923_75sq_1361330343.jpg",
+            "id": "40353923",
+            "full_name": "Soraya Shah"
+          },
+          {
+            "username": "marsyred",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_216361031_75sq_1346524176.jpg",
+            "id": "216361031",
+            "full_name": "marsyred"
+          },
+          {
+            "username": "thewhitewizzard",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_189027880_75sq_1341183134.jpg",
+            "id": "189027880",
+            "full_name": "Drew Mack"
+          },
+          {
+            "username": "juddymagee",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_8993099_75sq_1315066258.jpg",
+            "id": "8993099",
+            "full_name": "juddymagee"
+          },
+          {
+            "username": "pixxamonster",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_1672624_75sq_1364673157.jpg",
+            "id": "1672624",
+            "full_name": "Sonia 👓 + Dita 🐈"
+          },
+          {
+            "username": "tongue_in_cheek",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_5710964_75sq_1345359909.jpg",
+            "id": "5710964",
+            "full_name": "merrily."
+          },
+          {
+            "username": "nightruiner",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_31239607_75sq_1358968326.jpg",
+            "id": "31239607",
+            "full_name": "meredith gaydosh"
+          },
+          {
+            "username": "eliz_mortals",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_36417303_75sq_1364179217.jpg",
+            "id": "36417303",
+            "full_name": "eliz_mortals"
+          },
+          {
+            "username": "caranicoletti",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_14162814_75sq_1359848230.jpg",
+            "id": "14162814",
+            "full_name": "Cara Nicoletti"
+          }
+        ]
+      },
+      "images": {
+        "low_resolution": {
+          "url": "http://distilleryimage8.s3.amazonaws.com/1d99da5ca25911e2822f22000a9f09ca_6.jpg",
+          "width": 306,
+          "height": 306
+        },
+        "thumbnail": {
+          "url": "http://distilleryimage8.s3.amazonaws.com/1d99da5ca25911e2822f22000a9f09ca_5.jpg",
+          "width": 150,
+          "height": 150
+        },
+        "standard_resolution": {
+          "url": "http://distilleryimage8.s3.amazonaws.com/1d99da5ca25911e2822f22000a9f09ca_7.jpg",
+          "width": 612,
+          "height": 612
+        }
+      },
+      "caption": {
+        "created_time": "1365651465",
+        "text": "National siblings day @piratemaddi ? You mustn't've known. #nofilter",
+        "from": {
+          "username": "what_a_handsome_boy",
+          "profile_picture": "http://images.ak.instagram.com/profiles/profile_5891266_75sq_1345460082.jpg",
+          "id": "5891266",
+          "full_name": "Fence!"
+        },
+        "id": "431438224520630210"
+      },
+      "user_has_liked": false,
+      "id": "431438012683111856_5891266",
+      "user": {
+        "username": "what_a_handsome_boy",
+        "website": "",
+        "profile_picture": "http://images.ak.instagram.com/profiles/profile_5891266_75sq_1345460082.jpg",
+        "full_name": "Fence!",
+        "bio": "",
+        "id": "5891266"
+      }
+    },
+    {
+      "attribution": null,
+      "tags": [
+        "canada",
+        "iphone",
+        "punklife",
+        "acap",
+        "doom",
+        "crust"
+      ],
+      "type": "image",
+      "location": null,
+      "comments": {
+        "count": 7,
+        "data": [
+          {
+            "created_time": "1365651434",
+            "text": "I have not seen him for a minute, he is a great guy!",
+            "from": {
+              "username": "rocktoberblood",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_210506849_75sq_1355190976.jpg",
+              "id": "210506849",
+              "full_name": "Nate Phillips"
+            },
+            "id": "431437959929388541"
+          },
+          {
+            "created_time": "1365652422",
+            "text": "Saw him puke in the elevator at the Hilton when Doom played chaos.",
+            "from": {
+              "username": "occult_obsession",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_6080835_75sq_1364154159.jpg",
+              "id": "6080835",
+              "full_name": "Evan Vellela"
+            },
+            "id": "431446251162427175"
+          },
+          {
+            "created_time": "1365652900",
+            "text": "Lol ^ who DIDN'T do this at chaos",
+            "from": {
+              "username": "laurababbili",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_1238692_75sq_1361065720.jpg",
+              "id": "1238692",
+              "full_name": "Laura Babbili"
+            },
+            "id": "431450261906907041"
+          },
+          {
+            "created_time": "1365655310",
+            "text": "I tried to kiss the singer of cocksparrer in that elevator.",
+            "from": {
+              "username": "gregdaly",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_31133446_75sq_1333488205.jpg",
+              "id": "31133446",
+              "full_name": "greg daly"
+            },
+            "id": "431470473175752176"
+          },
+          {
+            "created_time": "1365655687",
+            "text": "Leant that dude a 900 Marshall a time ago! Love that dude!!",
+            "from": {
+              "username": "nickatnightengale",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_29366372_75sq_1354241971.jpg",
+              "id": "29366372",
+              "full_name": "Nick Poulos"
+            },
+            "id": "431473639539727956"
+          },
+          {
+            "created_time": "1365658654",
+            "text": "Hahaha!!",
+            "from": {
+              "username": "jeremyhush",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_43750226_75sq_1335024423.jpg",
+              "id": "43750226",
+              "full_name": "Jeremy Hush"
+            },
+            "id": "431498525729480083"
+          },
+          {
+            "created_time": "1365685226",
+            "text": "There's an app for that",
+            "from": {
+              "username": "liam_wilson",
+              "profile_picture": "http://images.ak.instagram.com/profiles/profile_4357248_75sq_1327009309.jpg",
+              "id": "4357248",
+              "full_name": "Liam Wilson"
+            },
+            "id": "431721432141388885"
+          }
+        ]
+      },
+      "filter": "X-Pro II",
+      "created_time": "1365650801",
+      "link": "http://instagram.com/p/X8wbTQtd3Y/",
+      "likes": {
+        "count": 36,
+        "data": [
+          {
+            "username": "fatbenatar",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_280136224_75sq_1357073366.jpg",
+            "id": "280136224",
+            "full_name": "China Oxendine"
+          },
+          {
+            "username": "tejleo",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_10403332_75sq_1354058520.jpg",
+            "id": "10403332",
+            "full_name": "tejleo"
+          },
+          {
+            "username": "tonyromeo13",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_255933637_75sq_1360272947.jpg",
+            "id": "255933637",
+            "full_name": "Tony Romeo"
+          },
+          {
+            "username": "libraryrat4",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_17715046_75sq_1325381597.jpg",
+            "id": "17715046",
+            "full_name": "libraryrat4"
+          },
+          {
+            "username": "boredwithapathy",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_174679368_75sq_1338500455.jpg",
+            "id": "174679368",
+            "full_name": "Lisa McCarthy"
+          },
+          {
+            "username": "justinpittney",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_10976940_75sq_1361306615.jpg",
+            "id": "10976940",
+            "full_name": "Justin Pittney"
+          },
+          {
+            "username": "nuclearhell",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_212702314_75sq_1361642319.jpg",
+            "id": "212702314",
+            "full_name": "Rachel Whittaker"
+          },
+          {
+            "username": "gregelk",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_240084204_75sq_1359223473.jpg",
+            "id": "240084204",
+            "full_name": "Greg Elk"
+          },
+          {
+            "username": "bradhasher",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_283278325_75sq_1357514041.jpg",
+            "id": "283278325",
+            "full_name": "Brett Ellingson"
+          },
+          {
+            "username": "zaimlmzim",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_180060277_75sq_1363118292.jpg",
+            "id": "180060277",
+            "full_name": "zaimlmzim"
+          }
+        ]
+      },
+      "images": {
+        "low_resolution": {
+          "url": "http://distilleryimage4.s3.amazonaws.com/a051f882a25711e282e122000a1f9aae_6.jpg",
+          "width": 306,
+          "height": 306
+        },
+        "thumbnail": {
+          "url": "http://distilleryimage4.s3.amazonaws.com/a051f882a25711e282e122000a1f9aae_5.jpg",
+          "width": 150,
+          "height": 150
+        },
+        "standard_resolution": {
+          "url": "http://distilleryimage4.s3.amazonaws.com/a051f882a25711e282e122000a1f9aae_7.jpg",
+          "width": 612,
+          "height": 612
+        }
+      },
+      "caption": {
+        "created_time": "1365650915",
+        "text": "This is my friend Scoot. He plays bass in #doom and is a mega rock star in newfoundland. Here you can see him signing an autograph on an iphone. #crust #punklife #iphone #canada #acap",
+        "from": {
+          "username": "gregdaly",
+          "profile_picture": "http://images.ak.instagram.com/profiles/profile_31133446_75sq_1333488205.jpg",
+          "id": "31133446",
+          "full_name": "greg daly"
+        },
+        "id": "431433605218426202"
+      },
+      "user_has_liked": false,
+      "id": "431432646660578776_31133446",
+      "user": {
+        "username": "gregdaly",
+        "website": "",
+        "profile_picture": "http://images.ak.instagram.com/profiles/profile_31133446_75sq_1333488205.jpg",
+        "full_name": "greg daly",
+        "bio": "",
+        "id": "31133446"
+      }
+    }
+  ]
+}

=== added file 'friends/tests/data/instagram-login.dat'
--- friends/tests/data/instagram-login.dat	1970-01-01 00:00:00 +0000
+++ friends/tests/data/instagram-login.dat	2013-04-16 19:33:26 +0000
@@ -0,0 +1,18 @@
+{
+  "meta":  {
+    "code": 200
+  },
+  "data":  {
+    "username": "bpersons",
+    "bio": "",
+    "website": "",
+    "profile_picture": "http://images.ak.instagram.com/profiles/anonymousUser.jpg",
+    "full_name": "Bart Person",
+    "counts":  {
+      "media": 174,
+      "followed_by": 100,
+      "follows": 503
+    },
+    "id": "801"
+  }
+}

=== added file 'friends/tests/test_instagram.py'
--- friends/tests/test_instagram.py	1970-01-01 00:00:00 +0000
+++ friends/tests/test_instagram.py	2013-04-16 19:33:26 +0000
@@ -0,0 +1,234 @@
+# friends-dispatcher -- send & receive messages from any social network
+# Copyright (C) 2012  Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test the Instagram plugin."""
+
+
+__all__ = [
+    'TestInstagram',
+    ]
+
+
+import os
+import tempfile
+import unittest
+import shutil
+
+from gi.repository import GLib
+from pkg_resources import resource_filename
+
+from friends.protocols.instagram import Instagram
+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.cache import JsonCache
+
+
[e-mail]('friends.utils.http._soup', mock.Mock())
[e-mail]('friends.utils.base.notify', mock.Mock())
+class TestInstagram(unittest.TestCase):
+    """Test the Instagram 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 = Instagram(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.
+        self.assertEqual(Instagram.get_features(),
+            ['home', 'like', 'receive', 'send_thread', 'unlike'])
+
+    @mock.patch('friends.utils.authentication.manager')
+    @mock.patch('friends.utils.authentication.Accounts')
+    @mock.patch('friends.utils.authentication.Authentication.__init__',
+                return_value=None)
+    @mock.patch('friends.utils.authentication.Authentication.login',
+                return_value=dict(AccessToken='abc'))
+    @mock.patch('friends.utils.http.Soup.Message',
+                FakeSoupMessage('friends.tests.data', 'instagram-login.dat'))
+    def test_successful_login(self, *mock):
+        # Test that a successful response from instagram.com returning
+        # the user's data, sets up the account dict correctly.
+        self.protocol._login()
+        self.assertEqual(self.account.access_token, 'abc')
+        self.assertEqual(self.account.user_name, 'bpersons')
+        self.assertEqual(self.account.user_id, '801')
+
+    @mock.patch('friends.utils.authentication.manager')
+    @mock.patch('friends.utils.authentication.Accounts')
+    @mock.patch.dict('friends.utils.authentication.__dict__', LOGIN_TIMEOUT=1)
+    @mock.patch('friends.utils.authentication.Signon.AuthSession.new')
+    def test_login_unsuccessful_authentication(self, *mock):
+        # The user is not already logged in, but the act of logging in fails.
+        self.assertRaises(AuthorizationError, self.protocol._login)
+        self.assertIsNone(self.account.access_token)
+        self.assertIsNone(self.account.user_name)
+
+    @mock.patch('friends.utils.authentication.manager')
+    @mock.patch('friends.utils.authentication.Accounts')
+    @mock.patch('friends.utils.authentication.Authentication.login',
+                return_value=dict(AccessToken='abc'))
+    @mock.patch('friends.protocols.instagram.Downloader.get_json',
+                return_value=dict(
+                    error=dict(message='Bad access token',
+                               type='OAuthException',
+                               code=190)))
+    def test_error_response(self, *mocks):
+        with LogMock('friends.utils.base',
+                     'friends.protocols.instagram') as log_mock:
+            self.assertRaises(
+                FriendsError,
+                self.protocol.home,
+                )
+            contents = log_mock.empty(trim=False)
+        self.assertEqual(contents, 'Logging in to Instagram\n')
+
+    @mock.patch('friends.utils.http.Soup.Message',
+                FakeSoupMessage('friends.tests.data', 'instagram-full.dat'))
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.protocols.instagram.Instagram._login',
+                return_value=True)
+    def test_receive(self, *mocks):
+        # Receive the feed for a user.
+        self.maxDiff = None
+        self.account.access_token = 'abc'
+        self.assertEqual(self.protocol.receive(), 14)
+        self.assertEqual(TestModel.get_n_rows(), 14)
+        self.assertEqual(list(TestModel.get_row(0)), [
+            'instagram',
+            88,
+            '431474591469914097_223207800',
+            'messages',
+            'Josh',
+            '223207800',
+            'joshwolp',
+            False,
+            '2013-04-11T04:50:01Z',
+            'joshwolp shared a picture on Instagram.',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/ca55b643e7b440762c7c6292399eed6542a84b90',
+            'http://instagram.com/joshwolp',
+            8,
+            False,
+            'http://distilleryimage9.s3.amazonaws.com/44ad8486a26311e2872722000a1fd26f_5.jpg',
+            '',
+            'http://instagram.com/p/X859raK8fx/',
+            '',
+            '',
+            '',
+            '',
+            0.0,
+            0.0,
+            ])
+        self.assertEqual(list(TestModel.get_row(3)), [
+            'instagram',
+            88,
+            '431462132263145102',
+            'reply_to/431438012683111856_5891266',
+            'Syd',
+            '5917696',
+            'squidneylol',
+            False,
+            '2013-04-11T04:25:15Z',
+            'I remember pushing that little guy of the swings a few times....',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/e61c8d91e37fec3e1dec9325fa4edc52ebeb96bb',
+            '',
+            0,
+            False,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0.0,
+            0.0,
+            ])
+
+    @mock.patch('friends.protocols.instagram.Downloader')
+    def test_send_thread(self, dload):
+        dload().get_json.return_value = dict(id='comment_id')
+        token = self.protocol._get_access_token = mock.Mock(
+            return_value='abc')
+        publish = self.protocol._publish_entry = mock.Mock(
+            return_value='http://instagram.com/p/post_id')
+
+        self.assertEqual(
+            self.protocol.send_thread('post_id', 'Some witty response!'),
+            'http://instagram.com/p/post_id')
+        token.assert_called_once_with()
+        publish.assert_called_with(entry={'id': 'comment_id'},
+                                   stream='reply_to/post_id')
+        self.assertEqual(
+            dload.mock_calls,
+            [mock.call(),
+             mock.call(
+                    'https://api.instagram.com/v1/media/post_id/comments?access_token=abc',
+                    method='POST',
+                    params=dict(
+                        access_token='abc',
+                        text='Some witty response!')),
+             mock.call().get_json(),
+             mock.call('https://api.instagram.com/v1/media/post_id/comments?access_token=abc',
+                       params=dict(access_token='abc')),
+             mock.call().get_json(),
+             ])
+
+    @mock.patch('friends.protocols.instagram.Downloader')
+    def test_like(self, dload):
+        dload().get_json.return_value = True
+        token = self.protocol._get_access_token = mock.Mock(
+            return_value='insta')
+        inc_cell = self.protocol._inc_cell = mock.Mock()
+        set_cell = self.protocol._set_cell = mock.Mock()
+
+        self.assertEqual(self.protocol.like('post_id'), 'post_id')
+
+        inc_cell.assert_called_once_with('post_id', 'likes')
+        set_cell.assert_called_once_with('post_id', 'liked', True)
+        token.assert_called_once_with()
+        dload.assert_called_with(
+            'https://api.instagram.com/v1/media/post_id/likes?access_token=insta',
+            method='POST',
+            params=dict(access_token='insta'))
+
+    @mock.patch('friends.protocols.instagram.Downloader')
+    def test_unlike(self, dload):
+        dload.get_json.return_value = True
+        token = self.protocol._get_access_token = mock.Mock(
+            return_value='insta')
+        dec_cell = self.protocol._dec_cell = mock.Mock()
+        set_cell = self.protocol._set_cell = mock.Mock()
+
+        self.assertEqual(self.protocol.unlike('post_id'), 'post_id')
+
+        dec_cell.assert_called_once_with('post_id', 'likes')
+        set_cell.assert_called_once_with('post_id', 'liked', False)
+        token.assert_called_once_with()
+        dload.assert_called_once_with(
+            'https://api.instagram.com/v1/media/post_id/likes?access_token=insta',
+            method='DELETE',
+            params=dict(access_token='insta'))