From 99374a63dcf41e5768c4e6cbef1128c0a254948d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 19 Dec 2020 14:17:30 +0000 Subject: [PATCH] Revert to previous wfRequest --- inbox.py | 14 ++++++++------ webapp_profile.py | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/inbox.py b/inbox.py index 424d47665..7c169f55e 100644 --- a/inbox.py +++ b/inbox.py @@ -174,12 +174,14 @@ def inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int, if boxname != 'tlevents' and boxname != 'outbox': boxname = 'inbox' - wfRequest = {} - requestHandle = nickname + '@' + domain - if cachedWebfingers.get(requestHandle): - wfRequest = cachedWebfingers[requestHandle] - elif cachedWebfingers.get(requestHandle + ':' + str(port)): - wfRequest = cachedWebfingers[requestHandle + ':' + str(port)] + # wfRequest = {} + # requestHandle = nickname + '@' + domain + # if cachedWebfingers.get(requestHandle): + # wfRequest = cachedWebfingers[requestHandle] + # elif cachedWebfingers.get(requestHandle + ':' + str(port)): + # wfRequest = cachedWebfingers[requestHandle + ':' + str(port)] + # TODO: this may need to be changed + wfRequest = cachedWebfingers individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, pageNumber, diff --git a/webapp_profile.py b/webapp_profile.py index 625c75c0a..29a8a6a77 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -261,12 +261,14 @@ def htmlProfileAfterSearch(cssCache: {}, if not item.get('object'): continue - wfRequest = {} - requestHandle = nickname + '@' + domain - if cachedWebfingers.get(requestHandle): - wfRequest = cachedWebfingers[requestHandle] - elif cachedWebfingers.get(requestHandle + ':' + str(port)): - wfRequest = cachedWebfingers[requestHandle + ':' + str(port)] + # wfRequest = {} + # requestHandle = nickname + '@' + domain + # if cachedWebfingers.get(requestHandle): + # wfRequest = cachedWebfingers[requestHandle] + # elif cachedWebfingers.get(requestHandle + ':' + str(port)): + # wfRequest = cachedWebfingers[requestHandle + ':' + str(port)] + # TODO: this may need to be changed + wfRequest = cachedWebfingers profileStr += \ individualPostAsHtml(True, recentPostsCache, maxRecentPosts,