Merge remote-tracking branch 'upstream/2021.06-rc' into forum-handling

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index b7267428ab4f563af587d3e8ddb74b469d3ab3f9..f6bec1561cb0f0ed0e6e010a74bb1e75f133d73c 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1060,7 +1060,14 @@ class Item
                        Post\Content::insert($item['uri-id'], $item);
                }
 
-               // Diaspora signature
+               // Create Diaspora signature
+               if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
+                       $signed = Diaspora::createCommentSignature($uid, $item);
+                       if (!empty($signed)) {
+                               $item['diaspora_signed_text'] = json_encode($signed);
+                       }
+               }
+
                if (!empty($item['diaspora_signed_text'])) {
                        DBA::replace('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $item['diaspora_signed_text']]);
                }
@@ -1220,13 +1227,10 @@ class Item
                                Logger::info('The resharer is no forum: quit', ['resharer' => $item['author-id'], 'owner' => $parent['owner-id'], 'author' => $parent['author-id'], 'uid' => $item['uid']]);
                                return;
                        }
-                       self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]);
-                       Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
-                       return;
                }
 
-               self::update(['owner-id' => $item['author-id'], 'contact-id' => $cid], ['id' => $parent['id']]);
-               Logger::info('Change owner of the parent', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'owner-id' => $item['author-id'], 'contact-id' => $cid]);
+               self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]);
+               Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
        }
 
        /**
@@ -2878,7 +2882,7 @@ class Item
                                                'mime'   => $attachment['mimetype'],
                                        ],
                                ]);
-                               if ($item['post-type'] == Item::PT_AUDIO) {
+                               if (($item['post-type'] ?? null) == Item::PT_AUDIO) {
                                        $leading .= $media;
                                } else {
                                        $trailing .= $media;