From f78ac5e2c0ba77f73437f09c16b331480e60cea5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sun, 1 Jan 2023 13:33:31 +0000
Subject: [PATCH 1/4] Show search result from view button on person options
 screen

---
 daemon.py | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 1 deletion(-)

diff --git a/daemon.py b/daemon.py
index 331e2e62e..7b2c7c1f8 100644
--- a/daemon.py
+++ b/daemon.py
@@ -3086,6 +3086,103 @@ class PubServer(BaseHTTPRequestHandler):
         if '&submitView=' in options_confirm_params:
             if debug:
                 print('Viewing ' + options_actor)
+
+            show_published_date_only = \
+                self.server.show_published_date_only
+            allow_local_network_access = \
+                self.server.allow_local_network_access
+
+            access_keys = self.server.access_keys
+            if self.server.key_shortcuts.get(chooser_nickname):
+                access_keys = self.server.key_shortcuts[chooser_nickname]
+
+            signing_priv_key_pem = \
+                self.server.signing_priv_key_pem
+            twitter_replacement_domain = \
+                self.server.twitter_replacement_domain
+            peertube_instances = \
+                self.server.peertube_instances
+            yt_replace_domain = \
+                self.server.yt_replace_domain
+            cached_webfingers = \
+                self.server.cached_webfingers
+            recent_posts_cache = \
+                self.server.recent_posts_cache
+            timezone = None
+            if self.server.account_timezone.get(chooser_nickname):
+                timezone = \
+                    self.server.account_timezone.get(chooser_nickname)
+
+            profile_handle = remove_eol(options_actor).strip()
+
+            # establish the session
+            curr_proxy_type = self.server.proxy_type
+            if '.onion/' in profile_handle or \
+               profile_handle.endswith('.onion'):
+                curr_proxy_type = 'tor'
+                curr_session = self.server.session_onion
+            elif ('.i2p/' in profile_handle or
+                  profile_handle.endswith('.i2p')):
+                curr_proxy_type = 'i2p'
+                curr_session = self.server.session_i2p
+
+            curr_session = \
+                self._establish_session("handle search",
+                                        curr_session,
+                                        curr_proxy_type)
+            if not curr_session:
+                self.server.postreq_busy = False
+                return
+
+            bold_reading = False
+            if self.server.bold_reading.get(chooser_nickname):
+                bold_reading = True
+
+            min_images_for_accounts = \
+                self.server.min_images_for_accounts
+            profile_str = \
+                html_profile_after_search(recent_posts_cache,
+                                          self.server.max_recent_posts,
+                                          self.server.translate,
+                                          base_dir,
+                                          users_path,
+                                          http_prefix,
+                                          chooser_nickname,
+                                          domain,
+                                          port,
+                                          profile_handle,
+                                          curr_session,
+                                          cached_webfingers,
+                                          self.server.person_cache,
+                                          self.server.debug,
+                                          self.server.project_version,
+                                          yt_replace_domain,
+                                          twitter_replacement_domain,
+                                          show_published_date_only,
+                                          self.server.default_timeline,
+                                          peertube_instances,
+                                          allow_local_network_access,
+                                          self.server.theme_name,
+                                          access_keys,
+                                          self.server.system_language,
+                                          self.server.max_like_count,
+                                          signing_priv_key_pem,
+                                          self.server.cw_lists,
+                                          self.server.lists_enabled,
+                                          timezone,
+                                          self.server.onion_domain,
+                                          self.server.i2p_domain,
+                                          bold_reading,
+                                          self.server.dogwhistles,
+                                          min_images_for_accounts)
+            if profile_str:
+                msg = profile_str.encode('utf-8')
+                msglen = len(msg)
+                self._login_headers('text/html',
+                                    msglen, calling_domain)
+                self._write(msg)
+                self.server.postreq_busy = False
+                return
             self._redirect_headers(options_actor,
                                    cookie, calling_domain)
             self.server.postreq_busy = False
@@ -4487,6 +4584,10 @@ class PubServer(BaseHTTPRequestHandler):
             elif ('@' in search_str or
                   ('://' in search_str and
                    has_users_path(search_str))):
+                remote_only = False
+                if search_str.endswith(';remote'):
+                    search_str = search_str.replace(';remote', '')
+                    remote_only = True
                 if search_str.endswith(':') or \
                    search_str.endswith(';') or \
                    search_str.endswith('.'):
@@ -4506,7 +4607,8 @@ class PubServer(BaseHTTPRequestHandler):
                 profile_path_str = path.replace('/searchhandle', '')
 
                 # are we already following the searched for handle?
-                if is_following_actor(base_dir, nickname, domain, search_str):
+                if not remote_only and \
+                   is_following_actor(base_dir, nickname, domain, search_str):
                     # get the actor
                     if not has_users_path(search_str):
                         search_nickname = get_nickname_from_actor(search_str)

From 3579dcaad4cfaadb2a6b2bf1e9953570ce4868bc Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sun, 1 Jan 2023 13:48:06 +0000
Subject: [PATCH 2/4] Don't show follow button if already following

---
 webapp_profile.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index f913cd662..166388b2e 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -62,6 +62,7 @@ from cwtch import get_cwtch_address
 from filters import is_filtered
 from follow import is_follower_of_person
 from follow import get_follower_domains
+from follow import is_following_actor
 from webapp_frontscreen import html_front_screen
 from webapp_utils import html_following_dropdown
 from webapp_utils import edit_number_field
@@ -338,10 +339,13 @@ def html_profile_after_search(recent_posts_cache: {}, max_recent_posts: int,
             '    <center>\n'
         profile_str += \
             '      <input type="hidden" name="actor" value="' + \
-            person_url + '">\n' + \
-            '      <button type="submit" class="button" name="submitYes" ' + \
-            'accesskey="' + access_keys['followButton'] + '">' + \
-            translate[follow_str] + '</button>\n'
+            person_url + '">\n'
+        if not is_following_actor(base_dir, nickname, domain, person_url):
+            profile_str += \
+                '      <button type="submit" class="button" ' + \
+                'name="submitYes" ' + \
+                'accesskey="' + access_keys['followButton'] + '">' + \
+                translate[follow_str] + '</button>\n'
         profile_str += \
             '      <button type="submit" class="button" name="submitView" ' + \
             'accesskey="' + access_keys['viewButton'] + '">' + \

From 398cc2e01fd180e3ada30a210862d3cd3f294660 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sun, 1 Jan 2023 14:28:22 +0000
Subject: [PATCH 3/4] Add text mode separator to profile search result

---
 webapp_profile.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 166388b2e..510bf1130 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -380,6 +380,7 @@ def html_profile_after_search(recent_posts_cache: {}, max_recent_posts: int,
                         session, outbox_url, as_header, project_version,
                         http_prefix, from_domain, debug)
     if user_feed:
+        text_mode_separator = '<div class="transparent"><hr></div>'
         minimize_all_images = False
         if nickname in min_images_for_accounts:
             minimize_all_images = True
@@ -391,6 +392,7 @@ def html_profile_after_search(recent_posts_cache: {}, max_recent_posts: int,
                 continue
 
             profile_str += \
+                text_mode_separator + \
                 individual_post_as_html(signing_priv_key_pem,
                                         True, recent_posts_cache,
                                         max_recent_posts,
@@ -421,7 +423,7 @@ def html_profile_after_search(recent_posts_cache: {}, max_recent_posts: int,
     instance_title = get_config_param(base_dir, 'instanceTitle')
     return html_header_with_external_style(css_filename,
                                            instance_title, None) + \
-        profile_str + html_footer()
+        profile_str + text_mode_separator + html_footer()
 
 
 def _get_profile_header(base_dir: str, http_prefix: str, nickname: str,

From e409d93512c1038f3c25e883ddad750965fecd77 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sun, 1 Jan 2023 14:54:12 +0000
Subject: [PATCH 4/4] Link to conversation view

---
 webapp_post.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp_post.py b/webapp_post.py
index ab507c401..9d9a28184 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -2370,7 +2370,9 @@ def individual_post_as_html(signing_priv_key_pem: str,
         if content_license_url:
             footer_str += _get_copyright_footer(content_license_url,
                                                 time_class)
-        footer_str += '<a href="' + published_link + \
+        conv_link = '/users/' + nickname + '?convthread=' + \
+            published_link.replace('/', '--')
+        footer_str += '<a href="' + conv_link + \
             '" class="' + time_class + '" tabindex="10">' + \
             published_str + '</a>\n'
     else: