Merge pull request #4719 from pixelfed/staging

Update ApiV1Dot1Controller, update iar redirect url format
This commit is contained in:
daniel 2023-10-29 04:07:59 -06:00 committed by GitHub
commit e0208a7dd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -11,6 +11,7 @@ use League\Fractal\Serializer\ArraySerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use App\AccountLog; use App\AccountLog;
use App\EmailVerification; use App\EmailVerification;
use App\Follower;
use App\Place; use App\Place;
use App\Status; use App\Status;
use App\Report; use App\Report;
@ -21,6 +22,8 @@ use App\UserSetting;
use App\Services\AccountService; use App\Services\AccountService;
use App\Services\StatusService; use App\Services\StatusService;
use App\Services\ProfileStatusService; use App\Services\ProfileStatusService;
use App\Services\LikeService;
use App\Services\ReblogService;
use App\Services\PublicTimelineService; use App\Services\PublicTimelineService;
use App\Services\NetworkTimelineService; use App\Services\NetworkTimelineService;
use App\Util\Lexer\RestrictedNames; use App\Util\Lexer\RestrictedNames;
@ -572,7 +575,12 @@ class ApiV1Dot1Controller extends Controller
]); ]);
$ut = $request->input('ut'); $ut = $request->input('ut');
$rt = $request->input('rt'); $rt = $request->input('rt');
$url = 'pixelfed://confirm-account/'. $ut . '?rt=' . $rt . '&domain=' . config('pixelfed.domain.app'); $params = http_build_query([
'ut' => $ut,
'rt' => $rt,
'domain' => config('pixelfed.domain.app')
]);
$url = 'pixelfed://confirm-account/'. $ut . '?' . $params;
return redirect()->away($url); return redirect()->away($url);
} }