From dff48c3295d13f195ae5d5ee93d2988c594e0be2 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 21 May 2023 18:54:02 +0000 Subject: [PATCH 1/4] Bluesky: Basic connector for Bluesky is added --- bluesky/bluesky.php | 378 +++++++++++++++++++++++ bluesky/lang/C/messages.po | 66 ++++ bluesky/templates/connector_settings.tpl | 7 + tumblr/tumblr.php | 11 +- 4 files changed, 459 insertions(+), 3 deletions(-) create mode 100644 bluesky/bluesky.php create mode 100644 bluesky/lang/C/messages.po create mode 100644 bluesky/templates/connector_settings.tpl diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php new file mode 100644 index 000000000..d5652b920 --- /dev/null +++ b/bluesky/bluesky.php @@ -0,0 +1,378 @@ + + */ + +use Friendica\Content\Text\BBCode; +use Friendica\Content\Text\Plaintext; +use Friendica\Core\Config\Util\ConfigFileManager; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\DI; +use Friendica\Model\Item; +use Friendica\Model\Photo; +use Friendica\Network\HTTPClient\Client\HttpClientAccept; +use Friendica\Network\HTTPClient\Client\HttpClientOptions; +use Friendica\Util\DateTimeFormat; + +function bluesky_install() +{ + Hook::register('load_config', __FILE__, 'bluesky_load_config'); + Hook::register('hook_fork', __FILE__, 'bluesky_hook_fork'); + Hook::register('post_local', __FILE__, 'bluesky_post_local'); + Hook::register('notifier_normal', __FILE__, 'bluesky_send'); + Hook::register('jot_networks', __FILE__, 'bluesky_jot_nets'); + Hook::register('connector_settings', __FILE__, 'bluesky_settings'); + Hook::register('connector_settings_post', __FILE__, 'bluesky_settings_post'); +} + +function bluesky_load_config(ConfigFileManager $loader) +{ + DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); +} + +function bluesky_settings(array &$data) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } + + $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false; + $def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false; + $host = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'host') ?: 'https://bsky.social'; + $handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle'); + $did = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did'); + $username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'username'); + + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/'); + $html = Renderer::replaceMacros($t, [ + '$enable' => ['bluesky', DI::l10n()->t('Enable Bluesky Post Addon'), $enabled], + '$bydefault' => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled], + '$host' => ['bluesky_host', DI::l10n()->t('Bluesky host'), $host, '', '', '', 'url'], + '$handle' => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle], + '$did' => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'], + '$username' => ['bluesky_username', DI::l10n()->t('Bluesky app username'), $username, DI::l10n()->t("Please don't add your real username here, but instead create a specific app username and app password in the Bluesky settings.")], + '$password' => ['bluesky_password', DI::l10n()->t('Bluesky app password'), ''], + ]); + + $data = [ + 'connector' => 'bluesky', + 'title' => DI::l10n()->t('Bluesky Export'), + 'image' => 'images/bluesky.jpg', + 'enabled' => $enabled, + 'html' => $html, + ]; +} + +function bluesky_settings_post(array &$b) +{ + if (empty($_POST['bluesky-submit'])) { + return; + } + + $old_host = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'host'); + $old_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle'); + $old_did = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did'); + + $host = $_POST['bluesky_host']; + $handle = $_POST['bluesky_handle']; + + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post', intval($_POST['bluesky'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default', intval($_POST['bluesky_bydefault'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'host', $host); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle', $handle); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'username', $_POST['bluesky_username']); + + if (!empty($_POST['bluesky_password'])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'app_password', $_POST['bluesky_password']); + } + + if (!empty($host) && !empty($handle)) { + if (empty($old_did) || $old_host != $host || $old_handle != $handle) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'did', bluesky_get_did(DI::userSession()->getLocalUserId())); + } + } else { + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'did'); + } +} + +function bluesky_jot_nets(array &$jotnets_fields) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } + + if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'bluesky_enable', + DI::l10n()->t('Post to Bluesky'), + DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') + ] + ]; + } +} + +function bluesky_hook_fork(array &$b) +{ + if ($b['name'] != 'notifier_normal') { + return; + } + + $post = $b['data']; + + if (($post['created'] !== $post['edited']) && !$post['deleted']) { + DI::logger()->info('Editing is not supported by the addon'); + $b['execute'] = false; + return; + } + + if (!strstr($post['postopts'] ?? '', 'bluesky') || ($post['parent'] != $post['id']) || $post['private']) { + $b['execute'] = false; + return; + } +} + +function bluesky_post_local(array &$b) +{ + if ($b['edit']) { + return; + } + + if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) { + return; + } + + if ($b['private'] || $b['parent']) { + return; + } + + $bluesky_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post')); + $bluesky_enable = (($bluesky_post && !empty($_REQUEST['bluesky_enable'])) ? intval($_REQUEST['bluesky_enable']) : 0); + + // if API is used, default to the chosen settings + if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default'))) { + $bluesky_enable = 1; + } + + if (!$bluesky_enable) { + return; + } + + if (strlen($b['postopts'])) { + $b['postopts'] .= ','; + } + + $b['postopts'] .= 'bluesky'; +} + +function bluesky_send(array &$b) +{ + if (($b['created'] !== $b['edited']) && !$b['deleted']) { + return; + } + + if ($b['gravity'] != Item::GRAVITY_PARENT) { + return; + } elseif ($b['private'] || !strstr($b['postopts'], 'bluesky')) { + return; + } + + bluesky_create_post($b); +} + +function bluesky_create_post(array $item) +{ + $uid = $item['uid']; + $token = bluesky_get_token($uid); + if (empty($token)) { + return; + } + + $did = DI::pConfig()->get($uid, 'bluesky', 'did'); + + $msg = Plaintext::getPost($item, 300, false, BBCode::CONNECTORS); + $parent = $root = []; + foreach ($msg['parts'] as $key => $part) { + $record = [ + 'text' => $part, + 'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM), + '$type' => 'app.bsky.feed.post' + ]; + + if (!empty($root)) { + $record['reply'] = ['root' => $root, 'parent' => $parent]; + } + + if ($key == count($msg['parts']) - 1) { + $record = bluesky_add_embed($uid, $msg, $record); + } + + $post = [ + 'collection' => 'app.bsky.feed.post', + 'repo' => $did, + 'record' => $record + ]; + + $parent = bluesky_post($uid, '/xrpc/com.atproto.repo.createRecord', json_encode($post), ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . $token]]); + if (empty($parent)) { + return; + } + Logger::debug('Posting done', ['return' => $parent]); + if (empty($root)) { + $root = $parent; + } + } +} + +function bluesky_add_embed(int $uid, array $msg, array $record): array +{ + if (($msg['type'] != 'link') && !empty($msg['images'])) { + $images = []; + foreach ($msg['images'] as $image) { + $photo = Photo::selectFirst(['resource-id'], ['id' => $image['id']]); + $photo = Photo::selectFirst([], ["`resource-id` = ? AND `scale` > ?", $photo['resource-id'], 0], ['order' => ['scale']]); + $blob = bluesky_upload_blob($uid, $photo); + if (!empty($blob)) { + $images[] = ['alt' => $image['description'], 'image' => $blob]; + } + } + if (!empty($images)) { + $record['embed'] = ['$type' => 'app.bsky.embed.images', 'images' => $images]; + } + } elseif ($msg['type'] == 'link') { + $record['embed'] = [ + '$type' => 'app.bsky.embed.external', + 'external' => [ + 'uri' => $msg['url'], + 'title' => $msg['title'], + 'description' => $msg['description'], + ] + ]; + if (!empty($msg['image'])) { + $photo = Photo::createPhotoForExternalResource($msg['image']); + $blob = bluesky_upload_blob($uid, $photo); + if (!empty($blob)) { + $record['embed']['external']['thumb'] = $blob; + } + } + } + return $record; +} + +function bluesky_upload_blob(int $uid, array $photo): ?stdClass +{ + $content = Photo::getImageForPhoto($photo); + $data = bluesky_post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]); + if (empty($data)) { + return null; + } + + Logger::debug('Uploaded blob', ['return' => $data]); + return $data->blob; +} + +function bluesky_get_timeline(int $uid) +{ + $data = bluesky_get($uid, '/xrpc/app.bsky.feed.getTimeline', HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]); + if (empty($data)) { + return; + } + // TODO Add Functionality to read the timeline +} + +function bluesky_get_did(int $uid): string +{ + $data = bluesky_get($uid, '/xrpc/com.atproto.identity.resolveHandle?handle=' . DI::pConfig()->get($uid, 'bluesky', 'handle')); + if (empty($data)) { + return ''; + } + Logger::debug('Got DID', ['return' => $data]); + return $data->did; +} + +function bluesky_get_token(int $uid): string +{ + $token = DI::pConfig()->get($uid, 'bluesky', 'access_token'); + $created = DI::pConfig()->get($uid, 'bluesky', 'token_created'); + if (empty($token)) { + return bluesky_create_token($uid); + } + + if ($created + 300 < time()) { + return bluesky_refresh_token($uid); + } + return $token; +} + +function bluesky_refresh_token(int $uid): string +{ + $token = DI::pConfig()->get($uid, 'bluesky', 'refresh_token'); + + $data = bluesky_post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]); + if (empty($data)) { + return ''; + } + + Logger::debug('Refreshed token', ['return' => $data]); + DI::pConfig()->set($uid, 'bluesky', 'access_token', $data->accessJwt); + DI::pConfig()->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt); + DI::pConfig()->set($uid, 'bluesky', 'token_created', time()); + return $data->accessJwt; +} + +function bluesky_create_token(int $uid): string +{ + $did = DI::pConfig()->get($uid, 'bluesky', 'did'); + $password = DI::pConfig()->get($uid, 'bluesky', 'app_password'); + + $data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']); + if (empty($data)) { + return ''; + } + + Logger::debug('Created token', ['return' => $data]); + DI::pConfig()->set($uid, 'bluesky', 'access_token', $data->accessJwt); + DI::pConfig()->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt); + DI::pConfig()->set($uid, 'bluesky', 'token_created', time()); + return $data->accessJwt; +} + +function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass +{ + try { + $curlResult = DI::httpClient()->post(DI::pConfig()->get($uid, 'bluesky', 'host') . $url, $params, $headers); + } catch (\Exception $e) { + Logger::notice('Exception on post', ['exception' => $e]); + return null; + } + + if (!$curlResult->isSuccess()) { + Logger::notice('API Error', ['error' => json_decode($curlResult->getBody()) ?: $curlResult->getBody()]); + return null; + } + + return json_decode($curlResult->getBody()); +} + +function bluesky_get(int $uid, string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass +{ + try { + $curlResult = DI::httpClient()->get(DI::pConfig()->get($uid, 'bluesky', 'host') . $url, $accept_content, $opts); + } catch (\Exception $e) { + Logger::notice('Exception on get', ['exception' => $e]); + return null; + } + + if (!$curlResult->isSuccess()) { + Logger::notice('API Error', ['error' => json_decode($curlResult->getBody()) ?: $curlResult->getBody()]); + return null; + } + + return json_decode($curlResult->getBody()); +} diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po new file mode 100644 index 000000000..6e37d8d69 --- /dev/null +++ b/bluesky/lang/C/messages.po @@ -0,0 +1,66 @@ +# ADDON bluesky +# Copyright (C) +# This file is distributed under the same license as the Friendica bluesky addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-05-21 16:55+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: bluesky.php:52 +msgid "Enable Bluesky Post Addon" +msgstr "" + +#: bluesky.php:53 +msgid "Post to Bluesky by default" +msgstr "" + +#: bluesky.php:54 +msgid "Bluesky host" +msgstr "" + +#: bluesky.php:55 +msgid "Bluesky handle" +msgstr "" + +#: bluesky.php:56 +msgid "Bluesky DID" +msgstr "" + +#: bluesky.php:56 +msgid "" +"This is the unique identifier. It will be fetched automatically, when the " +"handle is entered." +msgstr "" + +#: bluesky.php:57 +msgid "Bluesky app username" +msgstr "" + +#: bluesky.php:57 +msgid "" +"Please don't add your real username here, but instead create a specific app " +"username and app password in the Bluesky settings." +msgstr "" + +#: bluesky.php:58 +msgid "Bluesky app password" +msgstr "" + +#: bluesky.php:63 +msgid "Bluesky Export" +msgstr "" + +#: bluesky.php:113 +msgid "Post to Bluesky" +msgstr "" diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl new file mode 100644 index 000000000..55fab361d --- /dev/null +++ b/bluesky/templates/connector_settings.tpl @@ -0,0 +1,7 @@ +{{include file="field_checkbox.tpl" field=$enable}} +{{include file="field_checkbox.tpl" field=$bydefault}} +{{include file="field_input.tpl" field=$host}} +{{include file="field_input.tpl" field=$handle}} +{{include file="field_input.tpl" field=$did}} +{{include file="field_input.tpl" field=$username}} +{{include file="field_input.tpl" field=$password}} \ No newline at end of file diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 21a7504a1..1eae01bf9 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -79,7 +79,7 @@ function tumblr_check_item_notification(array &$notification_data) return; } - $own_user = Contact::selectFirst(['url', 'alias'], ['uid' => $notification_data['uid'], 'poll' => 'tumblr::'.$page]); + $own_user = Contact::selectFirst(['url', 'alias'], ['uid' => $notification_data['uid'], 'poll' => 'tumblr::' . $page]); if ($own_user) { $notification_data['profiles'][] = $own_user['url']; $notification_data['profiles'][] = $own_user['alias']; @@ -1262,6 +1262,11 @@ function tumblr_get_contact_by_url(string $url): ?array return null; } + if (is_array($data->response->blog)) { + Logger::warning('Unexpected blog format', ['blog' => $blog, 'data' => $data]); + return null; + } + $baseurl = 'https://tumblr.com'; $url = $baseurl . '/' . $data->response->blog->name; @@ -1282,8 +1287,8 @@ function tumblr_get_contact_by_url(string $url): ?array 'priority' => 0, 'guid' => $data->response->blog->uuid, 'about' => HTML::toBBCode($data->response->blog->description), - 'photo' => $data->response->blog->avatar[0]->url, - 'header' => $data->response->blog->theme->header_image_focused, + 'photo' => $data->response->blog->avatar[0]->url, + 'header' => $data->response->blog->theme->header_image_focused, ]; } From 77813a2acd99e54ad91d4da7c55a1ab4434ea541 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 21 May 2023 18:58:05 +0000 Subject: [PATCH 2/4] Make the host readonly --- bluesky/bluesky.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php index d5652b920..7c0bafbc0 100644 --- a/bluesky/bluesky.php +++ b/bluesky/bluesky.php @@ -52,7 +52,7 @@ function bluesky_settings(array &$data) $html = Renderer::replaceMacros($t, [ '$enable' => ['bluesky', DI::l10n()->t('Enable Bluesky Post Addon'), $enabled], '$bydefault' => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled], - '$host' => ['bluesky_host', DI::l10n()->t('Bluesky host'), $host, '', '', '', 'url'], + '$host' => ['bluesky_host', DI::l10n()->t('Bluesky host'), $host, '', '', 'readonly'], '$handle' => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle], '$did' => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'], '$username' => ['bluesky_username', DI::l10n()->t('Bluesky app username'), $username, DI::l10n()->t("Please don't add your real username here, but instead create a specific app username and app password in the Bluesky settings.")], From ea6e79448d4b319a08dd35c903d23686b3717c1b Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 21 May 2023 19:25:57 +0000 Subject: [PATCH 3/4] Simplify token creation --- bluesky/bluesky.php | 25 +++++------ bluesky/lang/C/messages.po | 54 +++++++++++++----------- bluesky/templates/connector_settings.tpl | 2 +- 3 files changed, 44 insertions(+), 37 deletions(-) diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php index 7c0bafbc0..e83b7fd70 100644 --- a/bluesky/bluesky.php +++ b/bluesky/bluesky.php @@ -46,7 +46,9 @@ function bluesky_settings(array &$data) $host = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'host') ?: 'https://bsky.social'; $handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle'); $did = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did'); - $username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'username'); + $token = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token'); + + $status = $token ? DI::l10n()->t("You are authenticated to Bluesky. For security reasons the password isn't stored.") : DI::l10n()->t('You are not authenticated. Please enter the app password.'); $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/'); $html = Renderer::replaceMacros($t, [ @@ -55,8 +57,8 @@ function bluesky_settings(array &$data) '$host' => ['bluesky_host', DI::l10n()->t('Bluesky host'), $host, '', '', 'readonly'], '$handle' => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle], '$did' => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'], - '$username' => ['bluesky_username', DI::l10n()->t('Bluesky app username'), $username, DI::l10n()->t("Please don't add your real username here, but instead create a specific app username and app password in the Bluesky settings.")], - '$password' => ['bluesky_password', DI::l10n()->t('Bluesky app password'), ''], + '$password' => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")], + '$status' => $status ]); $data = [ @@ -85,11 +87,6 @@ function bluesky_settings_post(array &$b) DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default', intval($_POST['bluesky_bydefault'])); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'host', $host); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle', $handle); - DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'username', $_POST['bluesky_username']); - - if (!empty($_POST['bluesky_password'])) { - DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'app_password', $_POST['bluesky_password']); - } if (!empty($host) && !empty($handle)) { if (empty($old_did) || $old_host != $host || $old_handle != $handle) { @@ -98,6 +95,11 @@ function bluesky_settings_post(array &$b) } else { DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'did'); } + + if (!empty($_POST['bluesky_password'])) { + bluesky_create_token(DI::userSession()->getLocalUserId(), $_POST['bluesky_password']); + } + } function bluesky_jot_nets(array &$jotnets_fields) @@ -301,7 +303,7 @@ function bluesky_get_token(int $uid): string $token = DI::pConfig()->get($uid, 'bluesky', 'access_token'); $created = DI::pConfig()->get($uid, 'bluesky', 'token_created'); if (empty($token)) { - return bluesky_create_token($uid); + return ''; } if ($created + 300 < time()) { @@ -326,10 +328,9 @@ function bluesky_refresh_token(int $uid): string return $data->accessJwt; } -function bluesky_create_token(int $uid): string +function bluesky_create_token(int $uid, string $password): string { - $did = DI::pConfig()->get($uid, 'bluesky', 'did'); - $password = DI::pConfig()->get($uid, 'bluesky', 'app_password'); + $did = DI::pConfig()->get($uid, 'bluesky', 'did'); $data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']); if (empty($data)) { diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po index 6e37d8d69..a910f0616 100644 --- a/bluesky/lang/C/messages.po +++ b/bluesky/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-21 16:55+0000\n" +"POT-Creation-Date: 2023-05-21 19:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,50 +17,56 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: bluesky.php:52 -msgid "Enable Bluesky Post Addon" +#: bluesky.php:51 +msgid "" +"You are authenticated to Bluesky. For security reasons the password isn't " +"stored." msgstr "" -#: bluesky.php:53 -msgid "Post to Bluesky by default" -msgstr "" - -#: bluesky.php:54 -msgid "Bluesky host" +#: bluesky.php:51 +msgid "You are not authenticated. Please enter the app password." msgstr "" #: bluesky.php:55 +msgid "Enable Bluesky Post Addon" +msgstr "" + +#: bluesky.php:56 +msgid "Post to Bluesky by default" +msgstr "" + +#: bluesky.php:57 +msgid "Bluesky host" +msgstr "" + +#: bluesky.php:58 msgid "Bluesky handle" msgstr "" -#: bluesky.php:56 +#: bluesky.php:59 msgid "Bluesky DID" msgstr "" -#: bluesky.php:56 +#: bluesky.php:59 msgid "" "This is the unique identifier. It will be fetched automatically, when the " "handle is entered." msgstr "" -#: bluesky.php:57 -msgid "Bluesky app username" -msgstr "" - -#: bluesky.php:57 -msgid "" -"Please don't add your real username here, but instead create a specific app " -"username and app password in the Bluesky settings." -msgstr "" - -#: bluesky.php:58 +#: bluesky.php:60 msgid "Bluesky app password" msgstr "" -#: bluesky.php:63 +#: bluesky.php:60 +msgid "" +"Please don't add your real password here, but instead create a specific app " +"password in the Bluesky settings." +msgstr "" + +#: bluesky.php:66 msgid "Bluesky Export" msgstr "" -#: bluesky.php:113 +#: bluesky.php:116 msgid "Post to Bluesky" msgstr "" diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl index 55fab361d..264a15d77 100644 --- a/bluesky/templates/connector_settings.tpl +++ b/bluesky/templates/connector_settings.tpl @@ -1,7 +1,7 @@ +

{{$status}}

{{include file="field_checkbox.tpl" field=$enable}} {{include file="field_checkbox.tpl" field=$bydefault}} {{include file="field_input.tpl" field=$host}} {{include file="field_input.tpl" field=$handle}} {{include file="field_input.tpl" field=$did}} -{{include file="field_input.tpl" field=$username}} {{include file="field_input.tpl" field=$password}} \ No newline at end of file From a7ea815642838f30cc66c151eac455a5daf9313b Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 21 May 2023 20:14:20 +0000 Subject: [PATCH 4/4] Post up to 4 images --- bluesky/bluesky.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php index e83b7fd70..446e8477d 100644 --- a/bluesky/bluesky.php +++ b/bluesky/bluesky.php @@ -240,7 +240,7 @@ function bluesky_add_embed(int $uid, array $msg, array $record): array $photo = Photo::selectFirst(['resource-id'], ['id' => $image['id']]); $photo = Photo::selectFirst([], ["`resource-id` = ? AND `scale` > ?", $photo['resource-id'], 0], ['order' => ['scale']]); $blob = bluesky_upload_blob($uid, $photo); - if (!empty($blob)) { + if (!empty($blob) && count($images) < 4) { $images[] = ['alt' => $image['description'], 'image' => $blob]; } } @@ -285,7 +285,15 @@ function bluesky_get_timeline(int $uid) if (empty($data)) { return; } - // TODO Add Functionality to read the timeline + + if (empty($data->feed)) { + return; + } + + foreach ($data->feed as $entry) { + // TODO Add Functionality to read the timeline + print_r($entry); + } } function bluesky_get_did(int $uid): string