set ! and @ on mentioning in hover-card

diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php
index 32eb95e434db3add2acb627cee048a37c9814959..d5a565f9257cbb1f692acd9c683071b2d5780e5b 100644 (file)
--- 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 7256706e0a9a07412e5c1795658781108fad5940..0f426529fb2e6d66ca62adbc1355a8bc33feaf31 100644 (file)
--- 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'];