UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-02 10:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4100 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-01-17 01:54:32 -07:00 committed by GitHub
commit 10349b2f70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -79,6 +79,7 @@
- Update profile audience to filter blocked instances ([e0c3dae3](https://github.com/pixelfed/pixelfed/commit/e0c3dae3)) - Update profile audience to filter blocked instances ([e0c3dae3](https://github.com/pixelfed/pixelfed/commit/e0c3dae3))
- Update SearchApiV2Service, improve query performance ([4d1f2811](https://github.com/pixelfed/pixelfed/commit/4d1f2811)) - Update SearchApiV2Service, improve query performance ([4d1f2811](https://github.com/pixelfed/pixelfed/commit/4d1f2811))
- Update InstanceService, improve unlisted/banned network post filtering ([a0da6ec3](https://github.com/pixelfed/pixelfed/commit/a0da6ec3)) - Update InstanceService, improve unlisted/banned network post filtering ([a0da6ec3](https://github.com/pixelfed/pixelfed/commit/a0da6ec3))
- Update ApiV1DotController, fix inAppRegistrationConfirm logic ([6cfbedd9](https://github.com/pixelfed/pixelfed/commit/6cfbedd9))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

7
app/Http/Controllers/Api/ApiV1Dot1Controller.php
View file

@ -547,13 +547,16 @@ class ApiV1Dot1Controller extends Controller
return response()->json(['error' => 'Invalid tokens'], 403); return response()->json(['error' => 'Invalid tokens'], 403);
} }
if($verify->created_at->lt(now()->subHours(24))) {
$verify->delete();
return response()->json(['error' => 'Invalid tokens'], 403);
}
$user = User::findOrFail($verify->user_id); $user = User::findOrFail($verify->user_id);
$user->email_verified_at = now(); $user->email_verified_at = now();
$user->last_active_at = now(); $user->last_active_at = now();
$user->save(); $user->save();
$verify->delete();
$token = $user->createToken('Pixelfed'); $token = $user->createToken('Pixelfed');
return response()->json([ return response()->json([