From d6ef3b8743e50418cb1bb8ec3f778b204f7ee98f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 2 Nov 2020 17:48:35 +0000
Subject: [PATCH] Return to default timeline

---
 daemon.py       | 3 ++-
 webinterface.py | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/daemon.py b/daemon.py
index ee65a5330..823a96a8c 100644
--- a/daemon.py
+++ b/daemon.py
@@ -8522,7 +8522,8 @@ class PubServer(BaseHTTPRequestHandler):
                                   baseDir,
                                   path, domain,
                                   port,
-                                  httpPrefix).encode('utf-8')
+                                  httpPrefix,
+                                  self.server.defaultTimeline).encode('utf-8')
             if msg:
                 self._set_headers('text/html', len(msg),
                                   cookie, callingDomain)
diff --git a/webinterface.py b/webinterface.py
index 9506dee04..7e65d060f 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1480,11 +1480,11 @@ def htmlEditNewsPost(cssCache: {}, translate: {}, baseDir: str, path: str,
 
 
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
-                    domain: str, port: int, httpPrefix: str) -> str:
+                    domain: str, port: int, httpPrefix: str,
+                    defaultTimeline: str) -> str:
     """Shows the edit profile screen
     """
     imageFormats = '.png, .jpg, .jpeg, .gif, .webp, .avif'
-    pathOriginal = path
     path = path.replace('/inbox', '').replace('/outbox', '')
     path = path.replace('/shares', '')
     nickname = getNicknameFromActor(path)
@@ -1678,7 +1678,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
 
     moderatorsStr = ''
     themesDropdown = ''
-    instanceStr = '';
+    instanceStr = ''
 
     adminNickname = getConfigParam(baseDir, 'admin')
     if adminNickname:
@@ -1799,7 +1799,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
 
     # top banner
     editProfileForm += \
-        '<a href="/users/' + nickname + '" title="' + \
+        '<a href="/users/' + nickname + '/' + defaultTimeline + '" title="' + \
         translate['Switch to profile view'] + '" alt="' + \
         translate['Switch to profile view'] + '">\n'
     editProfileForm += '<img loading="lazy" class="timeline-banner" src="' + \