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

Merge pull request 'Bluesky: Fix some issues when fetching posts' (#1424) from heluecht/friendica-addons:bluesky-fixes into develop

Browse source 
Reviewed-on: #1424
This commit is contained in:
Hypolite Petovan 2023-10-03 03:54:41 +02:00
parent 410613d7a0 16d99dbdfc
commit be8d8b9c10
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bluesky/bluesky.php
View file

@ -990,8 +990,12 @@ function bluesky_fetch_feed(int $uid, string $feed)
$id = bluesky_process_post($entry->post, $uid, Item::PR_TAG, 0); $id = bluesky_process_post($entry->post, $uid, Item::PR_TAG, 0);
if (!empty($id)) { if (!empty($id)) {
$post = Post::selectFirst(['uri-id'], ['id' => $id]); $post = Post::selectFirst(['uri-id'], ['id' => $id]);
$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl); if (!empty($post['uri-id'])) {
Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]); $stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
} else {
Logger::notice('Post not found', ['id' => $id, 'entry' => $entry]);
}
} }
if (!empty($entry->reason)) { if (!empty($entry->reason)) {
bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid); bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
@ -1003,8 +1007,12 @@ function bluesky_process_post(stdClass $post, int $uid, int $post_reason, $level
{ {
$uri = bluesky_get_uri($post); $uri = bluesky_get_uri($post);
if ($id = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $uid]) || $id = Post::selectFirst(['id'], ['extid' => $uri, 'uid' => $uid])) { if ($id = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $uid])) {
return $id; return $id['id'];
}
if ($id = Post::selectFirst(['id'], ['extid' => $uri, 'uid' => $uid])) {
return $id['id'];
} }
Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']); Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
@ -1092,7 +1100,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
function bluesky_get_text(stdClass $record): string function bluesky_get_text(stdClass $record): string
{ {
$text = $record->text; $text = $record->text ?? '';
if (empty($record->facets)) { if (empty($record->facets)) {
return $text; return $text;
@ -1185,11 +1193,10 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
$shared = bluesky_add_media($single, $shared, $fetch_uid, $level); $shared = bluesky_add_media($single, $shared, $fetch_uid, $level);
} }
} }
$id = Item::insert($shared); Item::insert($shared);
$shared = Post::selectFirst(['uri-id'], ['id' => $id]);
} }
} }
if (!empty($shared)) { if (!empty($shared['uri-id'])) {
$item['quote-uri-id'] = $shared['uri-id']; $item['quote-uri-id'] = $shared['uri-id'];
} }
break; break;
@ -1206,12 +1213,10 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
$shared = bluesky_add_media($single, $shared, $fetch_uid, $level); $shared = bluesky_add_media($single, $shared, $fetch_uid, $level);
} }
} }
Item::insert($shared);
$id = Item::insert($shared);
$shared = Post::selectFirst(['uri-id'], ['id' => $id]);
} }
} }
if (!empty($shared)) { if (!empty($shared['uri-id'])) {
$item['quote-uri-id'] = $shared['uri-id']; $item['quote-uri-id'] = $shared['uri-id'];
} }
@ -1331,7 +1336,12 @@ function bluesky_fetch_post(string $uri, int $uid): string
function bluesky_process_thread(stdClass $thread, int $uid, array $cdata, int $level): string function bluesky_process_thread(stdClass $thread, int $uid, array $cdata, int $level): string
{ {
if (empty($thread->post)) {
Logger::info('Invalid post', ['post' => $thread, 'callstack' => System::callstack(10, 0, true)]);
return '';
}
$uri = bluesky_get_uri($thread->post); $uri = bluesky_get_uri($thread->post);
$fetched_uri = bluesky_fetch_post($uri, $uid); $fetched_uri = bluesky_fetch_post($uri, $uid);
if (empty($fetched_uri)) { if (empty($fetched_uri)) {
Logger::debug('Process missing post', ['uri' => $uri]); Logger::debug('Process missing post', ['uri' => $uri]);