From 163f42957534bee6c2d05c3638cf5295621b63f4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 29 Apr 2023 21:39:32 +0100 Subject: [PATCH] Check for none --- blocking.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blocking.py b/blocking.py index 99075e6b9..e77913c05 100644 --- a/blocking.py +++ b/blocking.py @@ -694,8 +694,9 @@ def is_blocked(base_dir: str, nickname: str, domain: str, # account level block list blocking_filename = account_dir + '/blocking.txt' if os.path.isfile(blocking_filename): - if text_in_file(block_nickname + '@*' + '\n', blocking_filename): - return True + if block_nickname: + if text_in_file(block_nickname + '@*\n', blocking_filename): + return True if text_in_file('*@' + block_domain + '\n', blocking_filename): return True if block_handle: