friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Merge pull request 'Bluesky: Fix "E_WARNING: Undefined property: stdClass::$cid"' (#1405) from heluecht/friendica-addons:bluesky-warning into develop

Browse source 
Reviewed-on: #1405
This commit is contained in:
Tobias Diekershoff 2023-07-22 19:04:34 +02:00
parent 5d666fbd1e 3377ef3ba3
commit f328dc2b83
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bluesky/bluesky.php
View file

@ -32,6 +32,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -760,8 +761,8 @@ function bluesky_add_embed(int $uid, array $msg, array $record): array
'$type' => 'app.bsky.embed.external', '$type' => 'app.bsky.embed.external',
'external' => [ 'external' => [
'uri' => $msg['url'], 'uri' => $msg['url'],
'title' => $msg['title'], 'title' => $msg['title'] ?? '',
'description' => $msg['description'], 'description' => $msg['description'] ?? '',
] ]
]; ];
if (!empty($msg['image'])) { if (!empty($msg['image'])) {
@ -1126,6 +1127,10 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
$uri = bluesky_get_uri($embed->record); $uri = bluesky_get_uri($embed->record);
$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => $item['uid']]); $shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => $item['uid']]);
if (empty($shared)) { if (empty($shared)) {
if (empty($embed->record->value)) {
Logger::info('Record has got no value', ['record' => $embed->record]);
break;
}
$shared = bluesky_get_header($embed->record, $uri, 0, $fetch_uid); $shared = bluesky_get_header($embed->record, $uri, 0, $fetch_uid);
$shared = bluesky_get_content($shared, $embed->record->value, $uri, $item['uid'], $level); $shared = bluesky_get_content($shared, $embed->record->value, $uri, $item['uid'], $level);
if (!empty($shared)) { if (!empty($shared)) {
@ -1178,6 +1183,10 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
function bluesky_get_uri(stdClass $post): string function bluesky_get_uri(stdClass $post): string
{ {
if (empty($post->cid)) {
Logger::info('Invalid URI', ['post' => $post, 'callstack' => System::callstack(10, 0, true)]);
return '';
}
return $post->uri . ':' . $post->cid; return $post->uri . ':' . $post->cid;
} }