Skip to content

[stable32] fix(MailQueueHandler): check enable_email toggle before sending queued emails#2610

Merged
miaulalala merged 2 commits into
stable32from
backport/2563/stable32
May 20, 2026
Merged

[stable32] fix(MailQueueHandler): check enable_email toggle before sending queued emails#2610
miaulalala merged 2 commits into
stable32from
backport/2563/stable32

Conversation

@backportbot
Copy link
Copy Markdown

@backportbot backportbot Bot commented May 20, 2026

Backport of #2563

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

…d emails

fix(MailQueueHandler): check enable_email toggle before sending queued emails

The admin Enable notification emails toggle was only checked when queuing

new emails. The sendEmails() background job had no knowledge of it and

would send all queued entries regardless.

Adds an early-return guard using IAppConfig::getValueString() at the top

of sendEmails(), consistent with the checks in UserSettings. The queue is

left intact so pending notifications can be delivered if the admin

re-enables emails.

AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Signed-off-by: Anna Larch <anna@nextcloud.com>

[skip ci]
…andlerTest

AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala miaulalala marked this pull request as ready for review May 20, 2026 10:32
@cypress
Copy link
Copy Markdown

cypress Bot commented May 20, 2026

Activity    Run #3808

Run Properties:  status check failed Failed #3808  •  git commit d4c7b59438: [stable32] fix(MailQueueHandler): check enable_email toggle before sending queue...
Project Activity
Branch Review backport/2563/stable32
Run status status check failed Failed #3808
Run duration 03m 09s
Commit git commit d4c7b59438: [stable32] fix(MailQueueHandler): check enable_email toggle before sending queue...
Committer backportbot[bot]
View all properties for this run ↗︎

Test results
Tests that failed  Failures 2
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 1
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 7
View all changes introduced in this branch ↗︎

Tests for review

Failed  cypress/e2e/sidebar.cy.ts • 2 failed tests • Run E2E

View Output

Test Artifacts
Check activity listing in the sidebar > Has favorite activity Test Replay Screenshots
Check activity listing in the sidebar > Has share activity Test Replay Screenshots

@miaulalala miaulalala merged commit 6498312 into stable32 May 20, 2026
53 of 55 checks passed
@miaulalala miaulalala deleted the backport/2563/stable32 branch May 20, 2026 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant