← Back to branch summary

~ps-jenkins/friends/latestsnapshot-0.2.0+13.10.20130822-0ubuntu1

« back to all changes in this revision

Viewing changes to friends/protocols/facebook.py

  • Committer: Tarmac
  • Author(s): Robert Bruce Park
  • Date: 2013-06-19 05:04:36 UTC
  • mfrom: (207.1.1 avatar-cache)
  • Revision ID: tarmac-20130619050436-1pyez5t4e04t564z
Move avatar cache under /tmp. Fixes: https://bugs.launchpad.net/bugs/1177945.

Approved by PS Jenkins bot, Ken VanDine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
friends/protocols/facebook.py
24
24
import time
25
25
import logging
26
26
 
27
 
from friends.utils.avatar import Avatar
28
27
from friends.utils.base import Base, feature
29
28
from friends.utils.cache import JsonCache
30
29
from friends.utils.http import Downloader, Uploader
99
98
            args['sender_id'] = sender_id = from_record.get('id', '')
100
99
            args['url'] = STORY_PERMALINK.format(
101
100
                id=sender_id, post_id=post_id)
102
 
            args['icon_uri'] = Avatar.get_image(
103
 
                API_BASE.format(id=sender_id) + '/picture?width=840&height=840')
 
101
            args['icon_uri'] = (API_BASE.format(id=sender_id) +
 
102
                                '/picture?width=840&height=840')
104
103
            args['sender_nick'] = from_record.get('name', '')
105
104
            args['from_me'] = (sender_id == self._account.user_id)
106
105
 
322
321
                sender_nick=self._account.user_name,
323
322
                timestamp=iso8601utc(int(time.time())),
324
323
                url=destination_url,
325
 
                icon_uri=Avatar.get_image(
326
 
                    API_BASE.format(id=self._account.user_id) +
327
 
                    '/picture?type=large'))
 
324
                icon_uri=(API_BASE.format(id=self._account.user_id) +
 
325
                          '/picture?type=large'))
328
326
            return destination_url
329
327
        else:
330
328
            raise FriendsError(str(response))