Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Move spam to mailbox associated to the \Junk special-use attribute #3925

Merged
merged 5 commits into from Mar 6, 2024
Merged

fix: Move spam to mailbox associated to the \Junk special-use attribute #3925

merged 5 commits into from Mar 6, 2024

Conversation

UltraCoderRU
Copy link
Contributor

@UltraCoderRU UltraCoderRU commented Mar 4, 2024 •
edited

If MOVE_SPAM_TO_JUNK=1, spam messages now will be moved to one mailbox with \Junk special-use attribute. If there is no such mailbox, messages will be moved to 'Junk' mailbox, as earlier.
This change simplifies configuration in case Junk mailbox needs to be renamed.

Fixes #3918

Type of change

  • Improvement (non-breaking change that does improve existing functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (README.md or the documentation under docs/)
  • If necessary, I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have added information about changes made in this PR to CHANGELOG.md

polarathene
polarathene requested changes Mar 5, 2024
View reviewed changes
Copy link
Member

@polarathene polarathene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing the improvement 😁

Looks pretty good, I've provided suggestions where I could for revising the documentation for both users and maintainers as this feature may benefit from the added clarity/references.

CHANGELOG.md Outdated Show resolved Hide resolved
docs/content/config/environment.md Outdated Show resolved Hide resolved
docs/content/config/environment.md Outdated Show resolved Hide resolved
docs/content/config/environment.md Outdated Show resolved Hide resolved
target/scripts/startup/setup.d/security/misc.sh Show resolved Hide resolved
test/tests/parallel/set1/spam_virus/spam_junk_folder.bats Outdated Show resolved Hide resolved
test/tests/parallel/set1/spam_virus/spam_junk_folder.bats Outdated Show resolved Hide resolved
test/tests/parallel/set1/spam_virus/spam_junk_folder.bats Outdated Show resolved Hide resolved
@polarathene polarathene added service/dovecot area/features kind/improvement Improve an existing feature, configuration file or the documentation area/documentation labels Mar 5, 2024
@polarathene polarathene added this to the v14.0.0 milestone Mar 5, 2024
@polarathene polarathene changed the title Move spam messages to folder with \Junk special-use attribute (#3918) fix: Move spam to mailbox associated to the \Junk special-use attribute (#3918) Mar 5, 2024
@georglauterbach
Copy link
Member

georglauterbach commented Mar 5, 2024 •
edited

I've restarted the CI so we can see whether the failure was related to this PR, which I doubt. Sometimes, our CI is not 100% accurate, i.e., it is a bit "flaky".

UPDATE: And, indeed, it was not an actual issue.

@georglauterbach georglauterbach self-requested a review March 5, 2024 09:55
UltraCoderRU and others added 3 commits March 5, 2024 15:46
@UltraCoderRU
Move spam messages to folder with \Junk special-use attribute (docker…
4be3948 
…-mailserver#3918)
@UltraCoderRU @polarathene
Apply suggestions from code review
51823d3 
Co-authored-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
@UltraCoderRU @polarathene
Fix tests (apply suggestions from code review)
47f87f9 
Co-authored-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
polarathene
polarathene previously approved these changes Mar 5, 2024
View reviewed changes
Copy link
Member

@polarathene polarathene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

If you'd like to add that revision you suggested that's ok, I'll hold off merging until I hear back from you about that.

No need to rewrite commit history cleanly if that's a hassle, we squash merge PRs so commit history is only relevant to PR context 👍

@UltraCoderRU
Copy link
Contributor Author

If you'd like to add that revision you suggested that's ok, I'll hold off merging until I hear back from you about that.

Done.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 6, 2024

Documentation preview for this PR is ready! 🎉

Built with commit: 97224b5

@polarathene polarathene merged commit 3649699 into docker-mailserver:master Mar 6, 2024
9 checks passed
@polarathene polarathene changed the title fix: Move spam to mailbox associated to the \Junk special-use attribute (#3918) fix: Move spam to mailbox associated to the \Junk special-use attribute Mar 6, 2024
@polarathene polarathene mentioned this pull request Mar 23, 2024
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@polarathene polarathene polarathene approved these changes

@georglauterbach georglauterbach Awaiting requested review from georglauterbach

Assignees

@UltraCoderRU UltraCoderRU

Labels
area/documentation area/features kind/improvement Improve an existing feature, configuration file or the documentation service/dovecot
Projects
None yet
Milestone
v14.0.0
Development

Successfully merging this pull request may close these issues.

feature request: Move spam to mailbox associated to the \Junk special-use attribute
3 participants
@UltraCoderRU @georglauterbach @polarathene