gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #176 from michael-lazar/support_hidden_scores

Browse Source 
Support hidden scores
This commit is contained in:
Michael Lazar
2015-12-09 22:10:31 -08:00
parent c24c4669a4 2650472c77
commit 5e4a576e64
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtv/content.py
View File

@@ -104,7 +104,8 @@ class Content(object):
data['type'] = 'Comment' data['type'] = 'Comment'
data['body'] = comment.body data['body'] = comment.body
data['created'] = cls.humanize_timestamp(comment.created_utc) data['created'] = cls.humanize_timestamp(comment.created_utc)
data['score'] = '{0} pts'.format(comment.score) data['score'] = '{0} pts'.format(
'-' if comment.score_hidden else comment.score)
data['author'] = name data['author'] = name
data['is_author'] = (name == sub_name) data['is_author'] = (name == sub_name)
data['flair'] = flair data['flair'] = flair
@@ -140,32 +141,29 @@ class Content(object):
data['text'] = sub.selftext data['text'] = sub.selftext
data['created'] = cls.humanize_timestamp(sub.created_utc) data['created'] = cls.humanize_timestamp(sub.created_utc)
data['comments'] = '{0} comments'.format(sub.num_comments) data['comments'] = '{0} comments'.format(sub.num_comments)
data['score'] = '{0} pts'.format(sub.score) data['score'] = '{0} pts'.format(
'-' if sub.hide_score else sub.score)
data['author'] = name data['author'] = name
data['permalink'] = sub.permalink data['permalink'] = sub.permalink
data['subreddit'] = six.text_type(sub.subreddit) data['subreddit'] = six.text_type(sub.subreddit)
data['flair'] = flair data['flair'] = '[{0}]'.format(flair.strip(' []')) if flair else ''
data['url_full'] = sub.url data['url_full'] = sub.url
data['likes'] = sub.likes data['likes'] = sub.likes
data['gold'] = sub.gilded > 0 data['gold'] = sub.gilded > 0
data['nsfw'] = sub.over_18 data['nsfw'] = sub.over_18
data['index'] = None # This is filled in later by the method caller data['index'] = None # This is filled in later by the method caller
if data['flair'] and not data['flair'].startswith('['): if sub.url.split('/r/')[-1] == sub.permalink.split('/r/')[-1]:
data['flair'] = u'[{0}]'.format(data['flair'].strip())
url_full = data['url_full']
if data['permalink'].split('/r/')[-1] == url_full.split('/r/')[-1]:
data['url_type'] = 'selfpost'
data['url'] = 'self.{0}'.format(data['subreddit']) data['url'] = 'self.{0}'.format(data['subreddit'])
elif reddit_link.match(url_full): data['url_type'] = 'selfpost'
data['url_type'] = 'x-post' elif reddit_link.match(sub.url):
# Strip the subreddit name from the permalink to avoid having # Strip the subreddit name from the permalink to avoid having
# submission.subreddit.url make a separate API call # submission.subreddit.url make a separate API call
data['url'] = 'self.{0}'.format(url_full.split('/')[4]) data['url'] = 'self.{0}'.format(sub.url.split('/')[4])
data['url_type'] = 'x-post'
else: else:
data['url'] = sub.url
data['url_type'] = 'external' data['url_type'] = 'external'
data['url'] = url_full
return data return data