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

Remove rejected posts from recent posts cache

merge-requests/21/head
Bob Mottram 2021-03-05 19:23:33 +00:00
parent e1de415809
commit 151fa8cab6
4 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inbox.py
View File

@ -1372,7 +1372,8 @@ def _receiveAnnounce(recentPostsCache: {},
messageJson,
__version__, translate,
YTReplacementDomain,
allowLocalNetworkAccess)
allowLocalNetworkAccess,
recentPostsCache)
if not postJsonObject:
notInOnion = True
if onionDomain:
@ -2450,7 +2451,8 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
if isImageMedia(session, baseDir, httpPrefix,
nickname, domain, postJsonObject,
translate, YTReplacementDomain,
allowLocalNetworkAccess):
allowLocalNetworkAccess,
recentPostsCache):
# media index will be updated
updateIndexList.append('tlmedia')
if isBlogPost(postJsonObject):

49
posts.py
View File

@ -2953,7 +2953,8 @@ def isImageMedia(session, baseDir: str, httpPrefix: str,
nickname: str, domain: str,
postJsonObject: {}, translate: {},
YTReplacementDomain: str,
allowLocalNetworkAccess: bool) -> bool:
allowLocalNetworkAccess: bool,
recentPostsCache: {}) -> bool:
"""Returns true if the given post has attached image media
"""
if postJsonObject['type'] == 'Announce':
@ -2962,7 +2963,8 @@ def isImageMedia(session, baseDir: str, httpPrefix: str,
nickname, domain, postJsonObject,
__version__, translate,
YTReplacementDomain,
allowLocalNetworkAccess)
allowLocalNetworkAccess,
recentPostsCache)
if postJsonAnnounce:
postJsonObject = postJsonAnnounce
if postJsonObject['type'] != 'Create':
@ -3882,10 +3884,10 @@ def populateRepliesJson(baseDir: str, nickname: str, domain: str,
def _rejectAnnounce(announceFilename: str,
baseDir: str, nickname: str, domain: str,
announcePostId: str):
announcePostId: str, recentPostsCache: {}):
"""Marks an announce as rejected
"""
rejectPostId(baseDir, nickname, domain, announcePostId)
rejectPostId(baseDir, nickname, domain, announcePostId, recentPostsCache)
# reject the post referenced by the announce activity object
if not os.path.isfile(announceFilename + '.reject'):
@ -3899,7 +3901,8 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
nickname: str, domain: str,
postJsonObject: {}, projectVersion: str,
translate: {}, YTReplacementDomain: str,
allowLocalNetworkAccess: bool) -> {}:
allowLocalNetworkAccess: bool,
recentPostsCache: {}) -> {}:
"""Download the post referenced by an announce
"""
if not postJsonObject.get('object'):
@ -3976,11 +3979,13 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
print('WARN: announce json is not a dict - ' +
postJsonObject['object'])
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if not announcedJson.get('id'):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if '/statuses/' not in announcedJson['id']:
_rejectAnnounce(announceFilename,
@ -3988,41 +3993,49 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
return None
if not hasUsersPath(announcedJson['id']):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if not announcedJson.get('type'):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if announcedJson['type'] != 'Note' and \
announcedJson['type'] != 'Article':
# You can only announce Note or Article types
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if not announcedJson.get('content'):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if not announcedJson.get('published'):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if not validPostDate(announcedJson['published']):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
# Check the content of the announce
contentStr = announcedJson['content']
if dangerousMarkup(contentStr, allowLocalNetworkAccess):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
if isFiltered(baseDir, nickname, domain, contentStr):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
# remove any long words
@ -4042,7 +4055,8 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
if announcedJson['type'] != 'Create':
# Create wrap failed
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
# labelAccusatoryPost(postJsonObject, translate)
@ -4059,7 +4073,8 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
if isBlocked(baseDir, nickname, domain,
attributedNickname, attributedDomain):
_rejectAnnounce(announceFilename,
baseDir, nickname, domain, postId)
baseDir, nickname, domain, postId,
recentPostsCache)
return None
postJsonObject = announcedJson
replaceYouTube(postJsonObject, YTReplacementDomain)

25
utils.py
View File

@ -2037,12 +2037,33 @@ def camelCaseSplit(text: str) -> str:
def rejectPostId(baseDir: str, nickname: str, domain: str,
postId: str) -> None:
""" Marks the given post as rejected
postId: str, recentPostsCache: {}) -> None:
""" Marks the given post as rejected,
for example an announce which is too old
"""
postFilename = locatePost(baseDir, nickname, domain, postId)
if not postFilename:
return
if recentPostsCache.get('index'):
# if this is a full path then remove the directories
indexFilename = postFilename
if '/' in postFilename:
indexFilename = postFilename.split('/')[-1]
# filename of the post without any extension or path
# This should also correspond to any index entry in
# the posts cache
postUrl = \
indexFilename.replace('\n', '').replace('\r', '')
postUrl = postUrl.replace('.json', '').strip()
if postUrl in recentPostsCache['index']:
if recentPostsCache['json'].get(postUrl):
del recentPostsCache['json'][postUrl]
if recentPostsCache['html'].get(postUrl):
del recentPostsCache['html'][postUrl]
rejectFile = open(postFilename + '.reject', "w+")
if rejectFile:
rejectFile.write('\n')

6
webapp_post.py
View File

@ -1289,10 +1289,12 @@ def individualPostAsHtml(allowDownloads: bool,
nickname, domain, postJsonObject,
projectVersion, translate,
YTReplacementDomain,
allowLocalNetworkAccess)
allowLocalNetworkAccess,
recentPostsCache)
if not postJsonAnnounce:
# if the announce could not be downloaded then mark it as rejected
rejectPostId(baseDir, nickname, domain, postJsonObject['id'])
rejectPostId(baseDir, nickname, domain, postJsonObject['id'],
recentPostsCache)
return ''
postJsonObject = postJsonAnnounce