Skip to content

fix(settings): do not send notification digest on 'Never' - #3575

Merged
nickvergessen merged 1 commit into
masterfrom
fix/noid/batch-unread
Nov 6, 2026
Merged

nickvergessen merged 1 commit into
masterfrom
fix/noid/batch-unread

Conversation

@Antreesy

@Antreesy Antreesy commented Nov 6, 2026

Copy link
Copy Markdown
Collaborator

Fix following case:

  • admin sets never, batch_time = 0
  • user doesn't touch the setting, batch_time = 5 -> default to user
  • lib/MailNotifications.php#sendEmails() sets $batch_time = 0
  • next_send_time is updated to previous value + 0, instead of 0 (never send)

🤖 AI (if applicable)

  • The content of this PR was partly or fully generated using AI (ClaudeCode:claude-opus-5-5)

Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 9653 was 9158 (+5.4%)
Please check your code again. If you added a new test this can be expected and the base value in tests/Integration/base-query-count.txt can be increased.

@nickvergessen
nickvergessen merged commit 5affd5c into master Nov 6, 2026
41 checks passed
@nickvergessen
nickvergessen deleted the fix/noid/batch-unread branch November 6, 2026 14:42
@nickvergessen

Copy link
Copy Markdown
Member

/backport to stable35

@nickvergessen

Copy link
Copy Markdown
Member

/backport to stable34

@nickvergessen

Copy link
Copy Markdown
Member

/backport to stable33

@backportbot

backportbot Bot commented Nov 6, 2026

Copy link
Copy Markdown

The backport to stable33 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable33
git pull origin stable33

# Create the new backport branch
git checkout -b backport/3575/stable33

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick f543cb7a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/3575/stable33

Error: Failed to check for changes with origin/stable33: No changes found in backport branch


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

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.

2 participants