Merge pull request #5780 from annando/fix-relocation

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 401178ec26664090aa6478314d8812d9470113ae..61eaba388b2d365a58829bcf4abddcb1bda54874 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -96,7 +96,7 @@ class Notifier
                                return;
                        }
                        foreach ($r as $contact) {
-                               Contact::terminateFriendship($user, $contact);
+                               Contact::terminateFriendship($user, $contact, true);
                        }
                        return;
                } elseif ($cmd == Delivery::RELOCATION) {
@@ -217,24 +217,16 @@ class Notifier
                        }
 
                        // Special treatment for forum posts
-                       if (($target_item['author-id'] != $target_item['owner-id']) &&
-                               ($owner['id'] != $target_item['contact-id']) &&
-                               ($target_item['uri'] === $target_item['parent-uri'])) {
-
-                               $fields = ['forum', 'prv'];
-                               $condition = ['id' => $target_item['contact-id']];
-                               $contact = DBA::selectFirst('contact', $fields, $condition);
-                               if (!DBA::isResult($contact)) {
-                                       // Should never happen
-                                       return false;
-                               }
+                       if (self::isForumPost($target_item, $owner)) {
+                               $relay_to_owner = true;
+                               $direct_forum_delivery = true;
+                       }
 
-                               // 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) {
                                // local followup to remote post
                                $followup = true;
@@ -504,4 +496,23 @@ class Notifier
 
                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']);
+       }
 }