From acfc11c43606f9706b05169f77a13b5d29383c3b Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 26 Nov 2022 08:56:24 +0000 Subject: [PATCH 1/2] Issue 12133: Account data can now be updated via API --- .../Mastodon/Accounts/UpdateCredentials.php | 74 ++++++++++++++++++- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php index a2e7f395a4..6427a904a8 100644 --- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php +++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php @@ -21,8 +21,12 @@ namespace Friendica\Module\Api\Mastodon\Accounts; -use Friendica\App\Router; use Friendica\Core\Logger; +use Friendica\DI; +use Friendica\Model\Contact; +use Friendica\Model\Photo; +use Friendica\Model\Profile; +use Friendica\Model\User; use Friendica\Module\BaseApi; /** @@ -35,8 +39,72 @@ class UpdateCredentials extends BaseApi self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - Logger::info('Patch data', ['data' => $request]); + $owner = User::getOwnerDataById($uid); - $this->response->unsupported(Router::PATCH, $request); + $request = $this->getRequest([ + 'bot' => ($owner['contact-type'] == Contact::TYPE_NEWS), + 'discoverable' => $owner['net-publish'], + 'display_name' => $owner['name'], + 'fields_attributes' => [], + 'locked' => $owner['manually-approve'], + 'note' => $owner['about'], + 'avatar' => [], + 'header' => [], + ], $request); + + $user = []; + $profile = []; + + if ($request['bot']) { + $user['account-type'] = Contact::TYPE_NEWS; + $user['page-flags'] = User::PAGE_FLAGS_SOAPBOX; + } elseif ($owner['contact-type'] == Contact::TYPE_NEWS) { + $user['account-type'] = Contact::TYPE_PERSON; + } else { + $user['account-type'] = $owner['contact-type']; + } + + $profile['net-publish'] = $request['discoverable']; + + if (!empty($request['display_name'])) { + $user['username'] = $request['display_name']; + } + + if ($user['account-type'] == Contact::TYPE_COMMUNITY) { + $user['page-flags'] = $request['locked'] ? User::PAGE_FLAGS_PRVGROUP : User::PAGE_FLAGS_COMMUNITY; + } elseif ($user['account-type'] == Contact::TYPE_PERSON) { + if ($request['locked']) { + $user['page-flags'] = User::PAGE_FLAGS_NORMAL; + } elseif ($owner['page-flags'] == User::PAGE_FLAGS_NORMAL) { + $user['page-flags'] = User::PAGE_FLAGS_SOAPBOX; + } + } + + if (!empty($request['note'])) { + $profile['about'] = $request['note']; + } + + Logger::debug('Patch data', ['data' => $request, 'files' => $_FILES]); + + Logger::info('Update profile and user', ['uid' => $uid, 'user' => $user, 'profile' => $profile]); + + if (!empty($request['avatar'])) { + Photo::uploadAvatar(1, $request['avatar']); + } + + if (!empty($request['header'])) { + Photo::uploadBanner(1, $request['header']); + } + + User::update($user, $uid); + Profile::update($profile, $uid); + + $cdata = Contact::getPublicAndUserContactID($owner['id'], $uid); + if (empty($cdata)) { + DI::mstdnError()->InternalError(); + } + + $account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid); + $this->response->exitWithJson($account->toArray()); } } From 08b9d11d460f76e115c73c9530a75cbc6c6ca9fa Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 26 Nov 2022 09:00:35 +0000 Subject: [PATCH 2/2] Updated documentation --- doc/API-Mastodon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/API-Mastodon.md b/doc/API-Mastodon.md index ab5b5dbbb0..63c487caf3 100644 --- a/doc/API-Mastodon.md +++ b/doc/API-Mastodon.md @@ -47,6 +47,7 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en - [`POST /api/v1/accounts/:id/unmute`](https://docs.joinmastodon.org/methods/accounts/) - [`GET /api/v1/accounts/relationships`](https://docs.joinmastodon.org/methods/accounts/) - [`GET /api/v1/accounts/search`](https://docs.joinmastodon.org/methods/accounts) +- [`PATCH /api/v1/accounts/update_credentials`](https://docs.joinmastodon.org/methods/accounts/#update_credentials) - [`GET /api/v1/accounts/verify_credentials`](https://docs.joinmastodon.org/methods/accounts) - [`POST /api/v1/apps`](https://docs.joinmastodon.org/methods/apps/) - [`GET /api/v1/apps/verify_credentials`](https://docs.joinmastodon.org/methods/apps/) @@ -138,7 +139,6 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en These emdpoints are planned to be implemented somewhere in the future. -- [`PATCH /api/v1/accounts/update_credentials`](https://docs.joinmastodon.org/methods/accounts/) - [`POST /api/v1/accounts/:id/remove_from_followers`](https://github.com/mastodon/mastodon/pull/16864) - [`GET /api/v1/accounts/familiar_followers`](https://github.com/mastodon/mastodon/pull/17700) - [`GET /api/v1/accounts/lookup`](https://github.com/mastodon/mastodon/pull/15740)