From 0cc0df9e3e7696c79642411bc7efa9e7d6008124 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 22 Feb 2019 23:23:05 -0500 Subject: [PATCH] Rename system.disable_mentions_removal config key to system.disable_implicit_mentions - Update configuration key description --- config/defaults.config.php | 11 ++++++++--- src/Protocol/ActivityPub/Processor.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/defaults.config.php b/config/defaults.config.php index 694f75c220..a6f90f319e 100644 --- a/config/defaults.config.php +++ b/config/defaults.config.php @@ -135,9 +135,14 @@ return [ // Disables the check if a mail address is in a valid format and can be resolved via DNS. 'disable_email_validation' => false, - // disable_mentions_removal (Boolean) - // Disables the automatic removal of implicit mentions in ActivityPub postings. - 'disable_mentions_removal' => false, + // disable_implicit_mentions (Boolean) since 2019.03 + // Implicit mentions are mentions in the body of replies that are redundant in a thread-enabled system like Friendica. + // This config key disables the gathering of implicit mentions in incoming and outgoing posts. + // Also disables the default automatic removal of implicit mentions from the body of incoming posts. + // Also disables the default automatic addition of implicit mentions in the body of outgoing posts. + // Disabling implicit mentions also affects the "explicit_mentions" additional feature by limiting it + // to the replied-to post author mention in the comment boxes. + 'disable_implicit_mentions' => false, // disable_url_validation (Boolean) // Disables the DNS lookup of an URL. diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 5899d7f25f..68697381b2 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -693,7 +693,7 @@ class Processor */ private static function removeImplicitMentionsFromBody($body, array $implicit_mentions) { - if (Config::get('system', 'disable_mentions_removal')) { + if (Config::get('system', 'disable_implicit_mentions')) { return $body; }