Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 17:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into mastodon-status-post-with-title

Browse source
This commit is contained in:
Hank Grabowski 2023-02-18 10:30:57 -05:00
commit 34c4849341
23 changed files with 291 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Api/Mastodon/FollowRequests.php
View file

@ -105,8 +105,10 @@ class FollowRequests extends BaseApi
foreach ($introductions as $key => $introduction) {
try {
self::setBoundaries($introduction->id);
$return[] = DI::mstdnFollowRequest()->createFromIntroduction($introduction);
} catch (HTTPException\InternalServerErrorException $exception) {
$return[] = DI::mstdnAccount()->createFromContactId($introduction->cid, $introduction->uid);
} catch (HTTPException\InternalServerErrorException
| HTTPException\NotFoundException
| \ImagickException $exception) {
DI::intro()->delete($introduction);
unset($introductions[$key]);
}