diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index c784517abf..30718cc424 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -104,7 +104,7 @@ class VCard $mention_label = DI::l10n()->t('Post to group'); $mention_link = 'compose/0?body=!' . $contact['addr']; } - $showgroup_link = 'network/group/' . $id; + $showgroup_link = 'contact/' . $id . '/conversations'; } elseif (!$hide_mention) { $mention_label = DI::l10n()->t('Mention'); $mention_link = 'compose/0?body=@' . $contact['addr']; diff --git a/src/Model/Contact.php b/src/Model/Contact.php index bc235a3e35..3b09991cff 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1205,13 +1205,12 @@ class Contact $mention_label = DI::l10n()->t('Post to group'); $mention_url = 'compose/0?body=!' . $contact['addr']; $network_label = DI::l10n()->t('View group'); - $network_url = 'network/group/' . $contact['id']; } else { $mention_label = DI::l10n()->t('Mention'); $mention_url = 'compose/0?body=@' . $contact['addr']; $network_label = DI::l10n()->t('Network Posts'); - $network_url = 'contact/' . $contact['id'] . '/conversations'; } + $network_url = 'contact/' . $contact['id'] . '/conversations'; $follow_link = ''; $unfollow_link = ''; diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 44835bda9a..100e747d29 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -461,13 +461,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/' . $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/' . $cid . '/conversations'; } + $network_url = 'contact/' . $cid . '/conversations'; $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl'); $o .= Renderer::replaceMacros($tpl, [ diff --git a/static/routes.config.php b/static/routes.config.php index 77d04f92c1..93151c433d 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -662,7 +662,6 @@ return [ '/network' => [ '[/{content}]' => [Module\Conversation\Network::class, [R::GET]], '/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Conversation\Network::class, [R::GET]], - '/group/{contact_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], '/circle/{circle_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], ],