Skip to content

[stable31] feat: allow filtering sharing:delete-orphan-shares by share owner or target #54710

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

Merged
merged 1 commit into from
Aug 28, 2025
Merged

[stable31] feat: allow filtering sharing:delete-orphan-shares by share owner or target #54710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions apps/files_sharing/lib/Command/DeleteOrphanShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ protected function configure(): void {
'f',
InputOption::VALUE_NONE,
'delete the shares without asking'
);
)
->addOption('owner', null, InputOption::VALUE_REQUIRED, 'Only check shares owned by a specific user')
->addOption('with', null, InputOption::VALUE_REQUIRED, 'Only check shares with a specific user');
}

public function execute(InputInterface $input, OutputInterface $output): int {
$force = $input->getOption('force');
$shares = $this->orphanHelper->getAllShares();
$owner = $input->getOption('owner') ?: null;
$with = $input->getOption('with') ?: null;
$shares = $this->orphanHelper->getAllShares($owner, $with);

$orphans = [];
foreach ($shares as $share) {
Expand Down
10 changes: 9 additions & 1 deletion apps/files_sharing/lib/OrphanHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,19 @@ public function fileExists(int $fileId): bool {
/**
* @return \Traversable<int, array{id: int, owner: string, fileid: int, target: string}>
*/
public function getAllShares() {
public function getAllShares(?string $owner = null, ?string $with = null) {
$query = $this->connection->getQueryBuilder();
$query->select('id', 'file_source', 'uid_owner', 'file_target')
->from('share')
->where($query->expr()->in('item_type', $query->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));

if ($owner !== null) {
$query->andWhere($query->expr()->eq('uid_owner', $query->createNamedParameter($owner)));
}
if ($with !== null) {
$query->andWhere($query->expr()->eq('share_with', $query->createNamedParameter($with)));
}

$result = $query->executeQuery();
while ($row = $result->fetch()) {
yield [
Expand Down
Loading