mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

main
Bob Mottram 2020-05-21 20:09:28 +01:00
parent 4b4c748813
commit ba88f72871
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bookmarks.py
View File

@ -16,7 +16,6 @@ from utils import locatePost
from utils import getCachedPostFilename from utils import getCachedPostFilename
from utils import loadJson from utils import loadJson
from utils import saveJson from utils import saveJson
from posts import sendSignedJson
from session import postJson from session import postJson
from webfinger import webfingerHandle from webfinger import webfingerHandle
from auth import createBasicAuthHeader from auth import createBasicAuthHeader
@ -283,15 +282,6 @@ def bookmark(recentPostsCache: {},
updateBookmarksCollection(recentPostsCache, updateBookmarksCollection(recentPostsCache,
baseDir, postFilename, objectUrl, baseDir, postFilename, objectUrl,
newBookmarkJson['actor'], domain, debug) newBookmarkJson['actor'], domain, debug)
#sendSignedJson(newBookmarkJson, session, baseDir,
# nickname, domain, port,
# bookmarkedPostNickname,
# bookmarkedPostDomain, bookmarkedPostPort,
# 'https://www.w3.org/ns/activitystreams#Public',
# httpPrefix, True, clientToServer, federationList,
# sendThreads, postLog, cachedWebfingers, personCache,
# debug, projectVersion)
return newBookmarkJson return newBookmarkJson
@ -389,15 +379,6 @@ def undoBookmark(recentPostsCache: {},
baseDir, postFilename, objectUrl, baseDir, postFilename, objectUrl,
newUndoBookmarkJson['actor'], newUndoBookmarkJson['actor'],
domain, debug) domain, debug)
#sendSignedJson(newUndoBookmarkJson, session, baseDir,
# nickname, domain, port,
# bookmarkedPostNickname, bookmarkedPostDomain,
# bookmarkedPostPort,
# 'https://www.w3.org/ns/activitystreams#Public',
# httpPrefix, True, clientToServer, federationList,
# sendThreads, postLog, cachedWebfingers, personCache,
# debug, projectVersion)
else: else:
return None return None

19
posts.py
View File

@ -2504,16 +2504,15 @@ def createBoxIndexed(recentPostsCache: {},
# bookmarks timeline is like the inbox but has its own separate index # bookmarks timeline is like the inbox but has its own separate index
indexBoxName = boxname indexBoxName = boxname
if boxname == 'tlbookmarks': boxes = {
indexBoxName = 'bookmarks' "tlbookmarks": "bookmarks",
elif boxname == 'dm': "dm": "dm",
indexBoxName = 'dm' "tlreplies": "tlreplies",
elif boxname == 'tlreplies': "tlmedia": "tlmedia",
indexBoxName = 'tlreplies' "tlblogs": "tlblogs"
elif boxname == 'tlmedia': }
indexBoxName = 'tlmedia' if boxes.get(boxname):
elif boxname == 'tlblogs': indexBoxName = boxes[boxname]
indexBoxName = 'tlblogs'
if port: if port:
if port != 80 and port != 443: if port != 80 and port != 443: