merge-requests/6/head
Bob Mottram 2020-02-05 17:41:24 +00:00
parent 419b5746c7
commit da30508d67
1 changed files with 2 additions and 2 deletions

View File

@ -134,7 +134,7 @@ def isBlocked(baseDir: str,nickname: str,domain: str, \
if os.path.isfile(globalBlockingFilename):
if '*@'+blockDomain in open(globalBlockingFilename).read():
return True
if blockNickname and blockDomain:
if blockNickname:
blockHandle=blockNickname+'@'+blockDomain
if blockHandle in open(globalBlockingFilename).read():
return True
@ -148,7 +148,7 @@ def isBlocked(baseDir: str,nickname: str,domain: str, \
if os.path.isfile(blockingFilename):
if '*@'+blockDomain in open(blockingFilename).read():
return True
if blockNickname and blockDomain:
if blockNickname:
blockHandle=blockNickname+'@'+blockDomain
if blockHandle in open(blockingFilename).read():
return True