allow forum delivery using attached mention tags (as well as mentions in the body)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 724f61e25dd8c606ffbf3f4ac718134cb9d588c3..d18e96aa1618e76bf4b433ba4e9f9e9d2240ed5b 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -29,6 +29,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Core\System;
+use Friendica\Core\Tag;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -2670,6 +2671,16 @@ class Item
                        }
                }
 
+               if (!$mention) {
+                       $tags = Tag::getByURIId($item_id, [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
+                       $foreach ($tags as $tag) {
+                               if (Strings::compareLink($link, $tag['url']) || Strings::compareLink($dlink, $tag['url'])) {
+                                       $mention = true;
+                                       Logger::log('mention found in tag: ' . $tag['url']);
+                               }
+                       }
+               }
+               
                if (!$mention) {
                        if (($community_page || $prvgroup) &&
                                  !$item['wall'] && !$item['origin'] && ($item['gravity'] == GRAVITY_PARENT)) {