Force exits in PushSubscription PUT, POST and DELETE endpoints

- These add their own content to the response, which makes rawContent() redundant

diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index e0592e4728f528e09a68f112ecaf5790d40da6c5..0f920ef2a4bc5af94da05cbaa7acdd71e33fc2d2 100644 (file)
--- 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 0c8e1d52571737cd60cb7b659f2808faf1b59d9b..6308b811b4f5a73b941df9686279ee5220d84a85 100644 (file)
--- 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