From 0b7cb58f441799df8051fb4a7ce6394f8f9ab2ea Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Tue, 19 May 2015 18:37:45 -0400 Subject: [PATCH] Use batch lookedup moderator/subscriber/contributor for Subreddit json. --- r2/r2/lib/jsontemplates.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/r2/r2/lib/jsontemplates.py b/r2/r2/lib/jsontemplates.py index 8dcdcd499f..dbf87c0bbc 100644 --- a/r2/r2/lib/jsontemplates.py +++ b/r2/r2/lib/jsontemplates.py @@ -300,11 +300,21 @@ def thing_attr(self, thing, attr): return safemarkdown(thing.description) elif attr == 'public_description_html': return safemarkdown(thing.public_description) - elif attr in ('is_banned', 'is_contributor', 'is_moderator', - 'is_subscriber'): + elif attr == "is_moderator": if c.user_is_loggedin: - check_func = getattr(thing, attr) - return bool(check_func(c.user)) + return thing.moderator + return None + elif attr == "is_contributor": + if c.user_is_loggedin: + return thing.contributor + return None + elif attr == "is_subscriber": + if c.user_is_loggedin: + return thing.subscriber + return None + elif attr == 'is_banned': + if c.user_is_loggedin: + return bool(thing.is_banned(c.user)) return None elif attr == 'submit_text_html': return safemarkdown(thing.submit_text)