tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Issue 5262: Comments to a forum post aren't distributed via push

Browse source
This commit is contained in:
Michael 2018-09-01 03:23:12 +00:00
parent 196ef0111c
commit 4fcae18289
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Worker/Notifier.php
View file

@ -217,24 +217,16 @@ class Notifier
} }
// Special treatment for forum posts // Special treatment for forum posts
if (($target_item['author-id'] != $target_item['owner-id']) && if (self::isForumPost($target_item, $owner)) {
($owner['id'] != $target_item['contact-id']) && $relay_to_owner = true;
($target_item['uri'] === $target_item['parent-uri'])) { $direct_forum_delivery = true;
$fields = ['forum', 'prv'];
$condition = ['id' => $target_item['contact-id']];
$contact = DBA::selectFirst('contact', $fields, $condition);
if (!DBA::isResult($contact)) {
// Should never happen
return false;
}
// Is the post from a forum?
if ($contact['forum'] || $contact['prv']) {
$relay_to_owner = true;
$direct_forum_delivery = true;
}
} }
// Avoid that comments in a forum thread are sent to OStatus
if (self::isForumPost($parent, $owner)) {
$direct_forum_delivery = true;
}
if ($relay_to_owner) { if ($relay_to_owner) {
// local followup to remote post // local followup to remote post
$followup = true; $followup = true;
@ -504,4 +496,23 @@ class Notifier
return; return;
} }
private static function isForumPost($item, $owner) {
if (($item['author-id'] == $item['owner-id']) ||
($owner['id'] == $item['contact-id']) ||
($item['uri'] != $item['parent-uri'])) {
return false;
}
$fields = ['forum', 'prv'];
$condition = ['id' => $item['contact-id']];
$contact = DBA::selectFirst('contact', $fields, $condition);
if (!DBA::isResult($contact)) {
// Should never happen
return false;
}
// Is the post from a forum?
return ($contact['forum'] || $contact['prv']);
}
} }