handlers: use optimization in snarfed/granary@4d32457 to avoid double fetches

snarfed · snarfed · commit f823e413dcb2 · 2016-05-04T13:21:58.000-07:00
diff --git a/handlers.py b/handlers.py
@@ -242,9 +242,10 @@ def get_item(self, id):
 
 class CommentHandler(ItemHandler):
   def get_item(self, post_id, id):
-    cmt = self.source.get_comment(
-      id, activity_id=post_id, activity_author_id=self.source.key.id())
     post = self.get_post(post_id)
+    cmt = self.source.get_comment(
+      id, activity_id=post_id, activity_author_id=self.source.key.id(),
+      activity=post)
     if post:
       originals, mentions = original_post_discovery.discover(
         self.source, post, fetch_hfeed=False)
@@ -255,8 +256,9 @@ def get_item(self, post_id, id):
 
 class LikeHandler(ItemHandler):
   def get_item(self, post_id, user_id):
-    like = self.source.get_like(self.source.key.string_id(), post_id, user_id)
     post = self.get_post(post_id)
+    like = self.source.get_like(self.source.key.string_id(), post_id, user_id,
+                                activity=post)
     if post:
       originals, mentions = original_post_discovery.discover(
         self.source, post, fetch_hfeed=False)
@@ -280,9 +282,9 @@ def get_title(self, obj):
 
 class ReactionHandler(ItemHandler):
   def get_item(self, post_id, user_id, reaction_id):
-    reaction = self.source.gr_source.get_reaction(
-      self.source.key.string_id(), post_id, user_id, reaction_id)
     post = self.get_post(post_id)
+    reaction = self.source.gr_source.get_reaction(
+      self.source.key.string_id(), post_id, user_id, reaction_id, activity=post)
     if post:
       originals, mentions = original_post_discovery.discover(
         self.source, post, fetch_hfeed=False)
@@ -292,13 +294,13 @@ def get_item(self, post_id, user_id, reaction_id):
 
 class RepostHandler(ItemHandler):
   def get_item(self, post_id, share_id):
+    post = self.get_post(post_id)
     repost = self.source.gr_source.get_share(
-      self.source.key.string_id(), post_id, share_id)
+      self.source.key.string_id(), post_id, share_id, activity=post)
     # webmention receivers don't want to see their own post in their
     # comments, so remove attachments before rendering.
     if repost and 'attachments' in repost:
       del repost['attachments']
-    post = self.get_post(post_id)
     if post:
       originals, mentions = original_post_discovery.discover(
         self.source, post, fetch_hfeed=False)
@@ -310,7 +312,7 @@ class RsvpHandler(ItemHandler):
   def get_item(self, event_id, user_id):
     event = self.source.gr_source.get_event(event_id)
     rsvp = self.source.gr_source.get_rsvp(
-      self.source.key.string_id(), event_id, user_id)
+      self.source.key.string_id(), event_id, user_id, event=event)
     if event:
       originals, mentions = original_post_discovery.discover(
         self.source, event, fetch_hfeed=False)
diff --git a/models.py b/models.py
@@ -315,26 +315,23 @@ def get_activities_response(self, **kwargs):
   def get_activities(self, **kwargs):
     return self.get_activities_response(**kwargs)['items']
 
-  def get_comment(self, comment_id, activity_id=None, activity_author_id=None):
+  def get_comment(self, comment_id, **kwargs):
     """Returns a comment from this source.
 
-    Passes through to granary by default. May be overridden
-    by subclasses.
+    Passes through to granary by default. May be overridden by subclasses.
 
     Args:
       comment_id: string, site-specific comment id
-      activity_id: string, site-specific activity id
-      activity_author_id: string, site-specific activity author id, optional
+      kwargs: passed to granary.Source.get_comment
 
     Returns: dict, decoded ActivityStreams comment object, or None
     """
-    comment = self.gr_source.get_comment(comment_id, activity_id=activity_id,
-                                         activity_author_id=activity_author_id)
+    comment = self.gr_source.get_comment(comment_id, **kwargs)
     if comment:
       self._inject_user_urls(comment)
     return comment
 
-  def get_like(self, activity_user_id, activity_id, like_user_id):
+  def get_like(self, activity_user_id, activity_id, like_user_id, **kwargs):
     """Returns an ActivityStreams 'like' activity object.
 
     Passes through to granary by default. May be overridden
@@ -344,8 +341,10 @@ def get_like(self, activity_user_id, activity_id, like_user_id):
       activity_user_id: string id of the user who posted the original activity
       activity_id: string activity id
       like_user_id: string id of the user who liked the activity
+      kwargs: passed to granary.Source.get_comment
     """
-    return self.gr_source.get_like(activity_user_id, activity_id, like_user_id)
+    return self.gr_source.get_like(activity_user_id, activity_id, like_user_id,
+                                   **kwargs)
 
   def _inject_user_urls(self, activity):
     """Adds this user's web site URLs to their user mentions (in tags), in place."""
diff --git a/twitter.py b/twitter.py
@@ -110,7 +110,7 @@ def search_for_links(self):
 
     return results
 
-  def get_like(self, activity_user_id, activity_id, like_user_id):
+  def get_like(self, activity_user_id, activity_id, like_user_id, **kwargs):
     """Returns an ActivityStreams 'like' activity object for a favorite.
 
     We get Twitter favorites by scraping HTML, and we only get the first page,
@@ -121,14 +121,15 @@ def get_like(self, activity_user_id, activity_id, like_user_id):
       activity_user_id: string id of the user who posted the original activity
       activity_id: string activity id
       like_user_id: string id of the user who liked the activity
+      kwargs: passed to granary.Source.get_comment
     """
     id = self.gr_source.tag_uri('%s_favorited_by_%s' % (activity_id, like_user_id))
     resp = models.Response.get_by_id(id)
     if resp:
       return json.loads(resp.response_json)
     else:
       return super(Twitter, self).get_like(activity_user_id, activity_id,
-                                           like_user_id)
+                                           like_user_id, **kwargs)
 
   def is_private(self):
     """Returns True if this Twitter account is protected.
