From 17d7432f0e77072a661b18dadee68130913cdee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= Date: Sun, 1 Oct 2023 14:59:37 +0200 Subject: [PATCH] set ! and @ on mentioning in hover-card --- src/Content/Widget/VCard.php | 3 --- src/Model/Contact.php | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index 32eb95e434..d5a565f925 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -68,7 +68,6 @@ class VCard $follow_link = ''; $unfollow_link = ''; $wallmessage_link = ''; - $showforum_link = ''; $photo = Contact::getPhoto($contact); @@ -120,8 +119,6 @@ class VCard '$unfollow_link' => $unfollow_link, '$wallmessage' => DI::l10n()->t('Message'), '$wallmessage_link' => $wallmessage_link, - '$showforum' => DI::l10n()->t('Show forum'), - '$showforum_link' => $showforum_link, '$mentioning' => DI::l10n()->t('Mention'), '$post2group' => DI::l10n()->t('Post to group'), ]); diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7256706e0a..0f426529fb 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1198,7 +1198,11 @@ class Contact $pm_url = 'message/new/' . $contact['id']; } - $mention_url = 'compose/0?body=@' . $contact['addr']; + if (in_array($contact['rel'], [contact::SHARING])) { + $mention_url = 'compose/0?body=!' . $contact['addr']; + } else { + $mention_url = 'compose/0?body=@' . $contact['addr']; + } $contact_url = 'contact/' . $contact['id']; $posts_link = 'contact/' . $contact['id'] . '/conversations'; $group_link = 'network/group/' . $contact['id'];