More verbose

main
Bob Mottram 2020-10-11 14:18:27 +01:00
parent 93e554efb8
commit cf729200b0
1 changed files with 7 additions and 4 deletions

View File

@ -2227,10 +2227,6 @@ def inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
followingFilename = \ followingFilename = \
baseDir + '/accounts/' + \ baseDir + '/accounts/' + \
nickname + '@' + domain + '/following.txt' nickname + '@' + domain + '/following.txt'
if not os.path.isfile(followingFilename):
print('No following.txt file exists for ' +
nickname + '@' + domain)
return False
if not postJsonObject.get('actor'): if not postJsonObject.get('actor'):
return False return False
sendingActor = postJsonObject['actor'] sendingActor = postJsonObject['actor']
@ -2239,6 +2235,13 @@ def inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
sendingActorDomain, sendingActorPort = \ sendingActorDomain, sendingActorPort = \
getDomainFromActor(sendingActor) getDomainFromActor(sendingActor)
if sendingActorNickname and sendingActorDomain: if sendingActorNickname and sendingActorDomain:
if not os.path.isfile(followingFilename):
print('No following.txt file exists for ' +
nickname + '@' + domain +
'so not accepting DM from ' +
sendingActorNickname + '@' +
sendingActorDomain)
return False
sendH = \ sendH = \
sendingActorNickname + '@' + sendingActorDomain sendingActorNickname + '@' + sendingActorDomain
if sendH != nickname + '@' + domain: if sendH != nickname + '@' + domain: