From 0d0d49ac894cd583ada7f7e15bb6debdb5712f0e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 31 Dec 2020 12:14:47 +0000 Subject: [PATCH] Revert "Fix missing webfingers" This reverts commit 4bee4e236a794a25ea3d786dc2b9ffb898eface2. --- inbox.py | 8 ++------ webapp_profile.py | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/inbox.py b/inbox.py index 46b1ba4c..16ab4d4b 100644 --- a/inbox.py +++ b/inbox.py @@ -72,7 +72,6 @@ from happening import saveEventPost from delete import removeOldHashtags from follow import isFollowingActor from categories import guessHashtagCategory -from webfinger import webfingerHandle def storeHashTags(baseDir: str, nickname: str, postJsonObject: {}) -> None: @@ -163,11 +162,8 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int, if cachedWebfingers.get(requestHandle): wfRequest = cachedWebfingers[requestHandle] else: - wfRequest = webfingerHandle(session, requestHandle, - httpPrefix, cachedWebfingers, - domain, __version__) - if not wfRequest: - return + # TODO this may not be correct + wfRequest = cachedWebfingers individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, pageNumber, diff --git a/webapp_profile.py b/webapp_profile.py index 20fe9f67..c6480e1e 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -265,11 +265,8 @@ def htmlProfileAfterSearch(cssCache: {}, if cachedWebfingers.get(requestHandle): wfRequest = cachedWebfingers[requestHandle] else: - wfRequest = webfingerHandle(session, requestHandle, - httpPrefix, cachedWebfingers, - domain, __version__) - if not wfRequest: - return None + # TODO this may not be correct + wfRequest = cachedWebfingers profileStr += \ individualPostAsHtml(True, recentPostsCache, maxRecentPosts,