From fa28b8fa7daf5be3a26f94a1024a2ac306a7dbf3 Mon Sep 17 00:00:00 2001
From: Michael Lazar <mlazar@knuedge.com>
Date: Thu, 7 Jul 2016 18:12:43 -0700
Subject: [PATCH] in progress

---
 rtv/content.py   | 20 ++++++++++++--------
 rtv/subreddit.py |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rtv/content.py b/rtv/content.py
index 8ca0324..722d167 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -127,10 +127,11 @@ class Content(object):
         displayed through the terminal.
 
         Definitions:
-            permalink - Full URL to the submission comments.
-            url_full - Link that the submission points to.
-            url - URL that is displayed on the subreddit page, may be
-                  "selfpost" or "x-post" or a link.
+            permalink - URL to the reddit page with submission comments.
+            url_full - URL that the submission points to.
+            url - URL that will be displayed on the subreddit page, may be
+                "selfpost", "x-post submission", "x-post subreddit", or an
+                external link.
         """
 
         reddit_link = re.compile(
@@ -146,8 +147,7 @@ class Content(object):
         data['text'] = sub.selftext
         data['created'] = cls.humanize_timestamp(sub.created_utc)
         data['comments'] = '{0} comments'.format(sub.num_comments)
-        data['score'] = '{0} pts'.format(
-            '-' if sub.hide_score else sub.score)
+        data['score'] = '{0} pts'.format('-' if sub.hide_score else sub.score)
         data['author'] = name
         data['permalink'] = sub.permalink
         data['subreddit'] = six.text_type(sub.subreddit)
@@ -166,8 +166,12 @@ class Content(object):
         elif reddit_link.match(sub.url):
             # Strip the subreddit name from the permalink to avoid having
             # submission.subreddit.url make a separate API call
-            data['url'] = 'self.{0}'.format(sub.url.split('/')[4])
-            data['url_type'] = 'x-post'
+            url_parts = sub.url.split('/')
+            data['url'] = 'self.{0}'.format(url_parts[4])
+            if 'comments' in url_parts:
+                data['url_type'] = 'x-post submission'
+            else:
+                data['url_type'] = 'x-post subreddit'
         else:
             data['url'] = sub.url
             data['url_type'] = 'external'
diff --git a/rtv/subreddit.py b/rtv/subreddit.py
index a03cb1a..484676d 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit.py
@@ -100,7 +100,7 @@ class SubredditPage(Page):
         data = self.content.get(self.nav.absolute_index)
         if data['url_type'] == 'selfpost':
             self.open_submission()
-        elif data['url_type'] == 'x-post':
+        elif data['url_type'] == 'x-post comment':
             self.open_submission(url=data['url_full'])
             self.config.history.add(data['url_full'])
         else: