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

Merge branch 'load_comments' of https://github.com/woorst/rtv into woorst-load_comments

Browse Source
This commit is contained in:
Michael Lazar
2017-06-07 23:07:11 -04:00
parent 146521924a 7513da27b1
commit 3bb50fc9a9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtv/content.py
View File

@@ -171,6 +171,7 @@ class Content(object):
data['comments'] = '' data['comments'] = ''
data['url_full'] = comment._fast_permalink data['url_full'] = comment._fast_permalink
data['url'] = comment._fast_permalink data['url'] = comment._fast_permalink
data['permalink'] = comment._fast_permalink
data['nsfw'] = comment.over_18 data['nsfw'] = comment.over_18
data['subreddit'] = six.text_type(comment.subreddit) data['subreddit'] = six.text_type(comment.subreddit)
data['url_type'] = 'selfpost' data['url_type'] = 'selfpost'
@@ -565,7 +566,7 @@ class SubredditContent(Content):
raise exceptions.AccountError('Not logged in') raise exceptions.AccountError('Not logged in')
else: else:
order = order or 'new' order = order or 'new'
submissions = reddit.user.get_submitted(sort=order, limit=None) submissions = reddit.user.get_overview(sort=order, limit=None)
elif resource_root == 'u' and resource == 'saved': elif resource_root == 'u' and resource == 'saved':
if not reddit.is_oauth_session(): if not reddit.is_oauth_session():
@@ -578,7 +579,7 @@ class SubredditContent(Content):
order = order or 'new' order = order or 'new'
period = period or 'all' period = period or 'all'
redditor = reddit.get_redditor(resource) redditor = reddit.get_redditor(resource)
submissions = redditor.get_submitted( submissions = redditor.get_overview(
sort=order, time=period, limit=None) sort=order, time=period, limit=None)
elif resource == 'front': elif resource == 'front':