friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Move jsonError out of Factory\Api\Mastodon\Error->RecordNotFound

This commit is contained in:
Hypolite Petovan 2023-10-11 09:16:03 -04:00
parent 9e71610711
commit 7f846f153d
36 changed files with 68 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Factory/Api/Mastodon/Error.php
View File

@ -50,14 +50,11 @@ class Error extends BaseFactory
$this->logger->info('API Error', ['no' => $errorno, 'error' => $error, 'method' => $this->args->getMethod(), 'command' => $this->args->getQueryString(), 'user-agent' => $this->server['HTTP_USER_AGENT'] ?? '']);
}
public function RecordNotFound()
public function RecordNotFound(): \Friendica\Object\Api\Mastodon\Error
{
$error = $this->l10n->t('Record not found');
$error_description = '';
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
$this->logError(404, $error);
$this->jsonError(404, $errorObj->toArray());
return new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
}
public function UnprocessableEntity(string $error = '')

2
src/Factory/Api/Mastodon/Status.php
View File

@ -359,7 +359,7 @@ class Status extends BaseFactory
{
$item = ActivityPub\Transmitter::getItemArrayFromMail($id, true);
if (empty($item)) {
$this->mstdnErrorFactory->RecordNotFound();
throw new HTTPException\NotFoundException('Mail record not found with id: ' . $id);
}
$account = $this->mstdnAccountFactory->createFromContactId($item['author-id']);

2
src/Module/Api/Friendica/Statuses/Dislike.php
View File

@ -44,7 +44,7 @@ class Dislike extends BaseApi
$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Item::performActivity($item['id'], 'dislike', $uid);

2
src/Module/Api/Friendica/Statuses/DislikedBy.php
View File

@ -46,7 +46,7 @@ class DislikedBy extends BaseApi
$id = $this->parameters['id'];
if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$activities = Post::selectPosts(['author-id'], ['thr-parent-id' => $id, 'gravity' => Item::GRAVITY_ACTIVITY, 'verb' => Activity::DISLIKE, 'deleted' => false]);

2
src/Module/Api/Friendica/Statuses/Undislike.php
View File

@ -44,7 +44,7 @@ class Undislike extends BaseApi
$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Item::performActivity($item['id'], 'undislike', $uid);

4
src/Module/Api/Mastodon/Accounts.php
View File

@ -46,14 +46,14 @@ class Accounts extends BaseApi
if (!empty($this->parameters['id'])) {
$id = $this->parameters['id'];
if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
} else {
$contact = Contact::selectFirst(['id'], ['nick' => $this->parameters['name'], 'uid' => 0]);
if (!empty($contact['id'])) {
$id = $contact['id'];
} elseif (!($id = Contact::getIdForURL($this->parameters['name'], 0, false))) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
}

2
src/Module/Api/Mastodon/Accounts/Followers.php
View File

@ -46,7 +46,7 @@ class Followers extends BaseApi
$id = $this->parameters['id'];
if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$request = $this->getRequest([

2
src/Module/Api/Mastodon/Accounts/Following.php
View File

@ -46,7 +46,7 @@ class Following extends BaseApi
$id = $this->parameters['id'];
if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$request = $this->getRequest([

2
src/Module/Api/Mastodon/Accounts/Lists.php
View File

@ -46,7 +46,7 @@ class Lists extends BaseApi
$id = $this->parameters['id'];
if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$lists = [];

2
src/Module/Api/Mastodon/Accounts/Note.php
View File

@ -47,7 +47,7 @@ class Note extends BaseApi
$cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
if (empty($cdata['user'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Contact::update(['info' => $request['comment']], ['id' => $cdata['user']]);

2
src/Module/Api/Mastodon/Accounts/Statuses.php
View File

@ -52,7 +52,7 @@ class Statuses extends BaseApi
$id = $this->parameters['id'];
if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$request = $this->getRequest([

2
src/Module/Api/Mastodon/Accounts/Unfollow.php
View File

@ -42,7 +42,7 @@ class Unfollow extends BaseApi
$cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
if (empty($cdata['user'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$contact = Contact::getById($cdata['user']);

11
src/Module/Api/Mastodon/Conversations.php
View File

@ -25,6 +25,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException\NotFoundException;
/**
* @see https://docs.joinmastodon.org/methods/timelines/conversations/
@ -83,9 +84,13 @@ class Conversations extends BaseApi
$conversations = [];
while ($conv = DBA::fetch($convs)) {
self::setBoundaries($conv['id']);
$conversations[] = DI::mstdnConversation()->createFromConvId($conv['id']);
try {
while ($conv = DBA::fetch($convs)) {
self::setBoundaries($conv['id']);
$conversations[] = DI::mstdnConversation()->createFromConvId($conv['id']);
}
} catch (NotFoundException $e) {
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
DBA::close($convs);

7
src/Module/Api/Mastodon/Conversations/Read.php
View File

@ -25,6 +25,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException\NotFoundException;
/**
* @see https://docs.joinmastodon.org/methods/timelines/conversations/
@ -42,6 +43,10 @@ class Read extends BaseApi
DBA::update('mail', ['seen' => true], ['convid' => $this->parameters['id'], 'uid' => $uid]);
$this->jsonExit(DI::mstdnConversation()->createFromConvId($this->parameters['id'])->toArray());
try {
$this->jsonExit(DI::mstdnConversation()->createFromConvId($this->parameters['id'])->toArray());
} catch (NotFoundException $e) {
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
}
}

4
src/Module/Api/Mastodon/Lists.php
View File

@ -41,7 +41,7 @@ class Lists extends BaseApi
}
if (!Circle::exists($this->parameters['id'], $uid)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if (!Circle::remove($this->parameters['id'])) {
@ -106,7 +106,7 @@ class Lists extends BaseApi
$id = $this->parameters['id'];
if (!Circle::exists($id, $uid)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$lists = DI::mstdnList()->createFromCircleId($id);
}

2
src/Module/Api/Mastodon/Lists/Accounts.php
View File

@ -78,7 +78,7 @@ class Accounts extends BaseApi
$id = $this->parameters['id'];
if (!DBA::exists('group', ['id' => $id, 'uid' => $uid])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$request = $this->getRequest([

6
src/Module/Api/Mastodon/Media.php
View File

@ -81,10 +81,10 @@ class Media extends BaseApi
if (empty($photo['resource-id'])) {
$media = Post\Media::getById($this->parameters['id']);
if (empty($media['uri-id'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if (!Post::exists(['uri-id' => $media['uri-id'], 'uid' => $uid, 'origin' => true])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Post\Media::updateById(['description' => $request['description']], $this->parameters['id']);
$this->jsonExit(DI::mstdnAttachment()->createFromId($this->parameters['id']));
@ -109,7 +109,7 @@ class Media extends BaseApi
$id = $this->parameters['id'];
if (!Photo::exists(['id' => $id, 'uid' => $uid])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$this->jsonExit(DI::mstdnAttachment()->createFromPhoto($id));

2
src/Module/Api/Mastodon/Mutes.php
View File

@ -45,7 +45,7 @@ class Mutes extends BaseApi
$id = $this->parameters['id'];
if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$request = $this->getRequest([

2
src/Module/Api/Mastodon/Notifications.php
View File

@ -50,7 +50,7 @@ class Notifications extends BaseApi
$notification = DI::notification()->selectOneForUser($uid, ['id' => $id]);
$this->jsonExit(DI::mstdnNotification()->createFromNotification($notification, self::appSupportsQuotes()));
} catch (\Exception $e) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
}

4
src/Module/Api/Mastodon/PushSubscription.php
View File

@ -94,7 +94,7 @@ class PushSubscription extends BaseApi
$subscription = Subscription::select($application['id'], $uid, ['id']);
if (empty($subscription)) {
$this->logger->info('Subscription not found', ['application-id' => $application['id'], 'uid' => $uid]);
$this->errorFactory->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$fields = [
@ -145,7 +145,7 @@ class PushSubscription extends BaseApi
if (!Subscription::exists($application['id'], $uid)) {
$this->logger->info('Subscription not found', ['application-id' => $application['id'], 'uid' => $uid]);
$this->errorFactory->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$this->logger->info('Fetch subscription', ['application-id' => $application['id'], 'uid' => $uid]);

2
src/Module/Api/Mastodon/ScheduledStatuses.php
View File

@ -51,7 +51,7 @@ class ScheduledStatuses extends BaseApi
}
if (!DBA::exists('delayed-post', ['id' => $this->parameters['id'], 'uid' => $uid])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Post\Delayed::deleteById($this->parameters['id']);

4
src/Module/Api/Mastodon/Statuses.php
View File

@ -324,11 +324,11 @@ class Statuses extends BaseApi
$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => $uid]);
if (empty($item['id'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if (!Item::markForDeletionById($item['id'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$this->jsonExit([]);

6
src/Module/Api/Mastodon/Statuses/Bookmark.php
View File

@ -44,7 +44,7 @@ class Bookmark extends BaseApi
$item = Post::selectOriginal(['uid', 'id', 'uri-id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]], ['order' => ['uid' => true]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if ($item['gravity'] != Item::GRAVITY_PARENT) {
@ -56,10 +56,10 @@ class Bookmark extends BaseApi
if (!empty($stored)) {
$item = Post::selectFirst(['id', 'gravity'], ['id' => $stored]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
} else {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
}

2
src/Module/Api/Mastodon/Statuses/Context.php
View File

@ -116,7 +116,7 @@ class Context extends BaseApi
}
DBA::close($posts);
} else {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
}

2
src/Module/Api/Mastodon/Statuses/Favourite.php
View File

@ -44,7 +44,7 @@ class Favourite extends BaseApi
$item = Post::selectOriginalForUser($uid, ['id', 'uri-id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Item::performActivity($item['id'], 'like', $uid);

2
src/Module/Api/Mastodon/Statuses/FavouritedBy.php
View File

@ -45,7 +45,7 @@ class FavouritedBy extends BaseApi
}
if (!$post = Post::selectOriginal(['uri-id'], ['uri-id' => $this->parameters['id'], 'uid' => [0, $uid]])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$activities = Post::selectPosts(['author-id'], ['thr-parent-id' => $post['uri-id'], 'gravity' => Item::GRAVITY_ACTIVITY, 'verb' => Activity::LIKE, 'deleted' => false]);

2
src/Module/Api/Mastodon/Statuses/Mute.php
View File

@ -44,7 +44,7 @@ class Mute extends BaseApi
$item = Post::selectOriginalForUser($uid, ['uri-id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if ($item['gravity'] != Item::GRAVITY_PARENT) {

2
src/Module/Api/Mastodon/Statuses/Pin.php
View File

@ -43,7 +43,7 @@ class Pin extends BaseApi
$item = Post::selectOriginalForUser($uid, ['uri-id', 'gravity', 'author-id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Post\Collection::add($item['uri-id'], Post\Collection::FEATURED, $item['author-id'], $uid);

2
src/Module/Api/Mastodon/Statuses/Reblog.php
View File

@ -47,7 +47,7 @@ class Reblog extends BaseApi
$item = Post::selectOriginalForUser($uid, ['id', 'uri-id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if ($item['network'] == Protocol::DIASPORA) {

2
src/Module/Api/Mastodon/Statuses/RebloggedBy.php
View File

@ -45,7 +45,7 @@ class RebloggedBy extends BaseApi
}
if (!$post = Post::selectOriginal(['uri-id'], ['uri-id' => $this->parameters['id'], 'uid' => [0, $uid]])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
$activities = Post::selectPosts(['author-id'], ['thr-parent-id' => $post['uri-id'], 'gravity' => Item::GRAVITY_ACTIVITY, 'verb' => Activity::ANNOUNCE]);

6
src/Module/Api/Mastodon/Statuses/Unbookmark.php
View File

@ -44,7 +44,7 @@ class Unbookmark extends BaseApi
$item = Post::selectOriginal(['uid', 'id', 'uri-id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]], ['order' => ['uid' => true]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if ($item['gravity'] != Item::GRAVITY_PARENT) {
@ -56,10 +56,10 @@ class Unbookmark extends BaseApi
if (!empty($stored)) {
$item = Post::selectFirst(['id', 'gravity'], ['id' => $stored]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
} else {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
}

2
src/Module/Api/Mastodon/Statuses/Unfavourite.php
View File

@ -44,7 +44,7 @@ class Unfavourite extends BaseApi
$item = Post::selectOriginalForUser($uid, ['id', 'uri-id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Item::performActivity($item['id'], 'unlike', $uid);

2
src/Module/Api/Mastodon/Statuses/Unmute.php
View File

@ -44,7 +44,7 @@ class Unmute extends BaseApi
$item = Post::selectOriginalForUser($uid, ['uri-id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if ($item['gravity'] != Item::GRAVITY_PARENT) {

2
src/Module/Api/Mastodon/Statuses/Unpin.php
View File

@ -43,7 +43,7 @@ class Unpin extends BaseApi
$item = Post::selectOriginalForUser($uid, ['uri-id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
Post\Collection::remove($item['uri-id'], Post\Collection::FEATURED, $uid);

6
src/Module/Api/Mastodon/Statuses/Unreblog.php
View File

@ -46,17 +46,17 @@ class Unreblog extends BaseApi
$item = Post::selectOriginalForUser($uid, ['id', 'uri-id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
if (!DBA::isResult($item)) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if ($item['network'] == Protocol::DIASPORA) {
$item = Post::selectFirstForUser($uid, ['id'], ['quote-uri-id' => $this->parameters['id'], 'body' => '', 'origin' => true, 'uid' => $uid]);
if (empty($item['id'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if (!Item::markForDeletionById($item['id'])) {
DI::mstdnError()->RecordNotFound();
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
} elseif (!in_array($item['network'], [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::TWITTER])) {
DI::mstdnError()->UnprocessableEntity(DI::l10n()->t("Posts from %s can't be unshared", ContactSelector::networkToName($item['network'])));

11
src/Module/Api/Mastodon/Timelines/Direct.php
View File

@ -26,6 +26,7 @@ use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;
use Friendica\Network\HTTPException\NotFoundException;
/**
* @see https://docs.joinmastodon.org/methods/timelines/
@ -76,9 +77,13 @@ class Direct extends BaseApi
$statuses = [];
while ($mail = DBA::fetch($mails)) {
self::setBoundaries($mail['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromMailId($mail['id']);
try {
while ($mail = DBA::fetch($mails)) {
self::setBoundaries($mail['uri-id']);
$statuses[] = DI::mstdnStatus()->createFromMailId($mail['id']);
}
} catch (NotFoundException $e) {
$this->logErrorAndJsonExit(404, $this->errorFactory->RecordNotFound());
}
if (!empty($request['min_id'])) {