keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12988 from annando/diaspora-signature

Browse source 
Fix Diaspora signature creation for comments on comments
This commit is contained in:
Tobias Diekershoff 2023-04-12 07:37:35 +02:00 committed by GitHub
commit 00d6e97860
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Protocol/Diaspora.php
View file

@ -4049,7 +4049,7 @@ class Diaspora
return false; return false;
} }
if (!self::parentSupportDiaspora($item['thr-parent-id'])) { if (!self::parentSupportDiaspora($item['thr-parent-id'], $uid)) {
Logger::info('One of the parents does not support Diaspora. A signature will not be created.', ['uri-id' => $item['uri-id'], 'guid' => $item['guid']]); Logger::info('One of the parents does not support Diaspora. A signature will not be created.', ['uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
return false; return false;
} }
@ -4068,13 +4068,14 @@ class Diaspora
* Check if the parent and their parents support Diaspora * Check if the parent and their parents support Diaspora
* *
* @param integer $parent_id * @param integer $parent_id
* @param integer $uid
* @return boolean * @return boolean
* @throws InternalServerErrorException * @throws InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
private static function parentSupportDiaspora(int $parent_id): bool private static function parentSupportDiaspora(int $parent_id, int $uid): bool
{ {
$parent_post = Post::selectFirstPost(['gravity', 'signed_text', 'author-link', 'thr-parent-id'], ['uri-id' => $parent_id]); $parent_post = Post::selectFirst(['gravity', 'signed_text', 'author-link', 'thr-parent-id', 'protocol'], ['uri-id' => $parent_id, 'uid' => [0, $uid]]);
if (empty($parent_post['thr-parent-id'])) { if (empty($parent_post['thr-parent-id'])) {
Logger::warning('Parent post does not exist.', ['parent-id' => $parent_id]); Logger::warning('Parent post does not exist.', ['parent-id' => $parent_id]);
return false; return false;
@ -4085,13 +4086,13 @@ class Diaspora
return false; return false;
} }
if (($parent_post['gravity'] == Item::GRAVITY_COMMENT) && empty($parent_post['signed_text'])) { if (($parent_post['protocol'] != Conversation::PARCEL_DIASPORA) && ($parent_post['gravity'] == Item::GRAVITY_COMMENT) && empty($parent_post['signed_text'])) {
Logger::info('Parent comment has got no Diaspora signature.', ['parent-id' => $parent_id]); Logger::info('Parent comment has got no Diaspora signature.', ['parent-id' => $parent_id]);
return false; return false;
} }
if ($parent_post['gravity'] == Item::GRAVITY_COMMENT) { if ($parent_post['gravity'] == Item::GRAVITY_COMMENT) {
return self::parentSupportDiaspora($parent_post['thr-parent-id']); return self::parentSupportDiaspora($parent_post['thr-parent-id'], $uid);
} }
return true; return true;