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

Single webfinger

merge-requests/30/head
Bob Mottram 2020-12-18 18:12:33 +00:00
parent af919974d7
commit 8c7071b6e3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inbox.py
View File

@ -173,9 +173,17 @@ def inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
avatarUrl = None avatarUrl = None
if boxname != 'tlevents' and boxname != 'outbox': if boxname != 'tlevents' and boxname != 'outbox':
boxname = 'inbox' boxname = 'inbox'
wfRequest = {}
requestHandle = nickname + '@' + domain
if cachedWebfingers.get(requestHandle):
wfRequest = cachedWebfingers[requestHandle]
elif cachedWebfingers.get(requestHandle + ':' + str(port)):
wfRequest = cachedWebfingers[requestHandle + ':' + str(port)]
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
translate, pageNumber, translate, pageNumber,
baseDir, session, cachedWebfingers, personCache, baseDir, session, wfRequest, personCache,
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
avatarUrl, True, allowDeletion, avatarUrl, True, allowDeletion,
httpPrefix, __version__, boxname, None, httpPrefix, __version__, boxname, None,

10
webapp_profile.py
View File

@ -259,10 +259,18 @@ def htmlProfileAfterSearch(cssCache: {},
continue continue
if not item.get('object'): if not item.get('object'):
continue continue
wfRequest = {}
requestHandle = nickname + '@' + domain
if cachedWebfingers.get(requestHandle):
wfRequest = cachedWebfingers[requestHandle]
elif cachedWebfingers.get(requestHandle + ':' + str(port)):
wfRequest = cachedWebfingers[requestHandle + ':' + str(port)]
profileStr += \ profileStr += \
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
translate, None, baseDir, translate, None, baseDir,
session, cachedWebfingers, personCache, session, wfRequest, personCache,
nickname, domain, port, nickname, domain, port,
item, avatarUrl, False, False, item, avatarUrl, False, False,
httpPrefix, projectVersion, 'inbox', httpPrefix, projectVersion, 'inbox',