Rename ApipResponse->exit* methods to better show their meaning

diff --git a/src/Module/Api/ApiResponse.php b/src/Module/Api/ApiResponse.php
index 518bcf8cbab6c9a2beb82a5a607e94f05b5208db..40e1122d4a6b085ce93044e225c4798f94d033f3 100644 (file)
--- a/src/Module/Api/ApiResponse.php
+++ b/src/Module/Api/ApiResponse.php
@@ -210,7 +210,7 @@ class ApiResponse extends Response
 
                $this->setHeader(($this->server['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . ' ' . $code . ' ' . $description);
 
-               $this->exit('status', ['status' => $error], $format);
+               $this->addFormattedContent('status', ['status' => $error], $format);
        }
 
        /**
@@ -224,7 +224,7 @@ class ApiResponse extends Response
         * @return void
         * @throws HTTPException\InternalServerErrorException
         */
-       public function exit(string $root_element, array $data, string $format = null, int $cid = 0)
+       public function addFormattedContent(string $root_element, array $data, string $format = null, int $cid = 0)
        {
                $format = $format ?? 'json';
 
@@ -259,16 +259,16 @@ class ApiResponse extends Response
        }
 
        /**
-        * Wrapper around exit() for JSON only responses
+        * Wrapper around addFormattedContent() for JSON only responses
         *
         * @param array $data
         *
         * @return void
         * @throws HTTPException\InternalServerErrorException
         */
-       public function exitWithJson(array $data)
+       public function addJsonContent(array $data)
        {
-               $this->exit('content', ['content' => $data], static::TYPE_JSON);
+               $this->addFormattedContent('content', ['content' => $data], static::TYPE_JSON);
        }
 
        /**

diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php
index d5024db2c4d963586b7c2111fc06ca5af058bd36..d8edfd1a3e1c10f3ece4bd5463e6d1f05387c6df 100644 (file)
--- a/src/Module/Api/Friendica/Activity.php
+++ b/src/Module/Api/Friendica/Activity.php
@@ -60,7 +60,7 @@ class Activity extends BaseApi
 
                if ($res) {
                        $status_info = DI::twitterStatus()->createFromUriId($request['id'], $uid)->toArray();
-                       $this->response->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
                } else {
                        $this->response->error(500, 'Error adding activity', '', $this->parameters['extension'] ?? null);
                }

diff --git a/src/Module/Api/Friendica/Circle/Create.php b/src/Module/Api/Friendica/Circle/Create.php
index b2787bdd55afcd84d0725c13fe400a8fea361bb3..8998dbdd9510a922eab6a2a8606057cb0a522e5f 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Create.php
+++ b/src/Module/Api/Friendica/Circle/Create.php
@@ -82,6 +82,6 @@ class Create extends BaseApi
 
                $result = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers];
 
-               $this->response->exit('group_create', ['$result' => $result], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('group_create', ['$result' => $result], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Circle/Delete.php b/src/Module/Api/Friendica/Circle/Delete.php
index 18db1216b22773c57dc0eb79af57e644913a82a9..3bbe5bc7b35dc8c5ae5b0a26d477cc7bf255fcd9 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Delete.php
+++ b/src/Module/Api/Friendica/Circle/Delete.php
@@ -70,7 +70,7 @@ class Delete extends BaseApi
                if ($ret) {
                        // return success
                        $success = ['success' => $ret, 'gid' => $request['gid'], 'name' => $request['name'], 'status' => 'deleted', 'wrong users' => []];
-                       $this->response->exit('group_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('group_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
                } else {
                        throw new BadRequestException('other API error');
                }

diff --git a/src/Module/Api/Friendica/Circle/Show.php b/src/Module/Api/Friendica/Circle/Show.php
index 9f2f93ede53d89703ef32e3bdc3088083acb80ca..c6936dbe3c3eca04d4305e262c45e77b1aa3eedd 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Show.php
+++ b/src/Module/Api/Friendica/Circle/Show.php
@@ -75,6 +75,6 @@ class Show extends BaseApi
                        $grps[] = ['name' => $circle['name'], 'gid' => $circle['id'], $user_element => $users];
                }
 
-               $this->response->exit('group_update', ['group' => $grps], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('group_update', ['group' => $grps], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Circle/Update.php b/src/Module/Api/Friendica/Circle/Update.php
index 38bbea382dac031a685a42f5802dcd67fa5134c4..d43082c7944eb366febb9f6c265d92fb84a6469c 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Update.php
+++ b/src/Module/Api/Friendica/Circle/Update.php
@@ -84,6 +84,6 @@ class Update extends BaseApi
                // return success message incl. missing users in array
                $status  = ($erroraddinguser ? 'missing user' : 'ok');
                $success = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers];
-               $this->response->exit('group_update', ['$result' => $success], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('group_update', ['$result' => $success], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/DirectMessages/Search.php b/src/Module/Api/Friendica/DirectMessages/Search.php
index 81fb4e89f08024d4da36509619c2cbf8031bf185..508f374fd169334b30067d1aa3abac7f139ae386 100644 (file)
--- a/src/Module/Api/Friendica/DirectMessages/Search.php
+++ b/src/Module/Api/Friendica/DirectMessages/Search.php
@@ -64,7 +64,7 @@ class Search extends BaseApi
                // error if no searchstring specified
                if ($request['searchstring'] == '') {
                        $answer = ['result' => 'error', 'message' => 'searchstring not specified'];
-                       $this->response->exit('direct_message_search', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('direct_message_search', ['$result' => $answer], $this->parameters['extension'] ?? null);
                        return;
                }
 
@@ -82,6 +82,6 @@ class Search extends BaseApi
                        $success = ['success' => true, 'search_results' => $ret];
                }
 
-               $this->response->exit('direct_message_search', ['$result' => $success], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('direct_message_search', ['$result' => $success], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/DirectMessages/Setseen.php b/src/Module/Api/Friendica/DirectMessages/Setseen.php
index 1831db980955e819c898ee38698aeb4ef0f0f133..aa9fc0dac8679d6a71f58fdcd62e0c4fb8692597 100644 (file)
--- a/src/Module/Api/Friendica/DirectMessages/Setseen.php
+++ b/src/Module/Api/Friendica/DirectMessages/Setseen.php
@@ -42,14 +42,14 @@ class Setseen extends BaseApi
                // return error if id is zero
                if (empty($request['id'])) {
                        $answer = ['result' => 'error', 'message' => 'message id not specified'];
-                       $this->response->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
                        return;
                }
 
                // error message if specified id is not in database
                if (!DBA::exists('mail', ['id' => $request['id'], 'uid' => $uid])) {
                        $answer = ['result' => 'error', 'message' => 'message id not in database'];
-                       $this->response->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
                        return;
                }
 
@@ -60,6 +60,6 @@ class Setseen extends BaseApi
                        $answer = ['result' => 'error', 'message' => 'unknown error'];
                }
 
-               $this->response->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Events/Create.php b/src/Module/Api/Friendica/Events/Create.php
index 4eb92e9c861ff00e032d7ddebd312be2b452d20f..edc1c5936ba24e8f325cf208a9df47b50df371c0 100644 (file)
--- a/src/Module/Api/Friendica/Events/Create.php
+++ b/src/Module/Api/Friendica/Events/Create.php
@@ -110,6 +110,6 @@ class Create extends BaseApi
 
                $result = ['success' => true, 'event_id' => $event_id, 'event' => $event];
 
-               $this->response->exit('event_create', ['$result' => $result], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('event_create', ['$result' => $result], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Events/Delete.php b/src/Module/Api/Friendica/Events/Delete.php
index ab15e666e50aa3243415734365be8f796ef6be44..b148c94e30f70fb7bb74b357e0c3c7c9a20177cf 100644 (file)
--- a/src/Module/Api/Friendica/Events/Delete.php
+++ b/src/Module/Api/Friendica/Events/Delete.php
@@ -59,6 +59,6 @@ class Delete extends BaseApi
                Event::delete($eventid);
 
                $success = ['id' => $eventid, 'status' => 'deleted'];
-               $this->response->exit('event_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('event_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php
index bb7381f7293ea44c36e26bc5ae4d298970b34dd2..a0986d8b0efe739fa1d41cb466137f343ba5cd3a 100644 (file)
--- a/src/Module/Api/Friendica/Events/Index.php
+++ b/src/Module/Api/Friendica/Events/Index.php
@@ -69,6 +69,6 @@ class Index extends BaseApi
                        ];
                }
 
-               $this->response->exit('events', ['events' => $items], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('events', ['events' => $items], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Notification.php b/src/Module/Api/Friendica/Notification.php
index b7ae74b143d13293814a32b3ea0b96f1163189c2..f61d3451c93af7eeb3144f4504f95b5274ed4474 100644 (file)
--- a/src/Module/Api/Friendica/Notification.php
+++ b/src/Module/Api/Friendica/Notification.php
@@ -56,6 +56,6 @@ class Notification extends BaseApi
                        $result = false;
                }
 
-               $this->response->exit('notes', ['note' => $result], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('notes', ['note' => $result], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php
index d445e917c157df2312bdd5acf74e041bd63dec22..c0c50dbe7069e70d0ab43528f84be0c01c13fbed 100644 (file)
--- a/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@ -70,13 +70,13 @@ class Seen extends BaseApi
                                        // we found the item, return it to the user
                                        $ret  = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()];
                                        $data = ['status' => $ret];
-                                       $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null);
+                                       $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null);
                                        return;
                                }
                                // the item can't be found, but we set the notification as seen, so we count this as a success
                        }
 
-                       $this->response->exit('statuses', ['result' => 'success'], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('statuses', ['result' => 'success'], $this->parameters['extension'] ?? null);
                } catch (NotFoundException $e) {
                        throw new BadRequestException('Invalid argument', $e);
                } catch (Exception $e) {

diff --git a/src/Module/Api/Friendica/Photo.php b/src/Module/Api/Friendica/Photo.php
index 0a331f6333b133f9aef7ae8aca029ad4bab54a83..7973c3b6e8e9b3806e016106a86ef4d027a895a6 100644 (file)
--- a/src/Module/Api/Friendica/Photo.php
+++ b/src/Module/Api/Friendica/Photo.php
@@ -60,6 +60,6 @@ class Photo extends BaseApi
                // prepare json/xml output with data from database for the requested photo
                $data = ['photo' => $this->friendicaPhoto->createFromId($photo_id, $scale, $uid, $type)];
 
-               $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Friendica/Photo/Create.php b/src/Module/Api/Friendica/Photo/Create.php
index 4190145aa0f8ee35ce29c7f386bfd5932e93da1a..780060ca23803216c8e9e2d4da27628801bb30ce 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Create.php
+++ b/src/Module/Api/Friendica/Photo/Create.php
@@ -90,7 +90,7 @@ class Create extends BaseApi
                if (!empty($photo)) {
                        Photo::clearAlbumCache($uid);
                        $data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)];
-                       $this->response->exit('photo_create', $data, $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('photo_create', $data, $this->parameters['extension'] ?? null);
                } else {
                        throw new HTTPException\InternalServerErrorException('unknown error - uploading photo failed, see Friendica log for more information');
                }

diff --git a/src/Module/Api/Friendica/Photo/Delete.php b/src/Module/Api/Friendica/Photo/Delete.php
index 3bbd2615451f6b58dc97b16b970a2dd3b9daed17..6237f485195a687873821246617db63e380caff5 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Delete.php
+++ b/src/Module/Api/Friendica/Photo/Delete.php
@@ -62,7 +62,7 @@ class Delete extends BaseApi
                        Item::deleteForUser($condition, $uid);
                        Photo::clearAlbumCache($uid);
                        $result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];
-                       $this->response->exit('photo_delete', ['$result' => $result], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('photo_delete', ['$result' => $result], $this->parameters['extension'] ?? null);
                } else {
                        throw new InternalServerErrorException("unknown error on deleting photo from database table");
                }

diff --git a/src/Module/Api/Friendica/Photo/Lists.php b/src/Module/Api/Friendica/Photo/Lists.php
index 957575aa989666283d4eaef64fd79ab686c3494e..662107f98d029f6e3372bd65f7e2696aee5ed9de 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Lists.php
+++ b/src/Module/Api/Friendica/Photo/Lists.php
@@ -77,6 +77,6 @@ class Lists extends BaseApi
                        }
                }
 
-               $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php
index d9ff769aa985900ddcf36c96156419d47ba2fe0f..208e3eb40e8e815e315c461c4e85ad87ba57e893 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Update.php
+++ b/src/Module/Api/Friendica/Photo/Update.php
@@ -128,7 +128,7 @@ class Update extends BaseApi
                        $photo       = Photo::upload($uid, $_FILES['media'], $album, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc, $photo_id);
                        if (!empty($photo)) {
                                $data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)];
-                               $this->response->exit('photo_update', $data, $this->parameters['extension'] ?? null);
+                               $this->response->addFormattedContent('photo_update', $data, $this->parameters['extension'] ?? null);
                                return;
                        }
                }
@@ -137,12 +137,12 @@ class Update extends BaseApi
                if ($result) {
                        Photo::clearAlbumCache($uid);
                        $answer = ['result' => 'updated', 'message' => 'Image id `' . $photo_id . '` has been updated.'];
-                       $this->response->exit('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
                        return;
                } else {
                        if ($nothingtodo) {
                                $answer = ['result' => 'cancelled', 'message' => 'Nothing to update for image id `' . $photo_id . '`.'];
-                               $this->response->exit('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                               $this->response->addFormattedContent('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
                                return;
                        }
                        throw new HTTPException\InternalServerErrorException('unknown error - update photo entry in database failed');

diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php
index 1c77356e736b0415d84ed8156e84fa7b265ee99f..023d96797aaa32bc4d62a916c904fb25b9e9c8a0 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Delete.php
+++ b/src/Module/Api/Friendica/Photoalbum/Delete.php
@@ -68,7 +68,7 @@ class Delete extends BaseApi
                if ($result) {
                        Photo::clearAlbumCache($uid);
                        $answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.'];
-                       $this->response->exit('photoalbum_delete', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('photoalbum_delete', ['$result' => $answer], $this->parameters['extension'] ?? null);
                } else {
                        throw new InternalServerErrorException("unknown error - deleting from database failed");
                }

diff --git a/src/Module/Api/Friendica/Photoalbum/Index.php b/src/Module/Api/Friendica/Photoalbum/Index.php
index acf0b864dd455d57294f9bdea156246ee4661321..af294585edbb15a217955569379806d63fab4e5a 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Index.php
+++ b/src/Module/Api/Friendica/Photoalbum/Index.php
@@ -47,6 +47,6 @@ class Index extends BaseApi
                        ];
                }
 
-               $this->response->exit('albums', ['albums' => $items], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('albums', ['albums' => $items], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Photoalbum/Show.php b/src/Module/Api/Friendica/Photoalbum/Show.php
index e1ded1de819a7f0e392b2c8e7db51a3952c7a1b6..0a7b5ee26485ce170d3fd98370372329bf72927a 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Show.php
+++ b/src/Module/Api/Friendica/Photoalbum/Show.php
@@ -104,6 +104,6 @@ class Show extends BaseApi
                        }
                }
 
-               $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Friendica/Photoalbum/Update.php b/src/Module/Api/Friendica/Photoalbum/Update.php
index dfc2d2d4317d930f258957bb7887b815a4c9de26..cba99b436bd28799eae88082343f19ec7454f8d9 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Update.php
+++ b/src/Module/Api/Friendica/Photoalbum/Update.php
@@ -60,7 +60,7 @@ class Update extends BaseApi
                if ($result) {
                        Photo::clearAlbumCache($uid);
                        $answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.'];
-                       $this->response->exit('photoalbum_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('photoalbum_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
                } else {
                        throw new InternalServerErrorException("unknown error - updating in database failed");
                }

diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index b97fcdcab9e9effe17d330522570205e6890bd57..6aa2e8b66db8a9e2810a6c8ef5efc3fd40d5357c 100644 (file)
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -62,7 +62,7 @@ class Show extends BaseApi
                        'profiles' => $profiles
                ];
 
-               $this->response->exit('friendica_profiles', ['$result' => $result], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('friendica_profiles', ['$result' => $result], $this->parameters['extension'] ?? null);
        }
 
        /**

diff --git a/src/Module/Api/GNUSocial/GNUSocial/Config.php b/src/Module/Api/GNUSocial/GNUSocial/Config.php
index 5a8f6aad3084ecd5c2fe8d0fb77ddcda05549a58..041f521132c0cf064fa53bd523bb4dddffc4c7d3 100644 (file)
--- a/src/Module/Api/GNUSocial/GNUSocial/Config.php
+++ b/src/Module/Api/GNUSocial/GNUSocial/Config.php
@@ -61,6 +61,6 @@ class Config extends BaseApi
                        ],
                ];
 
-               $this->response->exit('config', ['config' => $config], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('config', ['config' => $config], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/GNUSocial/GNUSocial/Version.php b/src/Module/Api/GNUSocial/GNUSocial/Version.php
index 1f46500b3cb089e5346be0ce6352b1e8ed7acc37..708910941c249978fdf43139135f5802683128a0 100644 (file)
--- a/src/Module/Api/GNUSocial/GNUSocial/Version.php
+++ b/src/Module/Api/GNUSocial/GNUSocial/Version.php
@@ -31,6 +31,6 @@ class Version extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               $this->response->exit('version', ['version' => '0.9.7'], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('version', ['version' => '0.9.7'], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/GNUSocial/Help/Test.php b/src/Module/Api/GNUSocial/Help/Test.php
index d0b57d0a7e58234765d27c952cf422efe3a13aa8..ac47ea5a70500507d66d4e5b02459ea617bffa98 100644 (file)
--- a/src/Module/Api/GNUSocial/Help/Test.php
+++ b/src/Module/Api/GNUSocial/Help/Test.php
@@ -37,6 +37,6 @@ class Test extends BaseApi
                        $ok = 'ok';
                }
 
-               $this->response->exit('ok', ['ok' => $ok], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('ok', ['ok' => $ok], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/GNUSocial/Statusnet/Conversation.php b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
index df4409811667c5247ba73d49d33ad18c1ef3f7a5..522b237b6cb439a9fa289cee4a03a1c69a86dd86 100644 (file)
--- a/src/Module/Api/GNUSocial/Statusnet/Conversation.php
+++ b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
@@ -90,6 +90,6 @@ class Conversation extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index 8518d4c95d652c987870ce81f7558f97bb31436a..170861461ab4b89ecb19eec9f1b2e433d8031786 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -105,6 +105,6 @@ class UpdateCredentials extends BaseApi
                }
 
                $account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid);
-               $this->response->exitWithJson($account->toArray());
+               $this->response->addJsonContent($account->toArray());
        }
 }

diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
index bdd6d76005b1fbf1d2ac48f7d8f081d78a258b06..d59549ae8b0d50528b96291ae24ee75a3d3eee8f 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
@@ -52,6 +52,6 @@ class VerifyCredentials extends BaseApi
 
                // @todo Support the source property,
                $account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid);
-               $this->response->exitWithJson($account->toArray());
+               $this->response->addJsonContent($account->toArray());
        }
 }

diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php
index 077f0b1028e1ae84d34b9340a33d03f8c9377c67..f43d995b614358b639bdde49eda40e40fbe97d1e 100644 (file)
--- a/src/Module/Api/Mastodon/PushSubscription.php
+++ b/src/Module/Api/Mastodon/PushSubscription.php
@@ -81,7 +81,7 @@ class PushSubscription extends BaseApi
                $this->logger->info('Subscription stored', ['ret' => $ret, 'subscription' => $subscription]);
 
                $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
-               $this->response->exitWithJson($subscriptionObj->toArray());
+               $this->response->addJsonContent($subscriptionObj->toArray());
        }
 
        public function put(array $request = []): void
@@ -120,7 +120,7 @@ class PushSubscription extends BaseApi
                ]);
 
                $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
-               $this->response->exitWithJson($subscriptionObj->toArray());
+               $this->response->addJsonContent($subscriptionObj->toArray());
        }
 
        protected function delete(array $request = []): void
@@ -137,7 +137,7 @@ class PushSubscription extends BaseApi
                        'uid'            => $uid,
                ]);
 
-               $this->response->exitWithJson([]);
+               $this->response->addJsonContent([]);
        }
 
        protected function rawContent(array $request = []): void
@@ -154,6 +154,6 @@ class PushSubscription extends BaseApi
                $this->logger->info('Fetch subscription', ['application-id' => $application['id'], 'uid' => $uid]);
 
                $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
-               $this->response->exitWithJson($subscriptionObj->toArray());
+               $this->response->addJsonContent($subscriptionObj->toArray());
        }
 }

diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php
index e46318d6163332b46e54d8aee97757d88e3a2c7f..a9954c60a0509296ff6900b3e13854093f695962 100644 (file)
--- a/src/Module/Api/Twitter/Account/RateLimitStatus.php
+++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php
@@ -51,6 +51,6 @@ class RateLimitStatus extends BaseApi
                        ];
                }
 
-               $this->response->exit('hash', ['hash' => $hash], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('hash', ['hash' => $hash], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Account/UpdateProfile.php b/src/Module/Api/Twitter/Account/UpdateProfile.php
index 1bcb67cb9c44eb5880b5aedbcc5f04525f318f7d..c58b8d24c8b54511a11e11043da431bcf18e6f88 100644 (file)
--- a/src/Module/Api/Twitter/Account/UpdateProfile.php
+++ b/src/Module/Api/Twitter/Account/UpdateProfile.php
@@ -66,6 +66,6 @@ class UpdateProfile extends BaseApi
                // "uid" is only needed for some internal stuff, so remove it from here
                unset($user_info['uid']);
 
-               $this->response->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Account/UpdateProfileImage.php b/src/Module/Api/Twitter/Account/UpdateProfileImage.php
index f21d7ba852abead8014af44f929f3613dbea7394..f6ac2d1984b5db1ce1fedf878990c51f191cc478 100644 (file)
--- a/src/Module/Api/Twitter/Account/UpdateProfileImage.php
+++ b/src/Module/Api/Twitter/Account/UpdateProfileImage.php
@@ -67,6 +67,6 @@ class UpdateProfileImage extends BaseApi
                // "uid" is only needed for some internal stuff, so remove it from here
                unset($user_info['uid']);
 
-               $this->response->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Account/VerifyCredentials.php b/src/Module/Api/Twitter/Account/VerifyCredentials.php
index 4c98bcfa6c6a8014d70d3180fe14f5790c3a743b..738c08e5a26facfc0a024d3cc2ffa3f217b46986 100644 (file)
--- a/src/Module/Api/Twitter/Account/VerifyCredentials.php
+++ b/src/Module/Api/Twitter/Account/VerifyCredentials.php
@@ -47,6 +47,6 @@ class VerifyCredentials extends BaseApi
                // "uid" is only needed for some internal stuff, so remove it from here
                unset($user_info['uid']);
 
-               $this->response->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Blocks/Lists.php b/src/Module/Api/Twitter/Blocks/Lists.php
index b3583c853f36fb9da0848c305f80a16315991c63..ec5d711200bc0f15e3e08b1fd0e33d5ba87a0db6 100644 (file)
--- a/src/Module/Api/Twitter/Blocks/Lists.php
+++ b/src/Module/Api/Twitter/Blocks/Lists.php
@@ -84,6 +84,6 @@ class Lists extends ContactEndpoint
 
                self::setLinkHeader();
 
-               $this->response->exit('lists', ['lists' => $return]);
+               $this->response->addFormattedContent('lists', ['lists' => $return]);
        }
 }

diff --git a/src/Module/Api/Twitter/DirectMessages/Destroy.php b/src/Module/Api/Twitter/DirectMessages/Destroy.php
index b4b08b05d3c61102974edd9b6aea9ed3bfa75aec..1c07b4e4745518dbd5bd37798c5c32218401808a 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Destroy.php
+++ b/src/Module/Api/Twitter/DirectMessages/Destroy.php
@@ -61,7 +61,7 @@ class Destroy extends BaseApi
                // error if no id or parenturi specified (for clients posting parent-uri as well)
                if ($verbose && $id == 0 && $parenturi == "") {
                        $answer = ['result' => 'error', 'message' => 'message id or parenturi not specified'];
-                       $this->response->exit('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
                        return;
                }
 
@@ -72,7 +72,7 @@ class Destroy extends BaseApi
                if (!$this->dba->exists('mail', ["`uid` = ? AND `id` = ? " . $sql_extra, $uid, $id])) {
                        if ($verbose) {
                                $answer = ['result' => 'error', 'message' => 'message id not in database'];
-                               $this->response->exit('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
+                               $this->response->addFormattedContent('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
                                return;
                        }
                        throw new BadRequestException('message id not in database');
@@ -85,10 +85,10 @@ class Destroy extends BaseApi
                        if ($result) {
                                // return success
                                $answer = ['result' => 'ok', 'message' => 'message deleted'];
-                               $this->response->exit('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
+                               $this->response->addFormattedContent('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
                        } else {
                                $answer = ['result' => 'error', 'message' => 'unknown error'];
-                               $this->response->exit('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
+                               $this->response->addFormattedContent('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
                        }
                }
        }

diff --git a/src/Module/Api/Twitter/DirectMessages/NewDM.php b/src/Module/Api/Twitter/DirectMessages/NewDM.php
index 866660810c265d96efa5c6b50ef8d70082c8546a..30be41be6bfc4d8169340bd67fa13534ac8e8630 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/NewDM.php
+++ b/src/Module/Api/Twitter/DirectMessages/NewDM.php
@@ -91,6 +91,6 @@ class NewDM extends BaseApi
                        $ret = ['error' => $id];
                }
 
-               $this->response->exit('direct-messages', ['direct_message' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('direct-messages', ['direct_message' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/DirectMessagesEndpoint.php b/src/Module/Api/Twitter/DirectMessagesEndpoint.php
index fd5b1c552efc7473b940938f0913d7f070ff16ef..6de21281d017017977e2fffb83358394d16fe80a 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessagesEndpoint.php
+++ b/src/Module/Api/Twitter/DirectMessagesEndpoint.php
@@ -99,7 +99,7 @@ abstract class DirectMessagesEndpoint extends BaseApi
                $mails = $this->dba->selectToArray('mail', ['id'], $condition, $params);
                if ($verbose && !DBA::isResult($mails)) {
                        $answer = ['result' => 'error', 'message' => 'no mails available'];
-                       $this->response->exit('direct-messages', ['direct_message' => $answer], $this->parameters['extension'] ?? null);
+                       $this->response->addFormattedContent('direct-messages', ['direct_message' => $answer], $this->parameters['extension'] ?? null);
                        return;
                }
 
@@ -116,6 +116,6 @@ abstract class DirectMessagesEndpoint extends BaseApi
 
                self::setLinkHeader();
 
-               $this->response->exit('direct-messages', ['direct_message' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('direct-messages', ['direct_message' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php
index 6e63cc63e81a47e148c4f095f8e48faa21784e86..771e0ef489221bb776880481adc1ac823ff4fa78 100644 (file)
--- a/src/Module/Api/Twitter/Favorites.php
+++ b/src/Module/Api/Twitter/Favorites.php
@@ -72,6 +72,6 @@ class Favorites extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Favorites/Create.php b/src/Module/Api/Twitter/Favorites/Create.php
index 96a5f06acbd46a5cd2adc412af4ea24176e204fd..86a3988046c6e19b71ca21dff040dabc21224f61 100644 (file)
--- a/src/Module/Api/Twitter/Favorites/Create.php
+++ b/src/Module/Api/Twitter/Favorites/Create.php
@@ -52,6 +52,6 @@ class Create extends BaseApi
 
                $status_info = DI::twitterStatus()->createFromUriId($id, $uid)->toArray();
 
-               $this->response->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Favorites/Destroy.php b/src/Module/Api/Twitter/Favorites/Destroy.php
index 51ffc7fc73f2d871fc7e3ba71de98d2a97a4f3d0..e481f8a9f2d47d5bdece2ff81837fa1dd2e1306b 100644 (file)
--- a/src/Module/Api/Twitter/Favorites/Destroy.php
+++ b/src/Module/Api/Twitter/Favorites/Destroy.php
@@ -52,6 +52,6 @@ class Destroy extends BaseApi
 
                $status_info = DI::twitterStatus()->createFromUriId($id, $uid)->toArray();
 
-               $this->response->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php
index 4a141f14010b3f3fd852003e88d3949d7b07b3f2..b4064fc27b0e2d995ba0d3f1fe538e5955ad090d 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Lists.php
+++ b/src/Module/Api/Twitter/Followers/Lists.php
@@ -114,6 +114,6 @@ class Lists extends ContactEndpoint
 
                $this->response->setHeader(self::getLinkHeader());
 
-               $this->response->exit('lists', ['lists' => $return]);
+               $this->response->addFormattedContent('lists', ['lists' => $return]);
        }
 }

diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php
index 534a30aac17f0ad1060aa6be1405a006d0c72559..617d70e4db504b8bd7a0132c99682404a88d09d2 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Lists.php
+++ b/src/Module/Api/Twitter/Friends/Lists.php
@@ -114,6 +114,6 @@ class Lists extends ContactEndpoint
 
                $this->response->setHeader(self::getLinkHeader());
 
-               $this->response->exit('lists', ['lists' => $return]);
+               $this->response->addFormattedContent('lists', ['lists' => $return]);
        }
 }

diff --git a/src/Module/Api/Twitter/Friendships/Destroy.php b/src/Module/Api/Twitter/Friendships/Destroy.php
index bf769bace59168692d57aa0cad2e5c4adc7c4e1e..322d02502cd598b35bb4dc230161cd66a3a6b07f 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Destroy.php
+++ b/src/Module/Api/Twitter/Friendships/Destroy.php
@@ -87,6 +87,6 @@ class Destroy extends ContactEndpoint
                        throw new HTTPException\InternalServerErrorException('Unable to unfollow this contact, please contact your administrator');
                }
 
-               $this->response->exit('friendships', ['user' => $user], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('friendships', ['user' => $user], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Friendships/Incoming.php b/src/Module/Api/Twitter/Friendships/Incoming.php
index b8573d7ce2a61960329f77e2ea24cc3516c8203a..62c372fa283195fdfc54dd95ffc5863f43a613db 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Incoming.php
+++ b/src/Module/Api/Twitter/Friendships/Incoming.php
@@ -82,6 +82,6 @@ class Incoming extends ContactEndpoint
 
                $this->response->setHeader(self::getLinkHeader());
 
-               $this->response->exit('incoming', ['incoming' => $return]);
+               $this->response->addFormattedContent('incoming', ['incoming' => $return]);
        }
 }

diff --git a/src/Module/Api/Twitter/Friendships/Show.php b/src/Module/Api/Twitter/Friendships/Show.php
index 5e9656a7194f2ae07bc4b1eead787fac168982d1..6dd1c1d20059ab4fcc1dff75ad28496a5cb85a2e 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Show.php
+++ b/src/Module/Api/Twitter/Friendships/Show.php
@@ -112,6 +112,6 @@ class Show extends ContactEndpoint
                        ]
                ];
 
-               DI::apiResponse()->exit('relationship', ['relationship' => $relationship], $this->parameters['extension'] ?? null);
+               DI::apiResponse()->addFormattedContent('relationship', ['relationship' => $relationship], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Lists/Create.php b/src/Module/Api/Twitter/Lists/Create.php
index 1f2f63882aad5f5bcf186d73aae6ad45e67ece48..4943d861a1798df6d91028131d807fb6c06a2731 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Create.php
+++ b/src/Module/Api/Twitter/Lists/Create.php
@@ -80,6 +80,6 @@ class Create extends BaseApi
 
                $grp = $this->friendicaCircle->createFromId($gid);
 
-               $this->response->exit('statuses', ['lists' => ['lists' => $grp]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['lists' => ['lists' => $grp]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Lists/Destroy.php b/src/Module/Api/Twitter/Lists/Destroy.php
index 0214e3ff6d0afbd4577efa0136915dec9d062de4..a249e4a81df33978e5fd6f8e5591966f4a0f93b2 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Destroy.php
+++ b/src/Module/Api/Twitter/Lists/Destroy.php
@@ -77,7 +77,7 @@ class Destroy extends BaseApi
                $list = $this->friendicaCircle->createFromId($gid);
 
                if (Circle::remove($gid)) {
-                       $this->response->exit('statuses', ['lists' => ['lists' => $list]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                       $this->response->addFormattedContent('statuses', ['lists' => ['lists' => $list]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
                }
        }
 }

diff --git a/src/Module/Api/Twitter/Lists/Lists.php b/src/Module/Api/Twitter/Lists/Lists.php
index 2953c1c973a770f1f1175d76e11d4d3db4ab22aa..8ebef3789f16d0743bba4ed8e618b084610259f4 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Lists.php
+++ b/src/Module/Api/Twitter/Lists/Lists.php
@@ -38,6 +38,6 @@ class Lists extends BaseApi
 
                // This is a dummy endpoint
                $ret = [];
-               $this->response->exit('statuses', ["lists_list" => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ["lists_list" => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Lists/Ownership.php b/src/Module/Api/Twitter/Lists/Ownership.php
index 2a1ea5ac60bd851b77f0cc5367fc0c2a290dab86..aad152c3ac2a34fe127893c950e5ea1f04e8ee4e 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Ownership.php
+++ b/src/Module/Api/Twitter/Lists/Ownership.php
@@ -64,6 +64,6 @@ class Ownership extends BaseApi
                        $lists[] = $this->friendicaCircle->createFromId($circle['id']);
                }
 
-               $this->response->exit('statuses', ['lists' => ['lists' => $lists]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['lists' => ['lists' => $lists]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Lists/Statuses.php b/src/Module/Api/Twitter/Lists/Statuses.php
index 7d159c498bb9bbc244b7392a8da70b10b8b75fa6..154db631d6eb515a315cf98f21020797a9c67ee0 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Statuses.php
+++ b/src/Module/Api/Twitter/Lists/Statuses.php
@@ -103,6 +103,6 @@ class Statuses extends BaseApi
                }
                $this->dba->close($statuses);
 
-               $this->response->exit('statuses', ['status' => $items], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $items], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Lists/Update.php b/src/Module/Api/Twitter/Lists/Update.php
index 6a925eeda5dcc3ce4dd7ae2a0be63f97a111cf2f..be98f8265452a76d34cdcc90a91cf780ab3e7372 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Update.php
+++ b/src/Module/Api/Twitter/Lists/Update.php
@@ -78,7 +78,7 @@ class Update extends BaseApi
                if (Circle::update($gid, $name)) {
                        $list = $this->friendicaCircle->createFromId($gid);
 
-                       $this->response->exit('statuses', ['lists' => ['lists' => $list]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                       $this->response->addFormattedContent('statuses', ['lists' => ['lists' => $list]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
                }
        }
 }

diff --git a/src/Module/Api/Twitter/Media/Upload.php b/src/Module/Api/Twitter/Media/Upload.php
index d10b3281480c76ef54f12ce566ae5cc055c48bfd..0ea93f87beb2b5f1bdcb44637888c33d86d2f432 100644 (file)
--- a/src/Module/Api/Twitter/Media/Upload.php
+++ b/src/Module/Api/Twitter/Media/Upload.php
@@ -65,6 +65,6 @@ class Upload extends BaseApi
 
                Logger::info('Media uploaded', ['return' => $returndata]);
 
-               $this->response->exit('media', ['media' => $returndata], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('media', ['media' => $returndata], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/SavedSearches.php b/src/Module/Api/Twitter/SavedSearches.php
index 8901524ff2d4f51f11a745653c4d71f70ec0d915..8a6e5ced82f7a718512ffc0a0cbcf131547fd91d 100644 (file)
--- a/src/Module/Api/Twitter/SavedSearches.php
+++ b/src/Module/Api/Twitter/SavedSearches.php
@@ -44,6 +44,6 @@ class SavedSearches extends BaseApi
 
                DBA::close($terms);
 
-               $this->response->exit('terms', ['terms' => $result], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('terms', ['terms' => $result], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Search/Tweets.php b/src/Module/Api/Twitter/Search/Tweets.php
index 7be76cedcb6b00c86bd24ce6350ef4a758fec7c1..ec13f00dc089273c2395d1fd58e8bce04d5968ab 100644 (file)
--- a/src/Module/Api/Twitter/Search/Tweets.php
+++ b/src/Module/Api/Twitter/Search/Tweets.php
@@ -72,7 +72,7 @@ class Tweets extends BaseApi
                        DBA::close($tags);
 
                        if (empty($uriids)) {
-                               $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                               $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
                                return;
                        }
 
@@ -116,6 +116,6 @@ class Tweets extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/Destroy.php b/src/Module/Api/Twitter/Statuses/Destroy.php
index 0b43e4509fc628c6c2f5714cd5bc510a28de73f9..bde3ee678d6390a8feb47fe76af5742d39ad5f8f 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -59,6 +59,6 @@ class Destroy extends BaseApi
 
                Item::deleteForUser(['id' => $post['id']], $uid);
 
-               $this->response->exit('status', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('status', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/HomeTimeline.php b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
index 52284e3c1a762d99292e2fe352034cea51b03ed4..d7caea65dd6a45687fb225d1316f87c5fac00a7f 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/HomeTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
@@ -87,6 +87,6 @@ class HomeTimeline extends BaseApi
                        }
                }
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/Mentions.php b/src/Module/Api/Twitter/Statuses/Mentions.php
index 3c2e2ab804e0cafe939a09a333476fc7e4da2d89..18d56f1a179303d05af5b229a5447c6747d6bd41 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Mentions.php
+++ b/src/Module/Api/Twitter/Statuses/Mentions.php
@@ -80,6 +80,6 @@ class Mentions extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
index 1c3d52816ef34870bd101ee62ab96f7167b8d9cb..1f4cbc1b44a892666ce25947ad35fb002877b7ad 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
@@ -63,6 +63,6 @@ class NetworkPublicTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/PublicTimeline.php b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
index a05fb5ace597b7a2798c4b25f302a2a7bf324df5..49b9c986f98ee263dcf733b946a1f7ff039e261a 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
@@ -85,6 +85,6 @@ class PublicTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/Retweet.php b/src/Module/Api/Twitter/Statuses/Retweet.php
index 4a1051f0e35414eef4239d759df3b6eb8bee4c2b..6640f880c6b36fd96311ff7c10b96dc90a86ef31 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Retweet.php
+++ b/src/Module/Api/Twitter/Statuses/Retweet.php
@@ -69,6 +69,6 @@ class Retweet extends BaseApi
 
                $status_info = DI::twitterStatus()->createFromItemId($item_id, $uid)->toArray();
 
-               DI::apiResponse()->exit('statuses', ['status' => $status_info], $this->parameters['extension'] ?? null);
+               DI::apiResponse()->addFormattedContent('statuses', ['status' => $status_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/Show.php b/src/Module/Api/Twitter/Statuses/Show.php
index a7537c3445bd7b2a5203e3361c8586fe738cc5ca..67a0b31af5c036c935f4c73db3998312ea7911a1 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Show.php
+++ b/src/Module/Api/Twitter/Statuses/Show.php
@@ -85,10 +85,10 @@ class Show extends BaseApi
 
                if ($conversation) {
                        $data = ['status' => $ret];
-                       $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                       $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
                } else {
                        $data = ['status' => $ret[0]];
-                       $this->response->exit('status', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                       $this->response->addFormattedContent('status', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
                }
        }
 }

diff --git a/src/Module/Api/Twitter/Statuses/Update.php b/src/Module/Api/Twitter/Statuses/Update.php
index 2151dabd6886fdfc7d8ae96cc32668b8030164d1..b3f0dd8a6f59ba01b10be4a3f4500324a915f872 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Update.php
+++ b/src/Module/Api/Twitter/Statuses/Update.php
@@ -184,7 +184,7 @@ class Update extends BaseApi
                        if (!empty($item['uri-id'])) {
                                // output the post that we just posted.
                                $status_info = DI::twitterStatus()->createFromUriId($item['uri-id'], $uid, $request['include_entities'])->toArray();
-                               DI::apiResponse()->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                               DI::apiResponse()->addFormattedContent('status', ['status' => $status_info], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
                                return;
                        }
                }

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index 391ed16ce240b7c21edf0e0b0728b339393afb52..2c58fd6aff9aeb9a305b18b686e58beee497b12a 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -80,6 +80,6 @@ class UserTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Users/Lookup.php b/src/Module/Api/Twitter/Users/Lookup.php
index 809845d50199f62c110ce910701183550d3035d4..960239f226481d2aa8f3aa6ef5b6e68d65b072e2 100644 (file)
--- a/src/Module/Api/Twitter/Users/Lookup.php
+++ b/src/Module/Api/Twitter/Users/Lookup.php
@@ -51,6 +51,6 @@ class Lookup extends BaseApi
                        throw new NotFoundException();
                }
 
-               $this->response->exit('users', ['user' => $users], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('users', ['user' => $users], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Users/Search.php b/src/Module/Api/Twitter/Users/Search.php
index f82c003d84e2fe760187bbe190d7c33228ab8083..2ca30afac78588368b253ec985932b48f637a781 100644 (file)
--- a/src/Module/Api/Twitter/Users/Search.php
+++ b/src/Module/Api/Twitter/Users/Search.php
@@ -69,6 +69,6 @@ class Search extends BaseApi
                        throw new BadRequestException('No search term specified.');
                }
 
-               $this->response->exit('users', $userlist, $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('users', $userlist, $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Users/Show.php b/src/Module/Api/Twitter/Users/Show.php
index cd321a94c4e7d435816822c5587c6088437760ba..158c3f18dc9bbadbb55153b57db6f11480399768 100644 (file)
--- a/src/Module/Api/Twitter/Users/Show.php
+++ b/src/Module/Api/Twitter/Users/Show.php
@@ -48,6 +48,6 @@ class Show extends BaseApi
                // "uid" is only needed for some internal stuff, so remove it from here
                unset($user_info['uid']);
 
-               $this->response->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->addFormattedContent('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/tests/src/Module/Api/ApiResponseTest.php b/tests/src/Module/Api/ApiResponseTest.php
index 0c246e58a26ecef524e0da60b0350e0945cf9867..c92b9ae2350db3bcc67a4c5ff5b4be82010d1ade 100644 (file)
--- a/tests/src/Module/Api/ApiResponseTest.php
+++ b/tests/src/Module/Api/ApiResponseTest.php
@@ -285,7 +285,7 @@ class ApiResponseTest extends MockedTest
                $twitterUser = \Mockery::mock(User::class);
 
                $response = new ApiResponse($l10n, $args, new NullLogger(), $baseUrl, $twitterUser);
-               $response->exitWithJson(['some_data']);
+               $response->addJsonContent(['some_data']);
 
                self::assertEquals('["some_data"]', $response->getContent());
        }
@@ -302,7 +302,7 @@ class ApiResponseTest extends MockedTest
                $twitterUser = \Mockery::mock(User::class);
 
                $response = new ApiResponse($l10n, $args, new NullLogger(), $baseUrl, $twitterUser, [], 'JsonPCallback');
-               $response->exitWithJson(['some_data']);
+               $response->addJsonContent(['some_data']);
 
                self::assertEquals('JsonPCallback(["some_data"])', $response->getContent());
        }