From c65fbd5543a7267b4f0229b5c1cc1c33e4f65775 Mon Sep 17 00:00:00 2001 From: mruac Date: Mon, 4 Aug 2025 08:20:12 +0930 Subject: [PATCH] [BlueskyBridge] Fix cases for missing reply post context and QoL fix for video loading (#4635) * added fix for missing reply post context * qol fix - no preload on videos --- bridges/BlueskyBridge.php | 262 +++++++++++++++++++------------------- 1 file changed, 134 insertions(+), 128 deletions(-) diff --git a/bridges/BlueskyBridge.php b/bridges/BlueskyBridge.php index f0e609d9..72c4f018 100644 --- a/bridges/BlueskyBridge.php +++ b/bridges/BlueskyBridge.php @@ -330,157 +330,163 @@ class BlueskyBridge extends BridgeAbstract } //reply - if ($replyContext && isset($post['reply']) && !isset($post['reply']['parent']['notFound'])) { + if ($replyContext && isset($post['reply']) && isset($post['reply']['parent'])) { $replyPost = $post['reply']['parent']; - $replyPostRecord = $replyPost['record']; $description .= '
'; $description .= '

'; - $replyPostAuthorDID = $replyPost['author']['did']; - $replyPostAuthorHandle = $replyPost['author']['handle'] !== 'handle.invalid' ? '@' . $replyPost['author']['handle'] . ' ' : ''; - $replyPostDisplayName = $replyPost['author']['displayName'] ?? ''; - $replyPostDisplayName = e($replyPostDisplayName); - $replyPostUri = self::URI . '/profile/' . $this->fallbackAuthor($replyPost['author'], 'url') . '/post/' . explode('app.bsky.feed.post/', $replyPost['uri'])[1]; + if (isset($replyPost['notFound']) && $replyPost['notFound']) { //deleted post + $description .= 'Replied to post was deleted.'; + } elseif (isset($replyPost['blocked']) && $replyPost['blocked']) { //blocked by quote author + $description .= 'Author of replied to post has blocked OP.'; + } else { + $replyPostRecord = $replyPost['record']; + $replyPostAuthorDID = $replyPost['author']['did']; + $replyPostAuthorHandle = $replyPost['author']['handle'] !== 'handle.invalid' ? '@' . $replyPost['author']['handle'] . ' ' : ''; + $replyPostDisplayName = $replyPost['author']['displayName'] ?? ''; + $replyPostDisplayName = e($replyPostDisplayName); + $replyPostUri = self::URI . '/profile/' . $this->fallbackAuthor($replyPost['author'], 'url') . '/post/' . explode('app.bsky.feed.post/', $replyPost['uri'])[1]; - // reply post - $description .= $this->getPostDescription( - $replyPostDisplayName, - $replyPostAuthorHandle, - $replyPostUri, - $replyPostRecord, - 'reply' - ); + // reply post + $description .= $this->getPostDescription( + $replyPostDisplayName, + $replyPostAuthorHandle, + $replyPostUri, + $replyPostRecord, + 'reply' + ); - if (isset($replyPostRecord['embed']['$type'])) { - //post link embed - if ($replyPostRecord['embed']['$type'] === 'app.bsky.embed.external') { - $description .= $this->parseExternal($replyPostRecord['embed']['external'], $replyPostAuthorDID); - } elseif ( - $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && - $replyPostRecord['embed']['media']['$type'] === 'app.bsky.embed.external' - ) { - $description .= $this->parseExternal($replyPostRecord['embed']['media']['external'], $replyPostAuthorDID); - } - - //post images - if ( - $replyPostRecord['embed']['$type'] === 'app.bsky.embed.images' || - ( + if (isset($replyPostRecord['embed']['$type'])) { + //post link embed + if ($replyPostRecord['embed']['$type'] === 'app.bsky.embed.external') { + $description .= $this->parseExternal($replyPostRecord['embed']['external'], $replyPostAuthorDID); + } elseif ( $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && - $replyPostRecord['embed']['media']['$type'] === 'app.bsky.embed.images' - ) - ) { - $images = $replyPost['embed']['images'] ?? $replyPost['embed']['media']['images']; - foreach ($images as $image) { - $description .= $this->getPostImageDescription($image); + $replyPostRecord['embed']['media']['$type'] === 'app.bsky.embed.external' + ) { + $description .= $this->parseExternal($replyPostRecord['embed']['media']['external'], $replyPostAuthorDID); + } + + //post images + if ( + $replyPostRecord['embed']['$type'] === 'app.bsky.embed.images' || + ( + $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && + $replyPostRecord['embed']['media']['$type'] === 'app.bsky.embed.images' + ) + ) { + $images = $replyPost['embed']['images'] ?? $replyPost['embed']['media']['images']; + foreach ($images as $image) { + $description .= $this->getPostImageDescription($image); + } + } + + //post video + if ( + $replyPostRecord['embed']['$type'] === 'app.bsky.embed.video' || + ( + $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && + $replyPostRecord['embed']['media']['$type'] === 'app.bsky.embed.video' + ) + ) { + $description .= $this->getPostVideoDescription( + $replyPostRecord['embed']['video'] ?? $replyPostRecord['embed']['media']['video'], + $replyPostAuthorDID + ); } } + $description .= '

'; - //post video + //quote post if ( - $replyPostRecord['embed']['$type'] === 'app.bsky.embed.video' || - ( - $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && - $replyPostRecord['embed']['media']['$type'] === 'app.bsky.embed.video' - ) + isset($replyPostRecord['embed']) && + ($replyPostRecord['embed']['$type'] === 'app.bsky.embed.record' || $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia') && + isset($replyPost['embed']['record']) ) { - $description .= $this->getPostVideoDescription( - $replyPostRecord['embed']['video'] ?? $replyPostRecord['embed']['media']['video'], - $replyPostAuthorDID - ); - } - } - $description .= '

'; + $description .= '

'; + $replyQuotedRecord = $replyPost['embed']['record']['record'] ?? $replyPost['embed']['record']; - //quote post - if ( - isset($replyPostRecord['embed']) && - ($replyPostRecord['embed']['$type'] === 'app.bsky.embed.record' || $replyPostRecord['embed']['$type'] === 'app.bsky.embed.recordWithMedia') && - isset($replyPost['embed']['record']) - ) { - $description .= '

'; - $replyQuotedRecord = $replyPost['embed']['record']['record'] ?? $replyPost['embed']['record']; + if (isset($replyQuotedRecord['notFound']) && $replyQuotedRecord['notFound']) { //deleted post + $description .= 'Quoted post deleted.'; + } elseif (isset($replyQuotedRecord['detached']) && $replyQuotedRecord['detached']) { //detached quote + $uri_explode = explode('/', $replyQuotedRecord['uri']); + $uri_reconstructed = self::URI . '/profile/' . $uri_explode[2] . '/post/' . $uri_explode[4]; + $description .= 'Quoted post detached.'; + } elseif (isset($replyQuotedRecord['blocked']) && $replyQuotedRecord['blocked']) { //blocked by quote author + $description .= 'Author of quoted post has blocked OP.'; + } elseif ( + ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.feed.defs#generatorView' || + ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.graph.defs#listView' + ) { + $description .= $this->getListFeedDescription($replyQuotedRecord); + } elseif ( + ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.graph.starterpack' || + ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.graph.defs#starterPackViewBasic' + ) { + $description .= $this->getStarterPackDescription($replyPost['embed']['record']); + } else { + $quotedAuthorDid = $replyQuotedRecord['author']['did']; + $quotedDisplayName = $replyQuotedRecord['author']['displayName'] ?? ''; + $quotedDisplayName = e($quotedDisplayName); + $quotedAuthorHandle = $replyQuotedRecord['author']['handle'] !== 'handle.invalid' ? '@' . $replyQuotedRecord['author']['handle'] . '' : ''; - if (isset($replyQuotedRecord['notFound']) && $replyQuotedRecord['notFound']) { //deleted post - $description .= 'Quoted post deleted.'; - } elseif (isset($replyQuotedRecord['detached']) && $replyQuotedRecord['detached']) { //detached quote - $uri_explode = explode('/', $replyQuotedRecord['uri']); - $uri_reconstructed = self::URI . '/profile/' . $uri_explode[2] . '/post/' . $uri_explode[4]; - $description .= 'Quoted post detached.'; - } elseif (isset($replyQuotedRecord['blocked']) && $replyQuotedRecord['blocked']) { //blocked by quote author - $description .= 'Author of quoted post has blocked OP.'; - } elseif ( - ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.feed.defs#generatorView' || - ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.graph.defs#listView' - ) { - $description .= $this->getListFeedDescription($replyQuotedRecord); - } elseif ( - ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.graph.starterpack' || - ($replyQuotedRecord['$type'] ?? '') === 'app.bsky.graph.defs#starterPackViewBasic' - ) { - $description .= $this->getStarterPackDescription($replyPost['embed']['record']); - } else { - $quotedAuthorDid = $replyQuotedRecord['author']['did']; - $quotedDisplayName = $replyQuotedRecord['author']['displayName'] ?? ''; - $quotedDisplayName = e($quotedDisplayName); - $quotedAuthorHandle = $replyQuotedRecord['author']['handle'] !== 'handle.invalid' ? '@' . $replyQuotedRecord['author']['handle'] . '' : ''; + $parts = explode('/', $replyQuotedRecord['uri']); + $quotedPostId = end($parts); + $quotedPostUri = self::URI . '/profile/' . $this->fallbackAuthor($replyQuotedRecord['author'], 'url') . '/post/' . $quotedPostId; - $parts = explode('/', $replyQuotedRecord['uri']); - $quotedPostId = end($parts); - $quotedPostUri = self::URI . '/profile/' . $this->fallbackAuthor($replyQuotedRecord['author'], 'url') . '/post/' . $quotedPostId; + //quoted post - post + $description .= $this->getPostDescription( + $quotedDisplayName, + $quotedAuthorHandle, + $quotedPostUri, + $replyQuotedRecord, + 'quote' + ); - //quoted post - post - $description .= $this->getPostDescription( - $quotedDisplayName, - $quotedAuthorHandle, - $quotedPostUri, - $replyQuotedRecord, - 'quote' - ); + if (isset($replyQuotedRecord['value']['embed']['$type'])) { + //quoted post - post link embed + if ($replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.external') { + $description .= $this->parseExternal($replyQuotedRecord['value']['embed']['external'], $quotedAuthorDid); + } - if (isset($replyQuotedRecord['value']['embed']['$type'])) { - //quoted post - post link embed - if ($replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.external') { - $description .= $this->parseExternal($replyQuotedRecord['value']['embed']['external'], $quotedAuthorDid); - } + //quoted post - post video + if ( + $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.video' || + ( + $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && + $replyQuotedRecord['value']['embed']['media']['$type'] === 'app.bsky.embed.video' + ) + ) { + $description .= $this->getPostVideoDescription( + $replyQuotedRecord['value']['embed']['video'] ?? $replyQuotedRecord['value']['embed']['media']['video'], + $quotedAuthorDid + ); + } - //quoted post - post video - if ( - $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.video' || - ( - $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && - $replyQuotedRecord['value']['embed']['media']['$type'] === 'app.bsky.embed.video' - ) - ) { - $description .= $this->getPostVideoDescription( - $replyQuotedRecord['value']['embed']['video'] ?? $replyQuotedRecord['value']['embed']['media']['video'], - $quotedAuthorDid - ); - } - - //quoted post - post images - if ( - $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.images' || - ( - $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && - $replyQuotedRecord['value']['embed']['media']['$type'] === 'app.bsky.embed.images' - ) - ) { - foreach ($replyQuotedRecord['embeds'] as $embed) { - if ( - $embed['$type'] === 'app.bsky.embed.images#view' || - ($embed['$type'] === 'app.bsky.embed.recordWithMedia#view' && $embed['media']['$type'] === 'app.bsky.embed.images#view') - ) { - $images = $embed['images'] ?? $embed['media']['images']; - foreach ($images as $image) { - $description .= $this->getPostImageDescription($image); + //quoted post - post images + if ( + $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.images' || + ( + $replyQuotedRecord['value']['embed']['$type'] === 'app.bsky.embed.recordWithMedia' && + $replyQuotedRecord['value']['embed']['media']['$type'] === 'app.bsky.embed.images' + ) + ) { + foreach ($replyQuotedRecord['embeds'] as $embed) { + if ( + $embed['$type'] === 'app.bsky.embed.images#view' || + ($embed['$type'] === 'app.bsky.embed.recordWithMedia#view' && $embed['media']['$type'] === 'app.bsky.embed.images#view') + ) { + $images = $embed['images'] ?? $embed['media']['images']; + foreach ($images as $image) { + $description .= $this->getPostImageDescription($image); + } } } } } } + $description .= '

'; } - $description .= '

'; } } @@ -496,7 +502,7 @@ class BlueskyBridge extends BridgeAbstract $videoMime = $video['mimeType']; $thumbnail = "poster=\"https://video.bsky.app/watch/$authorDID/$videoCID/thumbnail.jpg\"" ?? ''; $videoURL = "https://bsky.social/xrpc/com.atproto.sync.getBlob?did=$authorDID&cid=$videoCID"; - return "
"; + return "
"; } private function getPostImageDescription(array $image)