friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 04:04:59 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse source
This commit is contained in:
Philipp Holzer 2021-11-28 15:05:42 +01:00 committed by Hypolite Petovan
parent 2dc60cfd33
commit a88cc8d5c8
22 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Module/Api/Friendica/Group/Update.php
View file

@ -22,7 +22,6 @@
namespace Friendica\Module\Api\Friendica\Group; namespace Friendica\Module\Api\Friendica\Group;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Module\BaseApi; use Friendica\Module\BaseApi;
@ -84,6 +83,6 @@ class Update extends BaseApi
// return success message incl. missing users in array // return success message incl. missing users in array
$status = ($erroraddinguser ? 'missing user' : 'ok'); $status = ($erroraddinguser ? 'missing user' : 'ok');
$success = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers]; $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);
} }
} }

4
src/Module/Api/Friendica/Notification/Seen.php
View file

@ -70,12 +70,12 @@ class Seen extends BaseApi
// we found the item, return it to the user // we found the item, return it to the user
$ret = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()]; $ret = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()];
$data = ['status' => $ret]; $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 // 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) { } catch (NotFoundException $e) {
throw new BadRequestException('Invalid argument', $e); throw new BadRequestException('Invalid argument', $e);
} catch (Exception $e) { } catch (Exception $e) {

2
src/Module/Api/GNUSocial/Statusnet/Conversation.php
View file

@ -90,6 +90,6 @@ class Conversation extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Account/UpdateProfile.php
View file

@ -64,6 +64,6 @@ class UpdateProfile extends BaseApi
// "uid" is only needed for some internal stuff, so remove it from here // "uid" is only needed for some internal stuff, so remove it from here
unset($user_info['uid']); 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);
} }
} }

2
src/Module/Api/Twitter/Account/VerifyCredentials.php
View file

@ -47,6 +47,6 @@ class VerifyCredentials extends BaseApi
// "uid" is only needed for some internal stuff, so remove it from here // "uid" is only needed for some internal stuff, so remove it from here
unset($user_info['uid']); 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);
} }
} }

2
src/Module/Api/Twitter/Favorites.php
View file

@ -72,6 +72,6 @@ class Favorites extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Favorites/Create.php
View file

@ -46,6 +46,6 @@ class Create extends BaseApi
$status_info = DI::twitterStatus()->createFromItemId($id, $uid)->toArray(); $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);
} }
} }

2
src/Module/Api/Twitter/Favorites/Destroy.php
View file

@ -46,6 +46,6 @@ class Destroy extends BaseApi
$status_info = DI::twitterStatus()->createFromItemId($id, $uid)->toArray(); $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);
} }
} }

2
src/Module/Api/Twitter/Friendships/Destroy.php
View file

@ -81,6 +81,6 @@ class Destroy extends ContactEndpoint
throw new HTTPException\InternalServerErrorException('Unable to unfollow this contact, please contact your administrator'); 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);
} }
} }

2
src/Module/Api/Twitter/Lists/Statuses.php
View file

@ -83,6 +83,6 @@ class Statuses extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Media/Upload.php
View file

@ -65,6 +65,6 @@ class Upload extends BaseApi
Logger::info('Media uploaded', ['return' => $returndata]); 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);
} }
} }

5
src/Module/Api/Twitter/Search/Tweets.php
View file

@ -77,7 +77,8 @@ class Tweets extends BaseApi
DBA::close($tags); DBA::close($tags);
if (empty($uriids)) { 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]; $condition = ['uri-id' => $uriids];
@ -122,6 +123,6 @@ class Tweets extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Statuses/Destroy.php
View file

@ -53,6 +53,6 @@ class Destroy extends BaseApi
Item::deleteForUser(['id' => $id], $uid); 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));
} }
} }

2
src/Module/Api/Twitter/Statuses/HomeTimeline.php
View file

@ -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));
} }
} }

2
src/Module/Api/Twitter/Statuses/Mentions.php
View file

@ -80,6 +80,6 @@ class Mentions extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
View file

@ -66,6 +66,6 @@ class NetworkPublicTimeline extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Statuses/PublicTimeline.php
View file

@ -86,6 +86,6 @@ class PublicTimeline extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

4
src/Module/Api/Twitter/Statuses/Show.php
View file

@ -89,10 +89,10 @@ class Show extends BaseApi
if ($conversation) { if ($conversation) {
$data = ['status' => $ret]; $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 { } else {
$data = ['status' => $ret[0]]; $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));
} }
} }
} }

2
src/Module/Api/Twitter/Statuses/UserTimeline.php
View file

@ -82,6 +82,6 @@ class UserTimeline extends BaseApi
} }
DBA::close($statuses); 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));
} }
} }

2
src/Module/Api/Twitter/Users/Lookup.php
View file

@ -51,6 +51,6 @@ class Lookup extends BaseApi
throw new NotFoundException(); throw new NotFoundException();
} }
DI::apiResponse()->exit('users', ['user' => $users], $this->parameters['extension'] ?? null); $this->response->exit('users', ['user' => $users], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Twitter/Users/Search.php
View file

@ -69,6 +69,6 @@ class Search extends BaseApi
throw new BadRequestException('No search term specified.'); 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);
} }
} }

2
src/Module/Api/Twitter/Users/Show.php
View file

@ -48,6 +48,6 @@ class Show extends BaseApi
// "uid" is only needed for some internal stuff, so remove it from here // "uid" is only needed for some internal stuff, so remove it from here
unset($user_info['uid']); 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);
} }
} }