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

Merge branch 'master' of https://github.com/shanhind/rtv into shanhind-master

Browse Source
This commit is contained in:
Michael Lazar
2015-03-12 15:15:14 -07:00
parent 47ad49a189 34dfa53b9f
commit d4943052d4
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtv/content.py
View File

@@ -140,6 +140,7 @@ class BaseContent(object):
sub_author = (clean(comment.submission.author.name) if
getattr(comment.submission, 'author') else '[deleted]')
data['is_author'] = (data['author'] == sub_author)
data['flair'] = (clean(comment.author_flair_text) if comment.author_flair_text else "")
return data
@@ -161,9 +162,11 @@ class BaseContent(object):
data['comments'] = '{} comments'.format(sub.num_comments)
data['score'] = '{} pts'.format(sub.score)
data['author'] = (clean(sub.author.name) if getattr(sub, 'author')
else '[deleted]')
data['permalink'] = clean(sub.permalink)
data['subreddit'] = strip_subreddit_url(sub.permalink)
data['flair'] = (clean(sub.link_flair_text) if sub.link_flair_text else "")
data['url_full'] = clean(sub.url)
data['url'] = ('selfpost' if is_selfpost(sub.url) else clean(sub.url))
@@ -365,6 +368,7 @@ class SubredditContent(BaseContent):
# TODO: Trap specific errors
raise SubredditNameError(display_name)
return content
def get(self, index, n_cols=70):