haheute/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request '[bluesky] Fix double dollar sign in bluesky_fetch_notifications' (#1415) from MrPetovan/friendica-addons:bug/warnings into develop

Browse source 
Reviewed-on: friendica/friendica-addons#1415
This commit is contained in:
heluecht 2023-08-28 06:51:12 +02:00
commit 187ba8383d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bluesky/bluesky.php
View file

@ -798,12 +798,12 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
$picture = new Image($content, $photo['type']); $picture = new Image($content, $photo['type']);
$height = $picture->getHeight(); $height = $picture->getHeight();
$width = $picture->getWidth(); $width = $picture->getWidth();
$size = strlen($content); $size = strlen($content);
$picture = Photo::resizeToFileSize($picture, BLUESKY_IMAGE_SIZE[$retrial]); $picture = Photo::resizeToFileSize($picture, BLUESKY_IMAGE_SIZE[$retrial]);
$new_height = $picture->getHeight(); $new_height = $picture->getHeight();
$new_width = $picture->getWidth(); $new_width = $picture->getWidth();
$content = $picture->asString(); $content = $picture->asString();
$new_size = strlen($content); $new_size = strlen($content);
@ -917,7 +917,7 @@ function bluesky_fetch_notifications(int $uid)
$data = Item::insert($item); $data = Item::insert($item);
Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]); Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
} else { } else {
Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $$item['thr-parent'], 'uri' => $uri]); Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
} }
break; break;
@ -1274,7 +1274,7 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $causer, int $lev
if (++$level > 100) { if (++$level > 100) {
Logger::info('Recursion level too deep', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]); Logger::info('Recursion level too deep', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
// When the level is too deep we will fallback to the parent uri. // When the level is too deep we will fallback to the parent uri.
// Allthough the threading won't be correct, we at least had stored all posts and won't try again // Allthough the threading won't be correct, we at least had stored all posts and won't try again
return $fallback; return $fallback;
} }
@ -1287,8 +1287,8 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $causer, int $lev
Logger::info('Thread was not fetched', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]); Logger::info('Thread was not fetched', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
return $fallback; return $fallback;
} }
Logger::debug('Reply count', ['replies' => $data->thread->post->replyCount, 'level' => $level, 'uid' => $uid, 'uri' => $uri]); Logger::debug('Reply count', ['replies' => $data->thread->post->replyCount, 'level' => $level, 'uid' => $uid, 'uri' => $uri]);
if ($causer != 0) { if ($causer != 0) {
$cdata = Contact::getPublicAndUserContactID($causer, $uid); $cdata = Contact::getPublicAndUserContactID($causer, $uid);
@ -1587,4 +1587,4 @@ function bluesky_get(int $uid, string $url, string $accept_content = HttpClientA
} }
return json_decode($curlResult->getBody()); return json_decode($curlResult->getBody());
} }