From d1f727b65b6fd12a4594407ce26b498d968c9e46 Mon Sep 17 00:00:00 2001 From: Andrew Flegg Date: Sun, 1 Nov 2009 11:11:29 +0000 Subject: [PATCH] Fix #5980 (default Twitter pics) and Facebook UIDs. Stop including changelogs in package. --- package/debian/changelog | 8 ++++++++ package/debian/rules | 4 ++-- package/src/hermes.py | 20 +++++++++++++------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/package/debian/changelog b/package/debian/changelog index 4fe04b7..13db96a 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,11 @@ +hermes (0.2.2) unstable; urgency=low + + * Ignore Twitter's default profile image. MB#5980 (reported by + Tomasz Dominikowski) + * Further fix for Facebook UID issues (reported by Attila Csipa) + + -- Andrew Flegg Sun, 1 Nov 2009 10:51:52 +0000 + hermes (0.2.1) unstable; urgency=low * Change type of stored Facebook UID from int to string (newer diff --git a/package/debian/rules b/package/debian/rules index 0cc4446..ff2e792 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -67,9 +67,9 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs +# dh_installchangelogs # dh_installdocs - dh_installexamples +# dh_installexamples # dh_install # dh_installmenu # dh_installdebconf diff --git a/package/src/hermes.py b/package/src/hermes.py index fe4cdb8..e844113 100644 --- a/package/src/hermes.py +++ b/package/src/hermes.py @@ -65,7 +65,7 @@ class Hermes: # key_app = self.gc.get_string('/apps/maemo/hermes/key_app') key_secret = self.gc.get_string('/apps/maemo/hermes/key_secret') - if (key_app is None or key_secret is None): + if key_app is None or key_secret is None: raise Exception('No Facebook application keys found. Installation error.') self.fb = Facebook(key_app, key_secret) @@ -91,7 +91,7 @@ class Hermes: self.gc.set_string('/apps/maemo/hermes/session_key', session['session_key']) self.gc.set_string('/apps/maemo/hermes/secret_key', session['secret']) - self.gc.set_string('/apps/maemo/hermes/uid', session['uid']) + self.gc.set_string('/apps/maemo/hermes/uid', str(session['uid'])) # ----------------------------------------------------------------------- @@ -144,11 +144,17 @@ class Hermes: (user, passwd) = self.twitter api = twitter.Api(username=user, password=passwd) users = api.GetFriends() - for friend in api.GetFriends(): - key = unicode(friend.name).encode('trans') - url = 'http://twitter.com/%s' % (friend.screen_name) - self.friends[key] = {'name': friend.name, 'pic': friend.profile_image_url, 'birthday_date': None, 'twitter_url': url, 'homepage': friend.url, 'account': 'twitter'} - self.friends_by_url[url] = self.friends[key] + for tweeter in api.GetFriends(): + key = unicode(tweeter.name).encode('trans') + url = 'http://twitter.com/%s' % (tweeter.screen_name) + friend = {'name': tweeter.name, 'pic': tweeter.profile_image_url, + 'birthday_date': None, 'twitter_url': url, + 'homepage': tweeter.url, 'account': 'twitter'} + if friend['pic'].find('/default_profile') > -1: + friend['pic'] = None + + self.friends[key] = friend + self.friends_by_url[url] = friend # TODO What if the user has *no* contacts? -- 1.7.9.5