From cf27367719a9a8488c2da47f39f894ea0d6b0dbd Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Thu, 9 Jun 2022 17:05:42 +0100
Subject: [PATCH] Tidying

---
 announce.py |  3 +--
 blocking.py | 14 +++++++++-----
 outbox.py   |  3 +--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/announce.py b/announce.py
index 2507374fc..1bc3c538f 100644
--- a/announce.py
+++ b/announce.py
@@ -412,8 +412,7 @@ def send_undo_announce_via_server(base_dir: str, session,
 
 
 def outbox_undo_announce(recent_posts_cache: {},
-                         base_dir: str, http_prefix: str,
-                         nickname: str, domain: str, port: int,
+                         base_dir: str, nickname: str, domain: str,
                          message_json: {}, debug: bool) -> None:
     """ When an undo announce is received by the outbox from c2s
     """
diff --git a/blocking.py b/blocking.py
index 7d8112968..b4668fa8d 100644
--- a/blocking.py
+++ b/blocking.py
@@ -119,7 +119,8 @@ def add_block(base_dir: str, nickname: str, domain: str,
     followers_filename = \
         acct_dir(base_dir, nickname, domain) + '/followers.txt'
     if os.path.isfile(followers_filename):
-        if block_handle + '\n' in open(followers_filename).read():
+        if block_handle + '\n' in open(followers_filename,
+                                       encoding='utf-8').read():
             followers_str = ''
             try:
                 with open(followers_filename, 'r',
@@ -186,7 +187,8 @@ def remove_global_block(base_dir: str,
     else:
         unblock_hashtag = unblock_nickname
         if os.path.isfile(unblocking_filename):
-            if unblock_hashtag + '\n' in open(unblocking_filename).read():
+            if unblock_hashtag + '\n' in open(unblocking_filename,
+                                              encoding='utf-8').read():
                 try:
                     with open(unblocking_filename, 'r',
                               encoding='utf-8') as fp_unblock:
@@ -356,7 +358,8 @@ def is_blocked_domain(base_dir: str, domain: str,
             global_blocking_filename = base_dir + '/accounts/blocking.txt'
             if os.path.isfile(global_blocking_filename):
                 try:
-                    with open(global_blocking_filename, 'r') as fp_blocked:
+                    with open(global_blocking_filename, 'r',
+                              encoding='utf-8') as fp_blocked:
                         blocked_str = fp_blocked.read()
                         if '*@' + domain + '\n' in blocked_str:
                             return True
@@ -370,10 +373,11 @@ def is_blocked_domain(base_dir: str, domain: str,
         allow_filename = base_dir + '/accounts/allowedinstances.txt'
         # instance allow list
         if not short_domain:
-            if domain not in open(allow_filename).read():
+            if domain not in open(allow_filename, encoding='utf-8').read():
                 return True
         else:
-            if short_domain not in open(allow_filename).read():
+            if short_domain not in open(allow_filename,
+                                        encoding='utf-8').read():
                 return True
 
     return False
diff --git a/outbox.py b/outbox.py
index 703bc9930..b7a912a9a 100644
--- a/outbox.py
+++ b/outbox.py
@@ -601,8 +601,7 @@ def post_message_to_outbox(session, translate: {},
     if debug:
         print('DEBUG: handle any undo announce requests')
     outbox_undo_announce(recent_posts_cache,
-                         base_dir, http_prefix,
-                         post_to_nickname, domain, port,
+                         base_dir, post_to_nickname, domain,
                          message_json, debug)
 
     if debug: