Bluesky/Tumblr: Add "connector" parcel to each incoming post

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index af7d9ac703822bae0a5c794f7b5dbfebd4fc9cb3..4882a263f485636bd3798d1e828dd4d1ab003e65 100644 (file)
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -38,6 +38,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
@@ -1058,6 +1059,7 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 
        $item = [
                'network'       => Protocol::BLUESKY,
+               'protocol'      => Conversation::PARCEL_CONNECTOR,
                'uid'           => $uid,
                'wall'          => false,
                'uri'           => $reason->by->did . '/app.bsky.feed.repost/' . $reason->indexedAt,
@@ -1257,6 +1259,7 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
        $contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
        $item = [
                'network'       => Protocol::BLUESKY,
+               'protocol'      => Conversation::PARCEL_CONNECTOR,
                'uid'           => $uid,
                'wall'          => false,
                'uri'           => $uri,
@@ -1459,8 +1462,8 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
                                'url'         => $embed->playlist,
                                'preview'     => $embed->thumbnail,
                                'description' => $embed->alt ?? '',
-                               'height'      => $embed->aspectRatio->height,
-                               'width'       => $embed->aspectRatio->width,
+                               'height'      => $embed->aspectRatio->height ?? null,
+                               'width'       => $embed->aspectRatio->width ?? null,
                        ];
                        Post\Media::insert($media);
                        break;

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index dd34bd415e457dc0e4305cfb82bd7b9e895a4d7c..390c3c6c2d983c6b6dfeb3a292ec9da768779f8d 100644 (file)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -22,6 +22,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
@@ -31,7 +32,6 @@ use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
@@ -850,6 +850,7 @@ function tumblr_get_header(stdClass $post, string $uri, int $uid): array
        $contact = tumblr_get_contact($post->blog, $uid);
        $item = [
                'network'       => Protocol::TUMBLR,
+               'protocol'      => Conversation::PARCEL_CONNECTOR,
                'uid'           => $uid,
                'wall'          => false,
                'uri'           => $uri,