indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Check for missing onion domain

merge-requests/30/head
Bob Mottram 2021-02-28 18:21:12 +00:00
parent a71c548a7f
commit 079c724bb9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epicyon.py
View File

@ -859,8 +859,7 @@ configOnionDomain = getConfigParam(baseDir, 'onion')
if configOnionDomain: if configOnionDomain:
onionDomain = configOnionDomain onionDomain = configOnionDomain
else: else:
# Note: this should not be None onionDomain = None
onionDomain = ''
# get i2p domain name from configuration # get i2p domain name from configuration
configi2pDomain = getConfigParam(baseDir, 'i2pDomain') configi2pDomain = getConfigParam(baseDir, 'i2pDomain')
@ -869,7 +868,6 @@ if configi2pDomain:
else: else:
# Note: this should not be None # Note: this should not be None
i2pDomain = None i2pDomain = None
onionDomain = ''
# get port number from configuration # get port number from configuration
configPort = getConfigParam(baseDir, 'port') configPort = getConfigParam(baseDir, 'port')

7
inbox.py
View File

@ -1370,8 +1370,11 @@ def _receiveAnnounce(recentPostsCache: {},
YTReplacementDomain, YTReplacementDomain,
allowLocalNetworkAccess) allowLocalNetworkAccess)
if not postJsonObject: if not postJsonObject:
if domain not in messageJson['object'] and \ notInOnion = True
onionDomain not in messageJson['object']: if onionDomain:
if onionDomain in messageJson['object']:
notInOnion = False
if domain not in messageJson['object'] and notInOnion:
if os.path.isfile(postFilename): if os.path.isfile(postFilename):
# if the announce can't be downloaded then remove it # if the announce can't be downloaded then remove it
os.remove(postFilename) os.remove(postFilename)