refactor: Commands and background jobs for the trashbin #54876
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
CarlSchwan
added
2. developing
- Use modern node and SetupManager API - Avoid passing the user by id and instead use IUser Signed-off-by: Carl Schwan <[email protected]>
CarlSchwan
force-pushed
the
carl/cleanup-commands-trash
branch
from
bf64f65 to
63de669
Compare
CarlSchwan
requested review from
Altahrim and
sorbaugh
and removed request for
a team
AndyScherzinger
approved these changes
Sep 14, 2025
come-nc
reviewed
Sep 15, 2025
| private LoggerInterface $logger, | ||
| private ?IUserManager $userManager = null, | ||
| private ?Expiration $expiration = null, | ||
| readonly private LoggerInterface $logger, |
Contributor
There was a problem hiding this comment.
Suggested change
| readonly private LoggerInterface $logger, | |
| private readonly LoggerInterface $logger, |
Same for the others
| /** @var Folder $folder */ | ||
| $folder = $this->rootFolder->getUserFolder($user->getUID())->getParent()->get('files_trashbin'); | ||
| return $folder; | ||
| } catch (NotFoundException|NotPermittedException) { |
Contributor
There was a problem hiding this comment.
Should it be caught? If you let it bubble up it will get logged. But I’m not sure whether it should get logged. NotFound would just mean the user trashbin was not used yes.
NotPermitted maybe we should log.
artonge
reviewed
Oct 16, 2025
| } elseif (!empty($users)) { | ||
| foreach ($users as $user) { | ||
| if ($this->userManager->userExists($user)) { | ||
| $userObject = $this->userManager->get($user); |
Contributor
There was a problem hiding this comment.
I would rather rename $users and $user to $userIds and $userId as it would be even less confusing. But that's a nitpick.
Contributor
There was a problem hiding this comment.
Use strong type in the constructor?
Comment on lines
+52
to
+53
| $setupManager = Server::get(SetupManager::class); | ||
| $rootFolder = Server::get(IRootFolder::class); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Originally tried to optimize a bit the number of query but the new code is doing exactly as many DB request as before :( Still a nice cleanup
Checklist