clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13988 from annando/network-groups 

"network/group" fragments are removed
This commit is contained in:
Hypolite Petovan 2024-03-12 19:31:58 +00:00 committed by GitHub
parent cd7a663733 fda832cd83
commit d3ee4d589b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Content/Widget/VCard.php
View File

@ -104,7 +104,7 @@ class VCard
$mention_label = DI::l10n()->t('Post to group'); $mention_label = DI::l10n()->t('Post to group');
$mention_link = 'compose/0?body=!' . $contact['addr']; $mention_link = 'compose/0?body=!' . $contact['addr'];
} }
$showgroup_link = 'network/group/' . $id; $showgroup_link = 'contact/' . $id . '/conversations';
} elseif (!$hide_mention) { } elseif (!$hide_mention) {
$mention_label = DI::l10n()->t('Mention'); $mention_label = DI::l10n()->t('Mention');
$mention_link = 'compose/0?body=@' . $contact['addr']; $mention_link = 'compose/0?body=@' . $contact['addr'];

3
src/Model/Contact.php
View File

@ -1205,13 +1205,12 @@ class Contact
$mention_label = DI::l10n()->t('Post to group'); $mention_label = DI::l10n()->t('Post to group');
$mention_url = 'compose/0?body=!' . $contact['addr']; $mention_url = 'compose/0?body=!' . $contact['addr'];
$network_label = DI::l10n()->t('View group'); $network_label = DI::l10n()->t('View group');
$network_url = 'network/group/' . $contact['id'];
} else { } else {
$mention_label = DI::l10n()->t('Mention'); $mention_label = DI::l10n()->t('Mention');
$mention_url = 'compose/0?body=@' . $contact['addr']; $mention_url = 'compose/0?body=@' . $contact['addr'];
$network_label = DI::l10n()->t('Network Posts'); $network_label = DI::l10n()->t('Network Posts');
$network_url = 'contact/' . $contact['id'] . '/conversations';
} }
$network_url = 'contact/' . $contact['id'] . '/conversations';
$follow_link = ''; $follow_link = '';
$unfollow_link = ''; $unfollow_link = '';

3
src/Model/Profile.php
View File

@ -461,13 +461,12 @@ class Profile
$mention_label = DI::l10n()->t('Post to group'); $mention_label = DI::l10n()->t('Post to group');
$mention_url = 'compose/0?body=!' . $profile['addr']; $mention_url = 'compose/0?body=!' . $profile['addr'];
$network_label = DI::l10n()->t('View group'); $network_label = DI::l10n()->t('View group');
$network_url = 'network/group/' . $cid;
} else { } else {
$mention_label = DI::l10n()->t('Mention'); $mention_label = DI::l10n()->t('Mention');
$mention_url = 'compose/0?body=@' . $profile['addr']; $mention_url = 'compose/0?body=@' . $profile['addr'];
$network_label = DI::l10n()->t('Network Posts'); $network_label = DI::l10n()->t('Network Posts');
$network_url = 'contact/' . $cid . '/conversations';
} }
$network_url = 'contact/' . $cid . '/conversations';
$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl'); $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
$o .= Renderer::replaceMacros($tpl, [ $o .= Renderer::replaceMacros($tpl, [

1
static/routes.config.php
View File

@ -662,7 +662,6 @@ return [
'/network' => [ '/network' => [
'[/{content}]' => [Module\Conversation\Network::class, [R::GET]], '[/{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]], '/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]], '/circle/{circle_id:\d+}' => [Module\Conversation\Network::class, [R::GET]],
], ],