feat: add governed Team Folder subfolders and recovery

appinfo/info.xml

@@ -47,6 +47,7 @@ Folder.
 	<background-jobs>
 		<job>OCA\GroupFolders\BackgroundJob\ExpireGroupVersions</job>
 		<job>OCA\GroupFolders\BackgroundJob\ExpireGroupTrash</job>
+		<job>OCA\GroupFolders\BackgroundJob\ExpireDeletedFolders</job>
 	</background-jobs>
 
 	<repair-steps>

lib/AppInfo/Application.php

@@ -25,11 +25,13 @@
 use OCA\GroupFolders\Command\ExpireGroup\ExpireGroupVersions;
 use OCA\GroupFolders\Command\ExpireGroup\ExpireGroupVersionsTrash;
 use OCA\GroupFolders\Folder\FolderManager;
+use OCA\GroupFolders\Folder\SubfolderQuotaManager;
 use OCA\GroupFolders\Listeners\CacheListener;
 use OCA\GroupFolders\Listeners\CircleDestroyedEventListener;
 use OCA\GroupFolders\Listeners\DeleteListener;
 use OCA\GroupFolders\Listeners\LoadAdditionalScriptsListener;
 use OCA\GroupFolders\Listeners\NodeRenamedListener;
+use OCA\GroupFolders\Listeners\SubfolderQuotaListener;
 use OCA\GroupFolders\Mount\FolderStorageManager;
 use OCA\GroupFolders\Mount\MountProvider;
 use OCA\GroupFolders\TeamSpace\TeamSpaceProvider;
@@ -47,6 +49,8 @@
 use OCP\Files\Cache\CacheEntryInsertedEvent;
 use OCP\Files\Cache\CacheEntryUpdatedEvent;
 use OCP\Files\Config\IMountProviderCollection;
+use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
+use OCP\Files\Events\Node\NodeDeletedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountManager;
@@ -89,6 +93,9 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(CircleDestroyedEvent::class, CircleDestroyedEventListener::class);
 		$context->registerTeamResourceProvider(TeamSpaceProvider::class);
 		$context->registerEventListener(NodeRenamedEvent::class, NodeRenamedListener::class);
+		$context->registerEventListener(BeforeNodeRenamedEvent::class, SubfolderQuotaListener::class);
+		$context->registerEventListener(NodeRenamedEvent::class, SubfolderQuotaListener::class);
+		$context->registerEventListener(NodeDeletedEvent::class, SubfolderQuotaListener::class);
 		$context->registerEventListener(CacheEntryInsertedEvent::class, CacheListener::class, 99999);
 		$context->registerEventListener(CacheEntryUpdatedEvent::class, CacheListener::class, 99999);
 		$context->registerEventListener(GroupDeletedEvent::class, DeleteListener::class);
@@ -108,6 +115,7 @@ public function register(IRegistrationContext $context): void {
 				$c->get(IMountProviderCollection::class),
 				$c->get(IDBConnection::class),
 				$c->get(FolderStorageManager::class),
+				$c->get(SubfolderQuotaManager::class),
 				$allowRootShare,
 				$enableEncryption
 			);

lib/BackgroundJob/ExpireDeletedFolders.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\GroupFolders\BackgroundJob;
+
+use OCA\GroupFolders\Folder\FolderManager;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Permanently removes Team folders whose recovery period has elapsed.
+ */
+class ExpireDeletedFolders extends TimedJob {
+	public function __construct(
+		private readonly ITimeFactory $timeFactory,
+		private readonly FolderManager $folderManager,
+		private readonly LoggerInterface $logger,
+	) {
+		parent::__construct($timeFactory);
+		$this->setInterval(24 * 60 * 60);
+		$this->setAllowParallelRuns(false);
+	}
+
+	#[\Override]
+	protected function run(mixed $argument): void {
+		$expiredBefore = $this->timeFactory->getTime() - FolderManager::DELETED_FOLDER_RETENTION_SECONDS;
+
+		foreach ($this->folderManager->getDeletedFoldersBefore($expiredBefore) as $deletedFolder) {
+			try {
+				$this->folderManager->purgeDeletedFolder($deletedFolder->folder->id);
+			} catch (\Throwable $exception) {
+				$this->logger->error('Could not permanently remove an expired Team folder from the recovery bin', [
+					'app' => 'groupfolders',
+					'folderId' => $deletedFolder->folder->id,
+					'exception' => $exception,
+				]);
+			}
+		}
+	}
+}

lib/Command/Delete.php

@@ -19,9 +19,10 @@ class Delete extends FolderCommand {
 	protected function configure(): void {
 		$this
 			->setName('groupfolders:delete')
-			->setDescription('Delete Team folder')
-			->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to rename')
-			->addOption('force', 'f', InputOption::VALUE_NONE, 'Skip confirmation');
+			->setDescription('Move Team folder to the recovery bin')
+			->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to delete')
+			->addOption('force', 'f', InputOption::VALUE_NONE, 'Skip confirmation')
+			->addOption('permanent', 'p', InputOption::VALUE_NONE, 'Permanently delete the Team folder and all files');
 		parent::configure();
 	}
 
@@ -38,10 +39,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
-		$question = new ConfirmationQuestion('Are you sure you want to delete the Team folder ' . $folder->mountPoint . ' and all files within, this cannot be undone (y/N).', false);
+		$permanent = (bool)$input->getOption('permanent');
+		$question = new ConfirmationQuestion(
+			$permanent
+				? 'Are you sure you want to permanently delete the Team folder ' . $folder->mountPoint . ' and all files within, this cannot be undone (y/N).'
+				: 'Move the Team folder ' . $folder->mountPoint . ' to the recovery bin? It can be restored for 30 days (y/N).',
+			false,
+		);
 		if ($input->getOption('force') || $helper->ask($input, $output, $question)) {
-			$this->folderStorageManager->deleteStoragesForFolder($folder);
-			$this->folderManager->removeFolder($folder->id);
+			$this->folderManager->archiveFolder($folder->id, null);
+			if ($permanent) {
+				$this->folderManager->purgeDeletedFolder($folder->id);
+			}
 		}
 
 		return 0;

lib/Command/Quota.php

@@ -38,7 +38,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$quotaString = strtolower($quotaString);
 		$quota = ($quotaString === 'unlimited') ? FileInfo::SPACE_UNLIMITED : \OCP\Util::computerFileSize($quotaString);
 		if ($quota) {
-			$this->folderManager->setFolderQuota($folder->id, (int)$quota);
+			try {
+				$this->folderManager->setFolderQuota($folder->id, (int)$quota);
+			} catch (\InvalidArgumentException $exception) {
+				$output->writeln('<error>' . $exception->getMessage() . '</error>');
+				return -1;
+			}
 			return 0;
 		}