keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7630 from MrPetovan/bug/7629-diaspora-implicit-self-mention

Browse source 
Remove Diaspora implicit self mention
This commit is contained in:
Michael Vogel 2019-09-15 13:13:37 +02:00 committed by GitHub
commit 6973f90b8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Protocol/Diaspora.php
View file

@ -3850,7 +3850,7 @@ class Diaspora
return $result; return $result;
} }
$toplevel_item = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]); $toplevel_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
if (!DBA::isResult($toplevel_item)) { if (!DBA::isResult($toplevel_item)) {
Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]); Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]);
return false; return false;
@ -3858,12 +3858,18 @@ class Diaspora
$thread_parent_item = $toplevel_item; $thread_parent_item = $toplevel_item;
if ($item['thr-parent'] != $item['parent-uri']) { if ($item['thr-parent'] != $item['parent-uri']) {
$thread_parent_item = Item::selectFirst(['guid', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]); $thread_parent_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
} }
$body = $item["body"]; $body = $item["body"];
if ((empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) // The replied to autor mention is prepended for clarity if:
// - Item replied isn't yours
// - Item is public or explicit mentions are disabled
// - Implicit mentions are enabled
if (
$item['author-id'] != $thread_parent_item['author-id']
&& (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
&& !Config::get('system', 'disable_implicit_mentions') && !Config::get('system', 'disable_implicit_mentions')
) { ) {
$body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']); $body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']);