Offer "follow thread" only when you don't already follow

diff --git a/include/conversation.php b/include/conversation.php
index b74b1f152b1e09c64d9330ce31026b451e5ec065..cef0bc0e80e0da21858e53193965d8bd6f7c887e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -899,7 +899,7 @@ function item_photo_menu($item) {
        $block_link = '';
        $ignore_link = '';
 
-       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
+       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self'] && !$item['mention']) {
                $sub_link = 'javascript:doFollowThread(' . $item['id'] . '); return false;';
        }
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 8c7515e1121d6bd27f7a1e0ba2858e925f92cb9b..48652a0e12fbf691f6ceea1bdb42b6bbed7c2838 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -76,7 +76,7 @@ class Item
                'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
                'wall', 'private', 'starred', 'origin', 'parent-origin', 'title', 'body', 'language',
                'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
-               'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+               'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention',
                'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
                'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type',
                'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 38efc700785b398042d2b2d860d266dc1b497618..de7c14f84a45a801336bb9351ddc08d522ea9958 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -314,7 +314,7 @@ function frio_display_item(App $a, &$arr)
                local_user()
                && local_user() == $arr['item']['uid']
                && $arr['item']['gravity'] == GRAVITY_PARENT
-               && !$arr['item']['self'])
+               && !$arr['item']['self'] && !$arr['item']['mention'])
        {
                $followThread = [
                        'menu'   => 'follow_thread',