Merge branch 'foolproof_file_redirection_branch' into 'nightly'

[quix0rs-gnu-social.git] / plugins / Linkback / lib / util.php

diff --git a/plugins/Linkback/lib/util.php b/plugins/Linkback/lib/util.php
index 94f0d992f4a4ed87ff2a07b14e225dad607da0c6..2f024dd2338a4d4a838d13b1feb94bad40a9d67a 100644 (file)
--- a/plugins/Linkback/lib/util.php
+++ b/plugins/Linkback/lib/util.php
@@ -356,8 +356,20 @@ function linkback_save($source, $target, $response, $notice_or_user) {
             try { $dupe->saveKnownUrls($options['urls']); } catch (ServerException $ex) {}
 
             if($options['reply_to']) { $dupe->reply_to = $options['reply_to']; }
-            if($options['repost_of']) { $dupe->repost_of = $options['repost_of']; }
+            if($options['repeat_of']) { $dupe->repeat_of = $options['repeat_of']; }
+            if($dupe->reply_to != $orig->reply_to || $dupe->repeat_of != $orig->repeat_of) {
+                $parent = Notice::getKV('id', $dupe->repost_of ? $dupe->repost_of : $dupe->reply_to);
+                if($parent instanceof Notice) {
+                    // If we changed the reply_to or repeat_of we might live in a new conversation now
+                    $dupe->conversation = $parent->conversation;
+                }
+            }
             if($dupe->update($orig)) { $saved = $dupe; }
+            if($dupe->conversation != $orig->conversation && Conversation::noticeCount($orig->conversation) < 1) {
+                // Delete empty conversation
+                $emptyConversation = Conversation::getKV('id', $orig->conversation);
+                $emptyConversation->delete();
+            }
         } catch (Exception $e) {
             common_log(LOG_ERR, "Linkback update of remote message $source failed: " . $e->getMessage());
             return false;
@@ -376,7 +388,7 @@ function linkback_save($source, $target, $response, $notice_or_user) {
         //        notice's nickname and %3$s is the content of the favorited notice.)
         $act->content = sprintf(_('%1$s favorited something by %2$s: %3$s'),
                                 $profile->getNickname(), $notice_or_user->getProfile()->getNickname(),
-                                $notice_or_user->rendered ?: $notice_or_user->content);
+                                $notice_or_user->getRendered());
         if($entry['rsvp']) {
             $act->content = $options['rendered'];
         }