From a72f0b937b59d87c2d49af80dfbf725529e384a6 Mon Sep 17 00:00:00 2001 From: woorst Date: Tue, 28 Jun 2016 16:35:31 -0500 Subject: [PATCH] Apply time period only to appropriatly sorted multireddits --- rtv/content.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rtv/content.py b/rtv/content.py index c4b465a..83ec872 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -380,7 +380,7 @@ class SubredditContent(Content): def from_name(cls, reddit, name, loader, order=None, query=None, listing='r', period=None): - # Strip leading, trailing and redundant backslashes + # Strip leading, trailing, and redundant backslashes n = '' n = ''.join([n + ''.join(list(g)) if k != '/' else '/' \ for k, g in groupby(name)]).strip(' /') @@ -437,8 +437,12 @@ class SubredditContent(Content): elif listing in ['u', 'user']: if '/m/' in name: multireddit = reddit.get_multireddit(*name.split('/')[::2]) - submissions = eval('multireddit.get_{0}{1}(limit=None)' \ - .format((order or 'hot'), time[period])) + if order in ['top', 'controversial']: + submissions = eval('multireddit.get_{0}{1}(limit=None)' \ + .format((order), time[period])) + else: + submissions = eval('multireddit.get_{0}(limit=None)' \ + .format((order or 'hot'))) elif name == 'me': if not reddit.is_oauth_session():