From e7239a078b8bb3f2d7e507ecd55fe5eb03c1cbce Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 5 Feb 2020 17:29:38 +0000 Subject: [PATCH] Another content filter check --- inbox.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inbox.py b/inbox.py index 886f96b00..0c4dcf026 100644 --- a/inbox.py +++ b/inbox.py @@ -1429,7 +1429,8 @@ def estimateNumberOfEmoji(content: str) -> int: """ return int(content.count(':')/2) -def validPostContent(messageJson: {},maxMentions: int,maxEmoji: int) -> bool: +def validPostContent(baseDir: str,nickname: str,domain: str, \ + messageJson: {},maxMentions: int,maxEmoji: int) -> bool: """Is the content of a received post valid? Check for bad html Check for hellthreads @@ -1477,6 +1478,10 @@ def validPostContent(messageJson: {},maxMentions: int,maxEmoji: int) -> bool: print('REJECT: '+messageJson['object']['id']) print('REJECT: Too many tags in post - '+messageJson['object']['tag']) return False + # check for filtered content + if not isFiltered(baseDir,nickname,domain,messageJson['object']['content']): + print('REJECT: content filtered') + return False print('ACCEPT: post content is valid') return True @@ -1854,7 +1859,8 @@ def inboxAfterCapabilities(recentPostsCache: {},maxRecentPosts: int, \ else: postJsonObject=messageJson - if validPostContent(postJsonObject,maxMentions,maxEmoji): + nickname=handle.split('@')[0] + if validPostContent(baseDir,nickname,domain,postJsonObject,maxMentions,maxEmoji): # replace YouTube links, so they get less tracking data replaceYouTube(postJsonObject) @@ -1862,8 +1868,6 @@ def inboxAfterCapabilities(recentPostsCache: {},maxRecentPosts: int, \ updateIndexList=['inbox'] populateReplies(baseDir,httpPrefix,domain,postJsonObject,maxReplies,debug) - nickname=handle.split('@')[0] - # if this is a reply to a question then update the votes questionJson=questionUpdateVotes(baseDir,nickname,domain,postJsonObject) if questionJson: