From 876c4cdb1a51def23411727b3c54accf26698223 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 1 Mar 2025 23:59:18 -0700 Subject: [PATCH 1/2] Staging (#5815) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update iar.blade.php - Fix in-app reg without hcaptcha (#5807) * Staging (#5674) * Update .env.docker Registry has changed. Old registry has been discontinued in August 2024. New Registry added, format of Docker tag has been adjusted as it now contains the Debian Release as well. Sample Version is set to current stable but can be adjusted to any of the available branches. * Update .env.docker Stick major.minor according to https://jippi.github.io/docker-pixelfed/customize/tags/#pixelfed-version Disable Debian Release Check until it's solved in dottie. Closes https://github.com/pixelfed/pixelfed/issues/5264 * New translations web.php (Finnish) [ci skip] * New translations web.php (Finnish) [ci skip] * fix: don't restore memory limit after cities import Since this command can only be invoked by CLI, the process will exit after a successful import, so restoring the transient PHP memory limit doesn't really have any affect. In PHP 8.4, this throws the following error (which doesn't happen in 8.3 and below) > [entrypoint / 11-first-time-setup.sh] - (stderr) 128769/128769 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%[2025-01-20 11:29:23] production.ERROR: Failed to set memory limit to 134217728 bytes (Current memory usage is 134746112 bytes) {"exception":"[object] (ErrorException(code: 0): Failed to set memory limit to 134217728 bytes (Current memory usage is 134746112 bytes) at /var/www/app/Console/Commands/ImportCities.php:140) It seems to be a 8.4 behavior change, so removing the logic would make it go away * New translations web.php (Finnish) [ci skip] * New translations web.php (Finnish) [ci skip] * New translations web.php (Portuguese) [ci skip] * New translations web.php (Portuguese) [ci skip] * fix(compose-modal): avoid WebGL if it's not needed * fix(compose-modal): update webgl-media-editor * New translations web.php (Hungarian) [ci skip] * New translations web.php (Russian) [ci skip] * New translations web.php (Russian) [ci skip] * Update .env.example Adding the parameter INSTANCE_DISCOVER_PUBLIC="true" to prevent a HTTP 403 error at the explorer tab in the instance preview. * New variable for lang spanish * Variable for lang spanish * Update Dockerfile, fixes #5535 #5559 * Fix #5582 * Fix #5632 * Update status twitter:card to summary_large_image for images/albums * Update changelog --------- Co-authored-by: Lioh Moeller Co-authored-by: Christian Winther Co-authored-by: Taye Adeyemi Co-authored-by: stemy2 Co-authored-by: Uthanien * Update iar.blade.php --------- Co-authored-by: daniel Co-authored-by: Lioh Moeller Co-authored-by: Christian Winther Co-authored-by: Taye Adeyemi Co-authored-by: stemy2 Co-authored-by: Uthanien * Add app register email verify resends * Update composer * Update changelog * Update IG import command * Update App Register to expire codes after 4 hours instead of 60 minutes * Update CHANGELOG.md --------- Co-authored-by: Shlee Co-authored-by: Lioh Moeller Co-authored-by: Christian Winther Co-authored-by: Taye Adeyemi Co-authored-by: stemy2 Co-authored-by: Uthanien --- CHANGELOG.md | 1 + app/Http/Controllers/AppRegisterController.php | 4 ++-- resources/views/auth/iar-resend.blade.php | 1 + resources/views/emails/iar/email_verify.blade.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33cb82434..47369d7e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ - Update status twitter:card to summary_large_image for images/albums ([9a5a9f55](https://github.com/pixelfed/pixelfed/commit/9a5a9f55)) - Update CuratedOnboarding, add new app:curated-onboarding command, extend email verification window to 7 days and fix resend verification mails ([49604210](https://github.com/pixelfed/pixelfed/commit/49604210)) - Update DirectMessageController, fix performance issue ([4ec9f99](https://github.com/pixelfed/pixelfed/commit/4ec9f99)) +- Update App Register to expire codes after 4 hours instead of 60 minutes ([0844094b](https://github.com/pixelfed/pixelfed/commit/0844094b)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev) diff --git a/app/Http/Controllers/AppRegisterController.php b/app/Http/Controllers/AppRegisterController.php index 824cec540..519b632d5 100644 --- a/app/Http/Controllers/AppRegisterController.php +++ b/app/Http/Controllers/AppRegisterController.php @@ -111,7 +111,7 @@ class AppRegisterController extends Controller $exists = AppRegister::whereEmail($email) ->whereVerifyCode($code) - ->where('created_at', '>', now()->subMinutes(60)) + ->where('created_at', '>', now()->subHours(4)) ->exists(); return response()->json([ @@ -219,7 +219,7 @@ class AppRegisterController extends Controller $exists = AppRegister::whereEmail($email) ->whereVerifyCode($code) - ->where('created_at', '>', now()->subMinutes(60)) + ->where('created_at', '>', now()->subHours(4)) ->exists(); if (! $exists) { diff --git a/resources/views/auth/iar-resend.blade.php b/resources/views/auth/iar-resend.blade.php index ea1ead33a..b486941d0 100644 --- a/resources/views/auth/iar-resend.blade.php +++ b/resources/views/auth/iar-resend.blade.php @@ -23,6 +23,7 @@ id="email" name="email" required + placeholder="Enter your email address here" autocomplete="email" @if(request()->filled('email')) value="{{rawurldecode(request()->input('email'))}}" diff --git a/resources/views/emails/iar/email_verify.blade.php b/resources/views/emails/iar/email_verify.blade.php index 1f1a784ec..9615e8a70 100644 --- a/resources/views/emails/iar/email_verify.blade.php +++ b/resources/views/emails/iar/email_verify.blade.php @@ -20,7 +20,7 @@

-This code will expire in 60 minutes. If you didn't request this verification, please ignore this email. +This code will expire in 4 hours. If you didn't request this verification, please ignore this email.

From e796476bd4e06593d8a2ab26409d1103c63669de Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Sun, 9 Mar 2025 19:08:48 +0100 Subject: [PATCH 2/2] fix collection counter label --- resources/assets/js/components/CollectionComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/CollectionComponent.vue b/resources/assets/js/components/CollectionComponent.vue index ea5e21525..a42466469 100644 --- a/resources/assets/js/components/CollectionComponent.vue +++ b/resources/assets/js/components/CollectionComponent.vue @@ -49,7 +49,7 @@ · - {{collection.post_count}} photos + {{collection.post_count}} posts · by {{profileUsername}}