From f4ea094e933ff01f919005e71d621f0e14c993e5 Mon Sep 17 00:00:00 2001
From: Obosob <obosob@riseup.net>
Date: Thu, 30 Jul 2015 16:46:47 +0100
Subject: [PATCH] address Brobin's comments on #126

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

diff --git a/rtv/content.py b/rtv/content.py
index 62fe0d7..2bdb6b3 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -130,7 +130,7 @@ class BaseContent(object):
             stripped_url = reddit_link_no_host.search(sub.url).group()
             stripped_comments = reddit_link_no_host.search(sub.permalink).group()
             data['url'] = ('selfpost' if stripped_url == stripped_comments
-                    else 'x-post via {}'.format(strip_subreddit_url(sub.url)) )
+                    else 'x-post')
         else:
             data['url'] = sub.url
         data['likes'] = sub.likes
diff --git a/rtv/subreddit.py b/rtv/subreddit.py
index 03501ac..c27b45f 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit.py
@@ -9,7 +9,7 @@ from .exceptions import SubredditError, AccountError
 from .page import BasePage, Navigator, BaseController
 from .submission import SubmissionPage
 from .content import SubredditContent
-from .helpers import open_browser, open_editor
+from .helpers import open_browser, open_editor, strip_subreddit_url
 from .docs import SUBMISSION_FILE
 from .history import load_history, save_history
 from .curses_helpers import (Color, LoadScreen, add_line, get_arrow, get_gold,
@@ -109,7 +109,7 @@ class SubredditPage(BasePage):
         data = self.content.get(self.nav.absolute_index)
 
         url = data['url_full']
-        if data['url'] != url:
+        if data['url'] in ['x-post', 'selfpost']:
             page = SubmissionPage(self.stdscr, self.reddit, url=url)
             page.loop()
         else:
@@ -178,7 +178,10 @@ class SubredditPage(BasePage):
             seen = (data['url_full'] in history)
             link_color = Color.MAGENTA if seen else Color.BLUE
             attr = curses.A_UNDERLINE | link_color
-            add_line(win, u'{url}'.format(**data), row, 1, attr)
+            if data['url'] == 'x-post':
+                add_line(win, u'x-post via {}'.format(strip_subreddit_url(data['url_full'])), row, 1, attr)
+            else:
+                add_line(win, u'{url}'.format(**data), row, 1, attr)
 
         row = n_title + offset + 1
         if row in valid_rows: