From f53292cb11f24d8cb76e535053f37521196a356f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 4 Jan 2025 21:49:05 -0500 Subject: [PATCH] Force exits in PushSubscription PUT, POST and DELETE endpoints - These add their own content to the response, which makes rawContent() redundant --- src/Module/Api/Mastodon/Accounts/UpdateCredentials.php | 2 +- src/Module/Api/Mastodon/PushSubscription.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php index e0592e4728..0f920ef2a4 100644 --- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php +++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php @@ -92,6 +92,6 @@ class UpdateCredentials extends BaseApi } $account = DI::mstdnAccount()->createFromContactId($ucid, $uid); - $this->response->addJsonContent($account->toArray()); + $this->jsonExit($account->toArray()); } } diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php index 0c8e1d5257..6308b811b4 100644 --- a/src/Module/Api/Mastodon/PushSubscription.php +++ b/src/Module/Api/Mastodon/PushSubscription.php @@ -66,7 +66,7 @@ class PushSubscription extends BaseApi $this->logger->info('Subscription stored', ['ret' => $ret, 'subscription' => $subscription]); $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid); - $this->response->addJsonContent($subscriptionObj->toArray()); + $this->jsonExit($subscriptionObj->toArray()); } public function put(array $request = []): void @@ -105,7 +105,7 @@ class PushSubscription extends BaseApi ]); $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid); - $this->response->addJsonContent($subscriptionObj->toArray()); + $this->jsonExit($subscriptionObj->toArray()); } private function setBoolean($input): bool @@ -130,7 +130,7 @@ class PushSubscription extends BaseApi 'uid' => $uid, ]); - $this->response->addJsonContent([]); + $this->jsonExit([]); } protected function get(array $request = []): void