Replace `DI::apiResponse()->exit()` with `$this->response->exit()`

diff --git a/src/Module/Api/Friendica/Group/Update.php b/src/Module/Api/Friendica/Group/Update.php
index e21b8c8636cb892626e9a4a529fe04649d8981f6..9317c77d3d6fe0e4a2b95fdddd14653689c38cb1 100644 (file)
--- a/src/Module/Api/Friendica/Group/Update.php
+++ b/src/Module/Api/Friendica/Group/Update.php
@@ -22,7 +22,6 @@
 namespace Friendica\Module\Api\Friendica\Group;
 
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Module\BaseApi;
@@ -84,6 +83,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];
-               DI::apiResponse()->exit('group_update', ['$result' => $success], $this->parameters['extension'] ?? null);
+               $this->response->exit('group_update', ['$result' => $success], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php
index 92039be145050e3be473874f49a814522a65d92e..ffd178bcb0ba16e7454257385e78b7b3b5ba11f4 100644 (file)
--- a/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@ -70,12 +70,12 @@ 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];
-                                       DI::apiResponse()->exit('statuses', $data, $this->parameters['extension'] ?? null);
+                                       $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null);
                                }
                                // the item can't be found, but we set the notification as seen, so we count this as a success
                        }
 
-                       DI::apiResponse()->exit('statuses', ['result' => 'success'], $this->parameters['extension'] ?? null);
+                       $this->response->exit('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/GNUSocial/Statusnet/Conversation.php b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
index 4b1760031da114a4dc1701ecd9f0d41bd35781ce..24da0ccb9722b7af134ac67754fa9fa41020db8f 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);
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/src/Module/Api/Twitter/Account/UpdateProfile.php b/src/Module/Api/Twitter/Account/UpdateProfile.php
index 9c8c901511e7825ce7312d2ce5afd9b4a10780ba..5369e25cb5c85b6ba9ede97475927abe0051c85e 100644 (file)
--- a/src/Module/Api/Twitter/Account/UpdateProfile.php
+++ b/src/Module/Api/Twitter/Account/UpdateProfile.php
@@ -64,6 +64,6 @@ class UpdateProfile extends BaseApi
                // "uid" is only needed for some internal stuff, so remove it from here
                unset($user_info['uid']);
 
-               DI::apiResponse()->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->exit('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 170da69c669ac488ce7ac8a8eb9e7b38e98d4867..2de15af2bcaca4f12e525d4e968074f0d97876ec 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']);
 
-               DI::apiResponse()->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php
index 8c6f7082a4d807cf37dfa2ca2f5f1d99d4e83d1b..f806b23eec3b543928a333d9a19f6507d23a38f4 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);
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('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 74fb722377a48eccad9e34fab90376753dc27966..308acc89293d5667a3675b1f5d712615c1d32042 100644 (file)
--- a/src/Module/Api/Twitter/Favorites/Create.php
+++ b/src/Module/Api/Twitter/Favorites/Create.php
@@ -46,6 +46,6 @@ class Create extends BaseApi
 
                $status_info = DI::twitterStatus()->createFromItemId($id, $uid)->toArray();
 
-               DI::apiResponse()->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
+               $this->response->exit('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 6c797d8b506e44f6709a9d5cdcf501625a8ef4ea..886d64d146d1fa713b5bc16607356f6f66c7fd7d 100644 (file)
--- a/src/Module/Api/Twitter/Favorites/Destroy.php
+++ b/src/Module/Api/Twitter/Favorites/Destroy.php
@@ -46,6 +46,6 @@ class Destroy extends BaseApi
 
                $status_info = DI::twitterStatus()->createFromItemId($id, $uid)->toArray();
 
-               DI::apiResponse()->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
+               $this->response->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
        }
 }

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

diff --git a/src/Module/Api/Twitter/Lists/Statuses.php b/src/Module/Api/Twitter/Lists/Statuses.php
index 03bbce7bde668a7efae076ad16666a1ef36c911d..d647e4a271c09dc764b4f2fce7111d0c32b3082a 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Statuses.php
+++ b/src/Module/Api/Twitter/Lists/Statuses.php
@@ -83,6 +83,6 @@ class Statuses extends BaseApi
                }
                DBA::close($statuses);
 
-               DI::apiResponse()->exit('statuses', ['status' => $items], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('statuses', ['status' => $items], $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 48538a3313e312fbcacf82de0235f517ab6438d3..a295296b7a212f34badf3d8c2481e376d07a6f99 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]);
 
-               DI::apiResponse()->exit('media', ['media' => $returndata], $this->parameters['extension'] ?? null);
+               $this->response->exit('media', ['media' => $returndata], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Search/Tweets.php b/src/Module/Api/Twitter/Search/Tweets.php
index 4d1aec833ea357f1d6db28d9298cb1779f899b9e..ac9857ac9b93f7e7cda403eedaddfb3b8ed433fa 100644 (file)
--- a/src/Module/Api/Twitter/Search/Tweets.php
+++ b/src/Module/Api/Twitter/Search/Tweets.php
@@ -77,7 +77,8 @@ class Tweets extends BaseApi
                        DBA::close($tags);
 
                        if (empty($uriids)) {
-                               DI::apiResponse()->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                               $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                               return;
                        }
 
                        $condition = ['uri-id' => $uriids];
@@ -122,6 +123,6 @@ class Tweets extends BaseApi
                }
                DBA::close($statuses);
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('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 5a4bc920edd052c18b1d72956cd3ede85d643b50..58f13157b97d052258b62c2ea59826c506bc4757 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -53,6 +53,6 @@ class Destroy extends BaseApi
 
                Item::deleteForUser(['id' => $id], $uid);
 
-               DI::apiResponse()->exit('status', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('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 c98134807afd5eb4e8e229e1bd613d87fdc108cd..250c4359b80805757f4686acd4362896b3ee760e 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/HomeTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
@@ -88,6 +88,6 @@ class HomeTimeline extends BaseApi
                        }
                }
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('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 08970340fc7c984cb386bfbb4a078b1362900a85..47a860c7b945760d64d01e0749124fb909420e3f 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);
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('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 56f2f10d5093f5b7e4e6cd917289cc4e8f2f4efc..1ec00acf25afaaa9921d845fe905ee39b6930065 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
@@ -66,6 +66,6 @@ class NetworkPublicTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('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 ad4380fe1cd70199c0424d4ce6ef8f2d33b1ffff..334d43dbb24ae19ecbb74b3e3b6434b67640d383 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
@@ -86,6 +86,6 @@ class PublicTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

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

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index 2b014490993297ff5c249df1df8eb1e4438bc8d5..ba713c7651c88a3556e70299162e5d3ff452dbe7 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -82,6 +82,6 @@ class UserTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               DI::apiResponse()->exit('user', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('user', ['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 53bedd53a84250f709946ac099e10d1f2408557c..9d4c460c6eb890df8e0bffad4cfc614012193515 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();
                }
 
-               DI::apiResponse()->exit('users', ['user' => $users], $this->parameters['extension'] ?? null);
+               $this->response->exit('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 e30480e267353bc91cdac658c3bf60115d845daf..9c7be2f5153d5173951250d8b13c42d3fa4a25c4 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.');
                }
 
-               DI::apiResponse()->exit('users', ['user' => $userlist], $this->parameters['extension'] ?? null);
+               $this->response->exit('users', ['user' => $userlist], $this->parameters['extension'] ?? null);
        }
 }

diff --git a/src/Module/Api/Twitter/Users/Show.php b/src/Module/Api/Twitter/Users/Show.php
index d0d8f17bbae12a53d9afe6884180535fc1bcaf18..ce662eb352b185a3741ce26b7cc9160581cf3e20 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']);
 
-               DI::apiResponse()->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
+               $this->response->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }