friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Concentrating functionality

This commit is contained in:
Michael 2020-05-09 08:55:10 +00:00
parent a1fda8f74a
commit 9679fad5e2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Protocol/ActivityPub/Processor.php
View File

@ -359,7 +359,7 @@ class Processor
return false; return false;
} }
$content = self::removeImplicitMentionsFromBody($content, self::getImplicitMentionList($parent)); $content = self::removeImplicitMentionsFromBody($content, $parent);
} }
$item['content-warning'] = HTML::toBBCode($activity['summary']); $item['content-warning'] = HTML::toBBCode($activity['summary']);
$item['body'] = $content; $item['body'] = $content;
@ -969,10 +969,6 @@ class Processor
*/ */
private static function getImplicitMentionList(array $parent) private static function getImplicitMentionList(array $parent)
{ {
if (DI::config()->get('system', 'disable_implicit_mentions')) {
return [];
}
$parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]); $parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
$parent_author = Contact::getDetailsByURL($parent['author-link'], 0); $parent_author = Contact::getDetailsByURL($parent['author-link'], 0);
@ -1006,15 +1002,17 @@ class Processor
* Strips from the body prepended implicit mentions * Strips from the body prepended implicit mentions
* *
* @param string $body * @param string $body
* @param array $potential_mentions * @param array $parent
* @return string * @return string
*/ */
private static function removeImplicitMentionsFromBody($body, array $potential_mentions) private static function removeImplicitMentionsFromBody(string $body, array $parent)
{ {
if (DI::config()->get('system', 'disable_implicit_mentions')) { if (DI::config()->get('system', 'disable_implicit_mentions')) {
return $body; return $body;
} }
$potential_mentions = self::getImplicitMentionList($parent);
$kept_mentions = []; $kept_mentions = [];
// Extract one prepended mention at a time from the body // Extract one prepended mention at a time from the body