oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move API Response methods into an own class to make them mockable

Browse source
This commit is contained in:
Philipp 2021-11-12 19:52:01 +01:00
parent 893b8e5df3
commit 319f91301d
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
22 changed files with 327 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Api/Friendica/Activity.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Module\Api\Friendica;
use Friendica\Model\Item;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
/**
@ -56,9 +57,9 @@ class Activity extends BaseApi
} else {
$ok = 'ok';
}
self::exit('ok', ['ok' => $ok], $parameters['extension'] ?? null);
ApiResponse::exit('ok', ['ok' => $ok], $parameters['extension'] ?? null);
} else {
self::error(500, 'Error adding activity', '', $parameters['extension'] ?? null);
ApiResponse::error(500, 'Error adding activity', '', $parameters['extension'] ?? null);
}
}
}

7
src/Module/Api/Friendica/DirectMessages/Setseen.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Module\Api\Friendica\DirectMessages;
use Friendica\Database\DBA;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
/**
@ -41,13 +42,13 @@ class Setseen extends BaseApi
// return error if id is zero
if (empty($request['id'])) {
$answer = ['result' => 'error', 'message' => 'message id not specified'];
self::exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
ApiResponse::exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
}
// 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'];
self::exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
ApiResponse::exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
}
// update seen indicator
@ -57,6 +58,6 @@ class Setseen extends BaseApi
$answer = ['result' => 'error', 'message' => 'unknown error'];
}
self::exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
ApiResponse::exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
}
}

3
src/Module/Api/Friendica/Events/Index.php
View file

@ -23,6 +23,7 @@ namespace Friendica\Module\Api\Friendica\Events;
use Friendica\Content\Text\BBCode;
use Friendica\Database\DBA;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;
@ -70,6 +71,6 @@ class Index extends BaseApi
];
}
self::exit('events', ['events' => $items], $parameters['extension'] ?? null);
ApiResponse::exit('events', ['events' => $items], $parameters['extension'] ?? null);
}
}

3
src/Module/Api/Friendica/Notification.php
View file

@ -23,6 +23,7 @@ namespace Friendica\Module\Api\Friendica;
use Friendica\Collection\Api\Notifications as ApiNotifications;
use Friendica\DI;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
use Friendica\Object\Api\Friendica\Notification as ApiNotification;
@ -56,6 +57,6 @@ class Notification extends BaseApi
$result = false;
}
self::exit('notes', ['note' => $result], $parameters['extension'] ?? null);
ApiResponse::exit('notes', ['note' => $result], $parameters['extension'] ?? null);
}
}

3
src/Module/Api/Friendica/Photo/Delete.php
View file

@ -23,6 +23,7 @@ namespace Friendica\Module\Api\Friendica\Photo;
use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -63,7 +64,7 @@ class Delete extends BaseApi
Item::deleteForUser($condition, $uid);
$result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];
self::exit('photo_delete', ['$result' => $result], $parameters['extension'] ?? null);
ApiResponse::exit('photo_delete', ['$result' => $result], $parameters['extension'] ?? null);
} else {
throw new InternalServerErrorException("unknown error on deleting photo from database table");
}

3
src/Module/Api/Friendica/Photoalbum/Delete.php
View file

@ -24,6 +24,7 @@ namespace Friendica\Module\Api\Friendica\Photoalbum;
use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -66,7 +67,7 @@ class Delete extends BaseApi
// return success of deletion or error message
if ($result) {
$answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.'];
self::exit('photoalbum_delete', ['$result' => $answer], $parameters['extension'] ?? null);
ApiResponse::exit('photoalbum_delete', ['$result' => $answer], $parameters['extension'] ?? null);
} else {
throw new InternalServerErrorException("unknown error - deleting from database failed");
}

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

@ -22,6 +22,7 @@
namespace Friendica\Module\Api\Friendica\Photoalbum;
use Friendica\Model\Photo;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -58,7 +59,7 @@ class Update extends BaseApi
// return success of updating or error message
if ($result) {
$answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.'];
self::exit('photoalbum_update', ['$result' => $answer], $parameters['extension'] ?? null);
ApiResponse::exit('photoalbum_update', ['$result' => $answer], $parameters['extension'] ?? null);
} else {
throw new InternalServerErrorException("unknown error - updating in database failed");
}

3
src/Module/Api/Friendica/Profile/Show.php
View file

@ -21,6 +21,7 @@
namespace Friendica\Module\Api\Friendica\Profile;
use Friendica\Module\Api\ApiResponse;
use Friendica\Profile\ProfileField\Collection\ProfileFields;
use Friendica\Content\Text\BBCode;
use Friendica\DI;
@ -66,7 +67,7 @@ class Show extends BaseApi
'profiles' => $profiles
];
self::exit('friendica_profiles', ['$result' => $result], $parameters['extension'] ?? null);
ApiResponse::exit('friendica_profiles', ['$result' => $result], $parameters['extension'] ?? null);
}
/**