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

Replacing colon

merge-requests/30/head
Bob Mottram 2021-07-27 20:48:31 +01:00
parent f9012cd948
commit 4f58cc98c1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -10230,8 +10230,7 @@ class PubServer(BaseHTTPRequestHandler):
return True return True
mediaStr = path.split('/sharefiles/')[1] mediaStr = path.split('/sharefiles/')[1]
mediaFilename = \ mediaFilename = baseDir + '/sharefiles/' + mediaStr
baseDir + '/sharefiles/' + mediaStr
if not os.path.isfile(mediaFilename): if not os.path.isfile(mediaFilename):
self._404() self._404()
return True return True

4
shares.py
View File

@ -91,7 +91,9 @@ def getValidSharedItemID(actor: str, displayName: str) -> str:
displayName = displayName.replace(ch, '-') displayName = displayName.replace(ch, '-')
displayName = displayName.replace('.', '_') displayName = displayName.replace('.', '_')
displayName = displayName.replace("’", "'") displayName = displayName.replace("’", "'")
return actor.replace('/', '#') + '#shareditems#' + displayName actor = actor.replace('://', '--##')
actor = actor.replace('/', '#')
return actor + '#shareditems#' + displayName
def removeSharedItem(baseDir: str, nickname: str, domain: str, def removeSharedItem(baseDir: str, nickname: str, domain: str,

1
webapp_utils.py
View File

@ -384,6 +384,7 @@ def sharesTimelineJson(actor: str, pageNumber: int, itemsPerPage: int,
shareActor = '' shareActor = ''
if '#shareditems#' in itemID: if '#shareditems#' in itemID:
shareActor = itemID.split('#shareditems#')[0] shareActor = itemID.split('#shareditems#')[0]
shareActor = shareActor.replace('--##', '://')
shareActor = shareActor.replace('#', '/') shareActor = shareActor.replace('#', '/')
item['actor'] = shareActor item['actor'] = shareActor
allSharesJson[str(item['published'])] = item allSharesJson[str(item['published'])] = item