From 5df1b59bb3c29d9dd857fa8b979ab2b40334f71a Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Jun 2021 17:43:30 +0000 Subject: [PATCH 1/5] Fix "Undefined index: post-type in .../src/Model/Item.php on line 2888" --- src/Model/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 7bc8270a17..2b57557ca8 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2885,7 +2885,7 @@ class Item 'mime' => $attachment['mimetype'], ], ]); - if ($item['post-type'] == Item::PT_AUDIO) { + if (($item['post-type'] ?? null) == Item::PT_AUDIO) { $leading .= $media; } else { $trailing .= $media; From 0fead7e3ea2aeb41682b49669630b247b48d30a6 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 2 Jun 2021 23:03:08 +0200 Subject: [PATCH 2/5] Replace assertInternalType() with proper assertions --- tests/legacy/ApiTest.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php index 423294e597..c94571d857 100644 --- a/tests/legacy/ApiTest.php +++ b/tests/legacy/ApiTest.php @@ -157,8 +157,8 @@ class ApiTest extends FixtureTest */ private function assertStatus(array $status = []) { - self::assertInternalType('string', $status['text'] ?? ''); - self::assertInternalType('int', $status['id'] ?? ''); + self::assertIsString($status['text'] ?? ''); + self::assertIsInt($status['id'] ?? ''); // We could probably do more checks here. } @@ -171,9 +171,9 @@ class ApiTest extends FixtureTest */ private function assertList(array $list = []) { - self::assertInternalType('string', $list['name']); - self::assertInternalType('int', $list['id']); - self::assertInternalType('string', $list['id_str']); + self::assertIsString($list['name']); + self::assertIsInt($list['id']); + self::assertIsString('string', $list['id_str']); self::assertContains($list['mode'], ['public', 'private']); // We could probably do more checks here. } @@ -762,7 +762,7 @@ class ApiTest extends FixtureTest public function testApiRssExtraWithoutUserInfo() { $result = api_rss_extra($this->app, [], null); - self::assertInternalType('array', $result['$user']); + self::assertIsArray($result['$user']); self::assertArrayHasKey('alternate', $result['$rss']); self::assertArrayHasKey('self', $result['$rss']); self::assertArrayHasKey('base', $result['$rss']); @@ -2355,7 +2355,7 @@ class ApiTest extends FixtureTest public function testApiGetAttachmentsWithImage() { $body = '[img]http://via.placeholder.com/1x1.png[/img]'; - self::assertInternalType('array', api_get_attachments($body)); + self::assertIsArray(api_get_attachments($body)); } /** @@ -2367,7 +2367,7 @@ class ApiTest extends FixtureTest { $_SERVER['HTTP_USER_AGENT'] = 'AndStatus'; $body = '[img]http://via.placeholder.com/1x1.png[/img]'; - self::assertInternalType('array', api_get_attachments($body)); + self::assertIsArray(api_get_attachments($body)); } /** @@ -2378,7 +2378,7 @@ class ApiTest extends FixtureTest public function testApiGetEntitities() { $text = 'text'; - self::assertInternalType('array', api_get_entitities($text, 'bbcode')); + self::assertIsArray(api_get_entitities($text, 'bbcode')); } /** @@ -2391,10 +2391,10 @@ class ApiTest extends FixtureTest $_REQUEST['include_entities'] = 'true'; $text = 'text'; $result = api_get_entitities($text, 'bbcode'); - self::assertInternalType('array', $result['hashtags']); - self::assertInternalType('array', $result['symbols']); - self::assertInternalType('array', $result['urls']); - self::assertInternalType('array', $result['user_mentions']); + self::assertIsArray($result['hashtags']); + self::assertIsArray($result['symbols']); + self::assertIsArray($result['urls']); + self::assertIsArray($result['user_mentions']); } /** @@ -2532,7 +2532,7 @@ class ApiTest extends FixtureTest $result = api_account_rate_limit_status('json'); self::assertEquals(150, $result['hash']['remaining_hits']); self::assertEquals(150, $result['hash']['hourly_limit']); - self::assertInternalType('int', $result['hash']['reset_time_in_seconds']); + self::assertIsInt($result['hash']['reset_time_in_seconds']); } /** From 9c59bcb6a5ce6e9000dd502969360026f8d363bc Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Jun 2021 22:11:21 +0000 Subject: [PATCH 3/5] Support OAuth for the legacy API --- include/api.php | 6 ++++++ src/Module/BaseApi.php | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/api.php b/include/api.php index 8e89895ded..935bd11d63 100644 --- a/include/api.php +++ b/include/api.php @@ -44,6 +44,7 @@ use Friendica\Model\Photo; use Friendica\Model\Post; use Friendica\Model\User; use Friendica\Model\Verb; +use Friendica\Module\BaseApi; use Friendica\Network\HTTPException; use Friendica\Network\HTTPException\BadRequestException; use Friendica\Network\HTTPException\ExpectationFailedException; @@ -88,6 +89,11 @@ $called_api = []; */ function api_user() { + $user = BaseApi::getCurrentUserID(true); + if (!empty($user)) { + return $user; + } + if (!empty($_SESSION['allow_api'])) { return local_user(); } diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php index 7735b9802c..015324569b 100644 --- a/src/Module/BaseApi.php +++ b/src/Module/BaseApi.php @@ -238,7 +238,7 @@ class BaseApi extends BaseModule * * @return int User ID */ - protected static function getCurrentUserID() + public static function getCurrentUserID(bool $nologin = false) { if (empty(self::$current_user_id)) { self::$current_token = self::getTokenByBearer(); @@ -247,7 +247,10 @@ class BaseApi extends BaseModule } else { self::$current_user_id = 0; } + } + if ($nologin) { + return (int)self::$current_user_id; } if (empty(self::$current_user_id)) { From 4206c5d363abc25e497f6f6cfc55ce9f212c642d Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Jun 2021 04:47:02 +0000 Subject: [PATCH 4/5] API: some more endpoints added --- doc/API-Mastodon.md | 8 +++ src/Module/Api/Mastodon/Accounts.php | 18 +++++-- src/Module/Api/Mastodon/Filters.php | 11 +++- src/Module/Api/Mastodon/Instance/Rules.php | 58 ++++++++++++++++++++++ static/routes.config.php | 6 +++ 5 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 src/Module/Api/Mastodon/Instance/Rules.php diff --git a/doc/API-Mastodon.md b/doc/API-Mastodon.md index 6bb17642da..85e23f525c 100644 --- a/doc/API-Mastodon.md +++ b/doc/API-Mastodon.md @@ -73,6 +73,7 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en - [`GET /api/v1/instance`](https://docs.joinmastodon.org/methods/instance#fetch-instance) +- GET /api/v1/instance/rules Undocumented, returns Terms of Service - [`GET /api/v1/instance/peers`](https://docs.joinmastodon.org/methods/instance#list-of-connected-domains) - [`GET /api/v1/lists`](https://docs.joinmastodon.org/methods/timelines/lists/) - [`POST /api/v1/lists`](https://docs.joinmastodon.org/methods/timelines/lists/) @@ -140,7 +141,9 @@ They refer to features that don't exist in Friendica yet. These endpoints won't be implemented at the moment. They refer to features or data that don't exist in Friendica yet. +- POST /api/meta Misskey API endpoint. - [`POST /api/v1/accounts`](https://docs.joinmastodon.org/methods/accounts/) +- [`GET /api/v1/accounts/:id/featured_tags`](https://docs.joinmastodon.org/methods/accounts/) - [`POST /api/v1/accounts/:id/pin`](https://docs.joinmastodon.org/methods/accounts/) - [`POST /api/v1/accounts/:id/unpin`](https://docs.joinmastodon.org/methods/accounts/) - [`GET /api/v1/admin/accounts`](https://docs.joinmastodon.org/methods/admin/) @@ -167,8 +170,13 @@ They refer to features or data that don't exist in Friendica yet. - [`POST /api/v1/markers`](https://docs.joinmastodon.org/methods/timelines/markers/) - [`GET /api/v1/polls/:id`](https://docs.joinmastodon.org/methods/statuses/polls/) - [`POST /api/v1/polls/:id/votes`](https://docs.joinmastodon.org/methods/statuses/polls/) +- [`DELETE /api/v1/push/subscription`](https://docs.joinmastodon.org/methods/notifications/push/) +- [`GET /api/v1/push/subscription`](https://docs.joinmastodon.org/methods/notifications/push/) +- [`PUSH /api/v1/push/subscription`](https://docs.joinmastodon.org/methods/notifications/push/) +- [`PUT /api/v1/push/subscription`](https://docs.joinmastodon.org/methods/notifications/push/) - [`POST /api/v1/reports`](https://docs.joinmastodon.org/methods/accounts/reports/) - [`GET /api/v1/scheduled_statuses/:id`](https://docs.joinmastodon.org/methods/statuses/scheduled_statuses/) - [`PUT /api/v1/scheduled_statuses/:id`](https://docs.joinmastodon.org/methods/statuses/scheduled_statuses/) - [`DELETE /api/v1/scheduled_statuses/:id`](https://docs.joinmastodon.org/methods/statuses/scheduled_statuses/) +- [`GET /api/v1/streaming`](https://docs.joinmastodon.org/methods/timelines/streaming/) - [`DELETE /api/v1/suggestions/:id`](https://docs.joinmastodon.org/methods/accounts/suggestions/) diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php index a5c9b81045..f650af0587 100644 --- a/src/Module/Api/Mastodon/Accounts.php +++ b/src/Module/Api/Mastodon/Accounts.php @@ -24,6 +24,7 @@ namespace Friendica\Module\Api\Mastodon; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; +use Friendica\Model\Contact; use Friendica\Module\BaseApi; /** @@ -37,13 +38,22 @@ class Accounts extends BaseApi */ public static function rawContent(array $parameters = []) { - if (empty($parameters['id'])) { + if (empty($parameters['id']) && empty($parameters['name'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; - if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { - DI::mstdnError()->RecordNotFound(); + if (!empty($parameters['id'])) { + $id = $parameters['id']; + if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { + DI::mstdnError()->RecordNotFound(); + } + } else { + $contact = Contact::selectFirst(['id'], ['nick' => $parameters['name'], 'uid' => 0]); + if (!empty($contact['id'])) { + $id = $contact['id']; + } elseif (!($id = Contact::getIdForURL($parameters['name'], 0, false))) { + DI::mstdnError()->RecordNotFound(); + } } $account = DI::mstdnAccount()->createFromContactId($id, self::getCurrentUserID()); diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php index cdcefc97f9..81794e679c 100644 --- a/src/Module/Api/Mastodon/Filters.php +++ b/src/Module/Api/Mastodon/Filters.php @@ -29,12 +29,21 @@ use Friendica\Module\BaseApi; */ class Filters extends BaseApi { + public static function post(array $parameters = []) + { + self::login(self::SCOPE_WRITE); + + self::unsupported('post'); + } + /** * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function rawContent(array $parameters = []) { - System::jsonError(404, ['error' => 'Record not found']); + self::login(self::SCOPE_READ); + + System::jsonExit([]); } } diff --git a/src/Module/Api/Mastodon/Instance/Rules.php b/src/Module/Api/Mastodon/Instance/Rules.php new file mode 100644 index 0000000000..fa5d6d8b60 --- /dev/null +++ b/src/Module/Api/Mastodon/Instance/Rules.php @@ -0,0 +1,58 @@ +. + * + */ + +namespace Friendica\Module\Api\Mastodon\Instance; + +use Friendica\Content\Text\BBCode; +use Friendica\Content\Text\HTML; +use Friendica\Core\System; +use Friendica\DI; +use Friendica\Module\BaseApi; +use Friendica\Network\HTTPException; + +/** + * Undocumented API endpoint + */ +class Rules extends BaseApi +{ + /** + * @param array $parameters + * @throws HTTPException\InternalServerErrorException + */ + public static function rawContent(array $parameters = []) + { + $rules = []; + $id = 0; + + if (DI::config()->get('system', 'tosdisplay')) { + $html = BBCode::convert(DI::config()->get('system', 'tostext'), false, BBCode::EXTERNAL); + $msg = HTML::toPlaintext($html, 0, true); + foreach (explode("\n", $msg) as $line) { + $line = trim($line); + if ($line) { + $rules[] = ['id' => (string)++$id, 'text' => $line]; + } + } + } + + System::jsonExit($rules); + } +} diff --git a/static/routes.config.php b/static/routes.config.php index 4569038a41..815d833ada 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -60,6 +60,7 @@ return [ '/accounts' => [Module\Api\Mastodon\Unimplemented::class, [ R::POST]], // not supported '/accounts/{id:\d+}' => [Module\Api\Mastodon\Accounts::class, [R::GET ]], '/accounts/{id:\d+}/statuses' => [Module\Api\Mastodon\Accounts\Statuses::class, [R::GET ]], + '/accounts/{id:\d+}/featured_tags' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // @todo '/accounts/{id:\d+}/followers' => [Module\Api\Mastodon\Accounts\Followers::class, [R::GET ]], '/accounts/{id:\d+}/following' => [Module\Api\Mastodon\Accounts\Following::class, [R::GET ]], '/accounts/{id:\d+}/lists' => [Module\Api\Mastodon\Accounts\Lists::class, [R::GET ]], @@ -77,6 +78,7 @@ return [ '/accounts/search' => [Module\Api\Mastodon\Accounts\Search::class, [R::GET ]], '/accounts/update_credentials' => [Module\Api\Mastodon\Accounts\UpdateCredentials::class, [R::PATCH ]], '/accounts/verify_credentials' => [Module\Api\Mastodon\Accounts\VerifyCredentials::class, [R::GET ]], + '/accounts/{name}' => [Module\Api\Mastodon\Accounts::class, [R::GET ]], '/admin/accounts' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // not supported '/admin/accounts/{id:\d+}' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // not supported '/admin/accounts/{id:\d+}/{action}' => [Module\Api\Mastodon\Unimplemented::class, [ R::POST]], // not supported @@ -108,6 +110,7 @@ return [ '/instance' => [Module\Api\Mastodon\Instance::class, [R::GET ]], '/instance/activity' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // @todo '/instance/peers' => [Module\Api\Mastodon\Instance\Peers::class, [R::GET ]], + '/instance/rules' => [Module\Api\Mastodon\Instance\Rules::class, [R::GET ]], // not supported '/lists' => [Module\Api\Mastodon\Lists::class, [R::GET, R::POST]], '/lists/{id:\d+}' => [Module\Api\Mastodon\Lists::class, [R::GET, R::PUT, R::DELETE]], '/lists/{id:\d+}/accounts' => [Module\Api\Mastodon\Lists\Accounts::class, [R::GET, R::POST, R::DELETE]], @@ -122,6 +125,7 @@ return [ '/polls/{id:\d+}' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // not supported '/polls/{id:\d+}/votes' => [Module\Api\Mastodon\Unimplemented::class, [ R::POST]], // not supported '/preferences' => [Module\Api\Mastodon\Preferences::class, [R::GET ]], + '/push/subscription' => [Module\Api\Mastodon\Unimplemented::class, [R::GET, R::POST, R::PUT, R::DELETE]], // not supported '/reports' => [Module\Api\Mastodon\Unimplemented::class, [ R::POST]], // not supported '/scheduled_statuses' => [Module\Api\Mastodon\ScheduledStatuses::class, [R::GET ]], // Dummy, not supported '/scheduled_statuses/{id:\d+}' => [Module\Api\Mastodon\Unimplemented::class, [R::GET, R::PUT, R::DELETE]], // not supported @@ -140,6 +144,7 @@ return [ '/statuses/{id:\d+}/unmute' => [Module\Api\Mastodon\Statuses\Unmute::class, [ R::POST]], '/statuses/{id:\d+}/pin' => [Module\Api\Mastodon\Statuses\Pin::class, [ R::POST]], '/statuses/{id:\d+}/unpin' => [Module\Api\Mastodon\Statuses\Unpin::class, [ R::POST]], + '/streaming' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], '/suggestions' => [Module\Api\Mastodon\Suggestions::class, [R::GET ]], '/suggestions/{id:\d+}' => [Module\Api\Mastodon\Unimplemented::class, [R::DELETE ]], // not implemented '/timelines/direct' => [Module\Api\Mastodon\Timelines\Direct::class, [R::GET ]], @@ -160,6 +165,7 @@ return [ '/followers/list' => [Module\Api\Twitter\FollowersList::class, [R::GET ]], '/friends/ids' => [Module\Api\Twitter\FriendsIds::class, [R::GET ]], '/friends/list' => [Module\Api\Twitter\FriendsList::class, [R::GET ]], + '/meta' => [Module\Api\Mastodon\Unimplemented::class, [R::POST ]], // not supported '/oembed' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], '/proofs' => [Module\Api\Mastodon\Proofs::class, [R::GET ]], // Dummy, not supported ], From 5ddd2f3ab5eb0cdaf499e9a4a8ad96300ef87302 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Jun 2021 05:18:22 +0000 Subject: [PATCH 5/5] Coding standards --- src/Module/Api/Mastodon/Instance/Rules.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Module/Api/Mastodon/Instance/Rules.php b/src/Module/Api/Mastodon/Instance/Rules.php index fa5d6d8b60..9b7d2dc77f 100644 --- a/src/Module/Api/Mastodon/Instance/Rules.php +++ b/src/Module/Api/Mastodon/Instance/Rules.php @@ -40,10 +40,11 @@ class Rules extends BaseApi public static function rawContent(array $parameters = []) { $rules = []; - $id = 0; + $id = 0; if (DI::config()->get('system', 'tosdisplay')) { $html = BBCode::convert(DI::config()->get('system', 'tostext'), false, BBCode::EXTERNAL); + $msg = HTML::toPlaintext($html, 0, true); foreach (explode("\n", $msg) as $line) { $line = trim($line);