From 4a13a0685d8a7368743aaac9ea996b907f31686d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 28 Jul 2021 20:16:42 +0100
Subject: [PATCH] Open left column shared item in same tab

---
 webapp_column_left.py | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/webapp_column_left.py b/webapp_column_left.py
index b13bf03a2..5e31af0b2 100644
--- a/webapp_column_left.py
+++ b/webapp_column_left.py
@@ -168,6 +168,7 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
         if linksList and sharesList:
             linksList = sharesList + linksList
 
+    newTabStr = ' target="_blank" rel="nofollow noopener noreferrer"'
     if linksList:
         htmlStr += '<nav>\n'
         for lineStr in linksList:
@@ -218,22 +219,30 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
                     if lineStr.endswith(','):
                         lineStr = lineStr[:len(lineStr)-1]
                     # add link to the returned html
-                    htmlStr += \
-                        '      <p><a href="' + linkStr + \
-                        '" target="_blank" ' + \
-                        'rel="nofollow noopener noreferrer">' + \
-                        lineStr + '</a></p>\n'
+                    if '?showshare=' not in linkStr:
+                        htmlStr += \
+                            '      <p><a href="' + linkStr + \
+                            '"' + newTabStr + '>' + \
+                            lineStr + '</a></p>\n'
+                    else:
+                        htmlStr += \
+                            '      <p><a href="' + linkStr + \
+                            '">' + lineStr + '</a></p>\n'
                     linksFileContainsEntries = True
                 elif lineStr.startswith('=> '):
                     # gemini style link
                     lineStr = lineStr.replace('=> ', '')
                     lineStr = lineStr.replace(linkStr, '')
                     # add link to the returned html
-                    htmlStr += \
-                        '      <p><a href="' + linkStr + \
-                        '" target="_blank" ' + \
-                        'rel="nofollow noopener noreferrer">' + \
-                        lineStr.strip() + '</a></p>\n'
+                    if '?showshare=' not in linkStr:
+                        htmlStr += \
+                            '      <p><a href="' + linkStr + \
+                            '"' + newTabStr + '>' + \
+                            lineStr.strip() + '</a></p>\n'
+                    else:
+                        htmlStr += \
+                            '      <p><a href="' + linkStr + \
+                            '">' + lineStr.strip() + '</a></p>\n'
                     linksFileContainsEntries = True
             else:
                 if lineStr.startswith('#') or lineStr.startswith('*'):