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

Merge branch 'friendica:2022.12-rc' into new_image_presentation

Browse source
This commit is contained in:
MarekBenjamin 2022-12-11 22:25:47 +01:00 committed by GitHub
commit e4702ed464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Worker/Cron.php
View file

@ -165,7 +165,7 @@ class Cron
Logger::info('Removing failed deliveries', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed']]);
Post\Delivery::removeFailed($delivery['inbox']);
}
if ($delivery['failed'] == 0) {
$result = ActivityPub\Delivery::deliver($delivery['inbox']);
Logger::info('Directly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);

7
src/Factory/Api/Mastodon/Status.php
View file

@ -199,8 +199,11 @@ class Status extends BaseFactory
}
}
$item['body'] = $this->contentItem->addSharedPost($item);
$item['raw-body'] = $this->contentItem->addSharedPost($item, $item['raw-body']);
$item['body'] = $this->contentItem->addSharedPost($item);
if (!is_null($item['raw-body'])) {
$item['raw-body'] = $this->contentItem->addSharedPost($item, $item['raw-body']);
}
if ($is_reshare) {
$reshare = $this->createFromUriId($uriId, $uid, false)->toArray();

7
src/Model/Item.php
View file

@ -2282,7 +2282,12 @@ class Item
return;
}
if (!DBA::exists('contact', ['id' => $item['contact-id'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) {
$cdata = Contact::getPublicAndUserContactID($item['author-id'], $item['uid']);
if (empty($cdata['user']) || ($cdata['user'] != $item['contact-id'])) {
return;
}
if (!DBA::exists('contact', ['id' => $cdata['user'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) {
return;
}

7
src/Util/Images.php
View file

@ -247,8 +247,11 @@ class Images
if ($data) {
$image = new Image($img_str);
$data['blurhash'] = $image->getBlurHash();
$data['size'] = $filesize;
if ($image->isValid()) {
$data['blurhash'] = $image->getBlurHash();
}
$data['size'] = $filesize;
}
return is_array($data) ? $data : [];