From 6fa1ec4740fd2e06f883c6abbdbda5d986d1e8e0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Tue, 29 Nov 2022 14:03:52 +0000
Subject: [PATCH] Indicate blocked new accounts

---
 daemon.py                |  3 ++-
 webapp_person_options.py | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/daemon.py b/daemon.py
index acc9d5207..511ed7470 100644
--- a/daemon.py
+++ b/daemon.py
@@ -8385,7 +8385,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.news_instance,
                                     authorized,
                                     access_keys, is_group,
-                                    self.server.theme_name)
+                                    self.server.theme_name,
+                                    self.server.blocked_cache)
             if msg:
                 msg = msg.encode('utf-8')
                 msglen = len(msg)
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 64f4a7b1e..f946a74a1 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -163,7 +163,8 @@ def html_person_options(default_timeline: str,
                         authorized: bool,
                         access_keys: {},
                         is_group: bool,
-                        theme: str) -> str:
+                        theme: str,
+                        blocked_cache: []) -> str:
     """Show options for a person: view/follow/block/report
     """
     options_domain, options_port = get_domain_from_actor(options_actor)
@@ -300,10 +301,15 @@ def html_person_options(default_timeline: str,
         new_domain, _ = get_domain_from_actor(moved_to)
         if new_nickname and new_domain:
             new_handle = new_nickname + '@' + new_domain
+            blocked_icon_str = ''
+            if is_blocked(base_dir, nickname, domain,
+                          new_nickname, new_domain, blocked_cache):
+                blocked_icon_str = '❌'
             options_str += \
                 '  <p class="optionsText">' + \
                 translate['New account'] + \
-                ': <a href="' + moved_to + '">@' + new_handle + '</a></p>\n'
+                ': <a href="' + moved_to + '">@' + new_handle + '</a>' + \
+                blocked_icon_str + '</p>\n'
     elif also_known_as:
         other_accounts_html = \
             '  <p class="optionsText">' + \