"network/group" fragments are removed

diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php
index c784517abf96d7e961d5cb78f7d7a2c54b4b69b1..30718cc424867f55ed85859d162868ddd318e294 100644 (file)
--- 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 bc235a3e356e0f503bee19c8d0db83763ca7c0ed..3b09991cff57b6f4908a825b4323eec7f895a17e 100644 (file)
--- 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 44835bda9a28b358439d6f820430ecd74115b9d7..100e747d298724604ff7cbdd4eae91b3ffd54c90 100644 (file)
--- 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 77d04f92c1d1c9aa4d80380c4b3d32ffd47edfc5..93151c433da809c31d31b86e47b603bf0e48d7b2 100644 (file)
--- 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]],
        ],