From da9baf2be8908abbedef62c533e1894aae8f074b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 5 Nov 2023 08:49:12 -0500 Subject: [PATCH] Use public contact ID in Model\Profile::getVCardHtml instead of potentially self-contact ID - This prevented contact conversation link from working --- src/Model/Profile.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 373acbc17..a6386c281 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -307,7 +307,12 @@ class Profile $profile_url = $profile['url']; - $cid = $profile['id']; + $contact = Contact::selectFirst(['id'], ['uri-id' => $profile['uri-id'], 'uid' => 0]); + if (!$contact) { + return $o; + } + + $cid = $contact['id']; $follow_link = null; $unfollow_link = null; @@ -457,12 +462,12 @@ class Profile $mention_label = DI::l10n()->t('Post to group'); $mention_url = 'compose/0?body=!' . $profile['addr']; $network_label = DI::l10n()->t('View group'); - $network_url = 'network/group/' . $profile['id']; + $network_url = 'network/group/' . $cid; } else { $mention_label = DI::l10n()->t('Mention'); $mention_url = 'compose/0?body=@' . $profile['addr']; $network_label = DI::l10n()->t('Network Posts'); - $network_url = 'contact/' . $profile['id'] . '/conversations'; + $network_url = 'contact/' . $cid . '/conversations'; } $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');