From 5895b3d50b51c6988679205498088ce18fb0e0c7 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 11 Sep 2021 15:12:12 +0100 Subject: [PATCH] Handle create within announce in public profile feed --- posts.py | 4 ++-- webapp_profile.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/posts.py b/posts.py index efe6f24f3..7baa016c2 100644 --- a/posts.py +++ b/posts.py @@ -471,7 +471,7 @@ def _isPublicFeedPost(item: {}, personPosts: {}, debug: bool) -> bool: return True -def _isCreateInsideAnnounce(item: {}) -> bool: +def isCreateInsideAnnounce(item: {}) -> bool: """ is this a Create inside of an Announce? eg. lemmy feed item """ @@ -546,7 +546,7 @@ def _getPosts(session, outboxUrl: str, maxPosts: int, i = 0 for item in userFeed: - if _isCreateInsideAnnounce(item): + if isCreateInsideAnnounce(item): item = item['object'] if not _isPublicFeedPost(item, personPosts, debug): diff --git a/webapp_profile.py b/webapp_profile.py index a58661cb6..f95c5a6bb 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -35,6 +35,7 @@ from person import getPersonAvatarUrl from webfinger import webfingerHandle from posts import parseUserFeed from posts import getPersonBox +from posts import isCreateInsideAnnounce from donate import getDonationUrl from donate import getWebsite from xmpp import getXmppAddress @@ -260,6 +261,8 @@ def htmlProfileAfterSearch(cssCache: {}, if userFeed: i = 0 for item in userFeed: + if isCreateInsideAnnounce(item): + item = item['object'] if not item.get('actor'): continue if item['actor'] != personUrl: