friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Create the Diaspora signature for the correct user

This commit is contained in:
Michael Vogel 2021-08-05 08:58:50 +02:00
parent 00327fd6b4
commit c73130aa6b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -717,7 +717,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
$max_comments = DI::config()->get('system', 'max_display_comments', 1000);
}
$params = ['order' => ['uri-id' => true]];
$params = ['order' => ['uri-id' => true, 'uid' => true]];
$activities = [];
$uriids = [];

8
src/Model/Item.php
View File

@ -1061,7 +1061,13 @@ class Item
// Create Diaspora signature
if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
$signed = Diaspora::createCommentSignature($uid, $item);
if ($uid == 0) {
$sender_contact = Contact::getById($item['contact-id'], ['uid']);
$sender_uid = $sender_contact['uid'];
} else {
$sender_uid = $uid;
}
$signed = Diaspora::createCommentSignature($sender_uid, $item);
if (!empty($signed)) {
$item['diaspora_signed_text'] = json_encode($signed);
}