Merge lp:~cjcurran/friends/call-contacts-at-startup into lp:friends

Proposed by Conor Curran
Status: Merged
Merged at revision: 72
Proposed branch: lp:~cjcurran/friends/call-contacts-at-startup
Merge into: lp:friends
Diff against target: 90 lines (+30/-0)
6 files modified
friends/protocols/facebook.py (+5/-0)
friends/protocols/flickr.py (+5/-0)
friends/protocols/foursquare.py (+4/-0)
friends/protocols/identica.py (+4/-0)
friends/protocols/twitter.py (+6/-0)
friends/service/dispatcher.py (+6/-0)
To merge this branch: bzr merge lp:~cjcurran/friends/call-contacts-at-startup
Reviewer Review Type Date Requested Status
Robert Bruce Park Approve
Review via email: mp+134530@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

Dropped contact stubs and added test coverage, merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'friends/protocols/facebook.py'
--- friends/protocols/facebook.py 2012-11-06 16:05:25 +0000
+++ friends/protocols/facebook.py 2012-11-15 17:40:29 +0000
@@ -330,6 +330,11 @@
330 vcaws_param = EBook.VCardAttributeParam.new('jabber')330 vcaws_param = EBook.VCardAttributeParam.new('jabber')
331 vcaws_param.add_value('-{}@chat.facebook.com'.format(user_id))331 vcaws_param.add_value('-{}@chat.facebook.com'.format(user_id))
332 vcaws.add_param(vcaws_param)332 vcaws.add_param(vcaws_param)
333
334 vcaws_param_2 = EBook.VCardAttributeParam.new('alias')
335 vcaws_param_2.add_value(user_fullname)
336 vcaws.add_param(vcaws_param_2)
337
333 vcard.add_attribute(vcaws)338 vcard.add_attribute(vcaws)
334339
335 if gender is not None:340 if gender is not None:
336341
=== modified file 'friends/protocols/flickr.py'
--- friends/protocols/flickr.py 2012-11-06 17:40:41 +0000
+++ friends/protocols/flickr.py 2012-11-15 17:40:29 +0000
@@ -120,3 +120,8 @@
120 img_url=img_url,120 img_url=img_url,
121 img_src=img_src,121 img_src=img_src,
122 img_thumb=img_thumb)122 img_thumb=img_thumb)
123
124 @feature
125 def contacts(self):
126 pass
127
123128
=== modified file 'friends/protocols/foursquare.py'
--- friends/protocols/foursquare.py 2012-11-06 16:05:25 +0000
+++ friends/protocols/foursquare.py 2012-11-15 17:40:29 +0000
@@ -97,3 +97,7 @@
97 url=CHECKIN_URL.format(access_token=token,97 url=CHECKIN_URL.format(access_token=token,
98 checkin_id=checkin_id),98 checkin_id=checkin_id),
99 )99 )
100
101 @feature
102 def contacts(self):
103 pass
100104
=== modified file 'friends/protocols/identica.py'
--- friends/protocols/identica.py 2012-10-25 05:06:23 +0000
+++ friends/protocols/identica.py 2012-11-15 17:40:29 +0000
@@ -71,3 +71,7 @@
71 useless. Just use search() instead.71 useless. Just use search() instead.
72 """72 """
73 raise NotImplementedError73 raise NotImplementedError
74
75 def contacts(self):
76 pass
77
7478
=== modified file 'friends/protocols/twitter.py'
--- friends/protocols/twitter.py 2012-11-06 16:05:25 +0000
+++ friends/protocols/twitter.py 2012-11-15 17:40:29 +0000
@@ -296,6 +296,11 @@
296 for tweet in response.get(self._search_result_key, []):296 for tweet in response.get(self._search_result_key, []):
297 self._publish_tweet(tweet, stream='search/{}'.format(query))297 self._publish_tweet(tweet, stream='search/{}'.format(query))
298298
299 @feature
300 def contacts(self):
301 pass
302
303
299304
300class RateLimiter(BaseRateLimiter):305class RateLimiter(BaseRateLimiter):
301 """Twitter rate limiter."""306 """Twitter rate limiter."""
@@ -335,3 +340,4 @@
335 else:340 else:
336 wait_secs = rate_delta / rate_count341 wait_secs = rate_delta / rate_count
337 self._limits[url] = wait_secs342 self._limits[url] = wait_secs
343
338344
=== modified file 'friends/service/dispatcher.py'
--- friends/service/dispatcher.py 2012-11-08 15:08:49 +0000
+++ friends/service/dispatcher.py 2012-11-15 17:40:29 +0000
@@ -61,6 +61,12 @@
61 signaler.add_signal('ConnectionOffline', self._on_connection_offline)61 signaler.add_signal('ConnectionOffline', self._on_connection_offline)
62 self._on_connection_online()62 self._on_connection_online()
63 self.Refresh()63 self.Refresh()
64 # This needs to be moved somewhere else if we ever create that
65 # event-based architecture and get away from a single long
66 # running process.
67 for account in self.account_manager.get_all():
68 account.protocol('contacts')
69
6470
65 def _on_connection_online(self):71 def _on_connection_online(self):
66 if self._timer_id is None:72 if self._timer_id is None:

Subscribers

People subscribed via source and target branches

to all changes: