From b04aff30cc6054d2f2ce0596e5731d5eaaf86daf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 6 Oct 2025 14:22:21 +0100
Subject: [PATCH] Blocking based on nicknames

---
 inbox.py | 16 ++++++++++++++++
 utils.py | 11 +++++++++++
 2 files changed, 27 insertions(+)

diff --git a/inbox.py b/inbox.py
index 2fd21ff50..6c5b3cea4 100644
--- a/inbox.py
+++ b/inbox.py
@@ -63,6 +63,7 @@ from utils import get_actor_from_post
 from utils import data_dir
 from utils import is_dm
 from utils import has_actor
+from utils import evil_nickname
 from status import get_status_number
 from httpsig import get_digest_algorithm_from_headers
 from httpsig import verify_post_headers
@@ -1460,6 +1461,8 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
         get_nickname_from_actor(sending_actor)
     if not sending_actor_nickname:
         return False
+    if evil_nickname(sending_actor_nickname):
+        return False
     sending_actor_domain, _ = \
         get_domain_from_actor(sending_actor)
     if not sending_actor_domain:
@@ -3412,6 +3415,19 @@ def run_inbox_queue(server,
         curr_session = session
         if queue_json.get('actor'):
             if isinstance(queue_json['actor'], str):
+                # blocking based upon nickname
+                sender_nickname = get_nickname_from_actor(queue_json['actor'])
+                if evil_nickname(sender_nickname):
+                    if os.path.isfile(queue_filename):
+                        try:
+                            os.remove(queue_filename)
+                        except OSError:
+                            print('EX: run_inbox_queue 11 unable to delete ' +
+                                  str(queue_filename))
+                    if queue:
+                        queue.pop(0)
+                    continue
+
                 sender_domain, _ = get_domain_from_actor(queue_json['actor'])
                 if sender_domain:
                     if sender_domain.endswith('.onion') and \
diff --git a/utils.py b/utils.py
index 7233b0f95..4c45b7aac 100644
--- a/utils.py
+++ b/utils.py
@@ -995,6 +995,17 @@ def evil_incarnate() -> []:
     return ['fedilist.com', 'gab.com', 'gabfed.com', 'spinster.xyz']
 
 
+def evil_nickname(sending_actor_nickname: str) -> bool:
+    """sender nicknames which are automatically rejected
+    """
+    evil_nicks = ('hitler', '1488')
+    nickname_lower = sending_actor_nickname.lower()
+    for nick in evil_nicks:
+        if nick in nickname_lower:
+            return True
+    return False
+
+
 def contains_invalid_chars(json_str: str) -> bool:
     """Does the given json string contain invalid characters?
     """