clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12799 from HankG/fix-mastodon-friend-requests-ids

Browse Source 
Change FollowRequest to return the user ID so is compatible with POST endpoint
This commit is contained in:
Hypolite Petovan
2023-02-17 18:09:26 -05:00
committed by GitHub
parent 659fab0fe5 f40cd60e39
commit 6d38b44b97
4 changed files with 4 additions and 120 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]);
}