From 4f1e173da239c45539baf373b899a210b9c8a442 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Tue, 8 Oct 2013 15:07:56 -0600 Subject: [PATCH] /r/friends: add gilded tab --- r2/r2/lib/pages/pages.py | 4 +++- r2/r2/models/subreddit.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index cc579f440..42566a427 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -563,7 +563,9 @@ class Reddit(Templated): displayed at the top of the Reddit.""" if c.site == Friends: main_buttons = [NamedButton('new', dest='', aliases=['/hot']), - NamedButton('comments')] + NamedButton('comments'), + NamedButton('gilded'), + ] else: main_buttons = [NamedButton('hot', dest='', aliases=['/hot']), NamedButton('new'), diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index c0b09c96c..d6c9111d9 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -990,6 +990,20 @@ class FriendsSR(FakeSubreddit): for friend in friends] return queries.MergedCachedResults(crs) + def get_gilded_comments(self): + from r2.lib.db.queries import get_gilded_user_comments + + if not c.user_is_loggedin: + raise UserRequiredException + + friends = self.get_important_friends(c.user._id) + + if not friends: + return [] + + queries = [get_gilded_user_comments(user_id) for user_id in friends] + return MergedCachedQuery(queries) + class AllSR(FakeSubreddit): name = 'all'