Desktop, Mobile: Do no re-use the 'Restored Notes' folder if it is trashed #13813
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
laurent22
reviewed
Nov 30, 2025
packages/lib/models/Folder.ts
Outdated
Comment on lines
1103
to
1105
| public static loadByTitleExcludingTrashed(title: string) { | ||
| return this.modelSelectOne('SELECT * FROM folders WHERE title = ? AND deleted_time = 0', [title]); | ||
| } |
Owner
There was a problem hiding this comment.
There is a more generic "loadByField" method with includeDeleted and includeConflicts options - could it be used instead?
Contributor
Author
There was a problem hiding this comment.
Yep that works. Done
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While implementing a conditionally created / reused 'Imported Notes' folder in PR #13742 I found that the 'Restored Notes' folder which I based it on would be reused if a folder with that name exists and is trashed. In this scenario it would better to create a new 'Restored Notes' to avoid confusion to the user, and this PR implements this behaviour.
Testing