clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases 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
parent 4b2ee284d8 08754b2bab
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]);
}