nextcloud / server

apps/dav/lib/Settings/CalDAVSettings.php

Indentation +50 added lines, -50 removed lines

@@ -17,62 +17,62 @@
 
 class CalDAVSettings implements IDelegatedSettings {
 
-	private const defaults = [
-		'sendInvitations' => 'yes',
-		'generateBirthdayCalendar' => 'yes',
-		'sendEventReminders' => 'yes',
-		'sendEventRemindersToSharedUsers' => 'yes',
-		'sendEventRemindersPush' => 'yes',
-	];
+    private const defaults = [
+        'sendInvitations' => 'yes',
+        'generateBirthdayCalendar' => 'yes',
+        'sendEventReminders' => 'yes',
+        'sendEventRemindersToSharedUsers' => 'yes',
+        'sendEventRemindersPush' => 'yes',
+    ];
 
-	/**
-	 * CalDAVSettings constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IInitialState $initialState
-	 */
-	public function __construct(
-		private IConfig $config,
-		private IInitialState $initialState,
-		private IURLGenerator $urlGenerator,
-		private IAppManager $appManager,
-	) {
-	}
+    /**
+     * CalDAVSettings constructor.
+     *
+     * @param IConfig $config
+     * @param IInitialState $initialState
+     */
+    public function __construct(
+        private IConfig $config,
+        private IInitialState $initialState,
+        private IURLGenerator $urlGenerator,
+        private IAppManager $appManager,
+    ) {
+    }
 
-	public function getForm(): TemplateResponse {
-		$this->initialState->provideInitialState('userSyncCalendarsDocUrl', $this->urlGenerator->linkToDocs('user-sync-calendars'));
-		foreach (self::defaults as $key => $default) {
-			$value = $this->config->getAppValue(Application::APP_ID, $key, $default);
-			$this->initialState->provideInitialState($key, $value === 'yes');
-		}
+    public function getForm(): TemplateResponse {
+        $this->initialState->provideInitialState('userSyncCalendarsDocUrl', $this->urlGenerator->linkToDocs('user-sync-calendars'));
+        foreach (self::defaults as $key => $default) {
+            $value = $this->config->getAppValue(Application::APP_ID, $key, $default);
+            $this->initialState->provideInitialState($key, $value === 'yes');
+        }
 
-		Util::addScript(Application::APP_ID, 'settings-admin-caldav');
-		Util::addStyle(Application::APP_ID, 'settings-admin-caldav');
-		return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
-	}
+        Util::addScript(Application::APP_ID, 'settings-admin-caldav');
+        Util::addStyle(Application::APP_ID, 'settings-admin-caldav');
+        return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
+    }
 
-	public function getSection(): ?string {
-		if (!$this->appManager->isBackendRequired(IAppManager::BACKEND_CALDAV)) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->appManager->isBackendRequired(IAppManager::BACKEND_CALDAV)) {
+            return null;
+        }
 
-		return 'groupware';
-	}
+        return 'groupware';
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return 10;
+    }
 
-	public function getName(): ?string {
-		return null; // Only setting in this section
-	}
+    public function getName(): ?string {
+        return null; // Only setting in this section
+    }
 
-	public function getAuthorizedAppConfig(): array {
-		return [
-			'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
-		];
-	}
+    public function getAuthorizedAppConfig(): array {
+        return [
+            'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
+        ];
+    }
 }

apps/dav/lib/Settings/ExampleContentSettings.php

Indentation +45 added lines, -45 removed lines

@@ -19,56 +19,56 @@
 use OCP\Util;
 
 class ExampleContentSettings implements ISettings {
-	public function __construct(
-		private readonly IAppConfig $appConfig,
-		private readonly IInitialState $initialState,
-		private readonly IAppManager $appManager,
-		private readonly ExampleEventService $exampleEventService,
-		private readonly ExampleContactService $exampleContactService,
-	) {
-	}
+    public function __construct(
+        private readonly IAppConfig $appConfig,
+        private readonly IInitialState $initialState,
+        private readonly IAppManager $appManager,
+        private readonly ExampleEventService $exampleEventService,
+        private readonly ExampleContactService $exampleContactService,
+    ) {
+    }
 
-	public function getForm(): TemplateResponse {
-		$calendarEnabled = $this->appManager->isEnabledForUser('calendar');
-		$contactsEnabled = $this->appManager->isEnabledForUser('contacts');
-		$this->initialState->provideInitialState('calendarEnabled', $calendarEnabled);
-		$this->initialState->provideInitialState('contactsEnabled', $contactsEnabled);
+    public function getForm(): TemplateResponse {
+        $calendarEnabled = $this->appManager->isEnabledForUser('calendar');
+        $contactsEnabled = $this->appManager->isEnabledForUser('contacts');
+        $this->initialState->provideInitialState('calendarEnabled', $calendarEnabled);
+        $this->initialState->provideInitialState('contactsEnabled', $contactsEnabled);
 
-		if ($calendarEnabled) {
-			$enableDefaultEvent = $this->exampleEventService->shouldCreateExampleEvent();
-			$this->initialState->provideInitialState('create_example_event', $enableDefaultEvent);
-			$this->initialState->provideInitialState(
-				'has_custom_example_event',
-				$this->exampleEventService->hasCustomExampleEvent(),
-			);
-		}
+        if ($calendarEnabled) {
+            $enableDefaultEvent = $this->exampleEventService->shouldCreateExampleEvent();
+            $this->initialState->provideInitialState('create_example_event', $enableDefaultEvent);
+            $this->initialState->provideInitialState(
+                'has_custom_example_event',
+                $this->exampleEventService->hasCustomExampleEvent(),
+            );
+        }
 
-		if ($contactsEnabled) {
-			$this->initialState->provideInitialState(
-				'enableDefaultContact',
-				$this->exampleContactService->isDefaultContactEnabled(),
-			);
-			$this->initialState->provideInitialState(
-				'hasCustomDefaultContact',
-				$this->appConfig->getAppValueBool('hasCustomDefaultContact'),
-			);
-		}
+        if ($contactsEnabled) {
+            $this->initialState->provideInitialState(
+                'enableDefaultContact',
+                $this->exampleContactService->isDefaultContactEnabled(),
+            );
+            $this->initialState->provideInitialState(
+                'hasCustomDefaultContact',
+                $this->appConfig->getAppValueBool('hasCustomDefaultContact'),
+            );
+        }
 
-		Util::addStyle(Application::APP_ID, 'settings-admin-example-content');
-		Util::addScript(Application::APP_ID, 'settings-admin-example-content');
-		return new TemplateResponse(Application::APP_ID, 'settings-admin-example-content');
-	}
+        Util::addStyle(Application::APP_ID, 'settings-admin-example-content');
+        Util::addScript(Application::APP_ID, 'settings-admin-example-content');
+        return new TemplateResponse(Application::APP_ID, 'settings-admin-example-content');
+    }
 
-	public function getSection(): ?string {
-		if (!$this->appManager->isEnabledForUser('contacts')
-				&& !$this->appManager->isEnabledForUser('calendar')) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->appManager->isEnabledForUser('contacts')
+                && !$this->appManager->isEnabledForUser('calendar')) {
+            return null;
+        }
 
-		return 'groupware';
-	}
+        return 'groupware';
+    }
 
-	public function getPriority(): int {
-		return 10;
-	}
+    public function getPriority(): int {
+        return 10;
+    }
 }

apps/dav/lib/Migration/RefreshWebcalJobRegistrar.php

Indentation +43 added lines, -43 removed lines

@@ -16,47 +16,47 @@
 
 class RefreshWebcalJobRegistrar implements IRepairStep {
 
-	/**
-	 * FixBirthdayCalendarComponent constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IJobList $jobList
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		private IJobList $jobList,
-	) {
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Registering background jobs to update cache for webcal calendars';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['principaluri', 'uri'])
-			->from('calendarsubscriptions');
-		$stmt = $query->executeQuery();
-
-		$count = 0;
-		while ($row = $stmt->fetchAssociative()) {
-			$args = [
-				'principaluri' => $row['principaluri'],
-				'uri' => $row['uri'],
-			];
-
-			if (!$this->jobList->has(RefreshWebcalJob::class, $args)) {
-				$this->jobList->add(RefreshWebcalJob::class, $args);
-				$count++;
-			}
-		}
-
-		$output->info("Added $count background jobs to update webcal calendars");
-	}
+    /**
+     * FixBirthdayCalendarComponent constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IJobList $jobList
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        private IJobList $jobList,
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Registering background jobs to update cache for webcal calendars';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['principaluri', 'uri'])
+            ->from('calendarsubscriptions');
+        $stmt = $query->executeQuery();
+
+        $count = 0;
+        while ($row = $stmt->fetchAssociative()) {
+            $args = [
+                'principaluri' => $row['principaluri'],
+                'uri' => $row['uri'],
+            ];
+
+            if (!$this->jobList->has(RefreshWebcalJob::class, $args)) {
+                $this->jobList->add(RefreshWebcalJob::class, $args);
+                $count++;
+            }
+        }
+
+        $output->info("Added $count background jobs to update webcal calendars");
+    }
 }

apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php

Indentation +54 added lines, -54 removed lines

@@ -16,67 +16,67 @@
 use Psr\Log\LoggerInterface;
 
 class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
-	public function __construct(
-		private IDBConnection $db,
-		private CalDavBackend $calDavBackend,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IDBConnection $db,
+        private CalDavBackend $calDavBackend,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	public function run($argument) {
-		$offset = (int)$argument['offset'];
-		$stopAt = (int)$argument['stopAt'];
+    public function run($argument) {
+        $offset = (int)$argument['offset'];
+        $stopAt = (int)$argument['stopAt'];
 
-		$this->logger->info('Building calendar index (' . $offset . '/' . $stopAt . ')');
+        $this->logger->info('Building calendar index (' . $offset . '/' . $stopAt . ')');
 
-		$startTime = $this->time->getTime();
-		while (($this->time->getTime() - $startTime) < 15) {
-			$offset = $this->buildIndex($offset, $stopAt);
-			if ($offset >= $stopAt) {
-				break;
-			}
-		}
+        $startTime = $this->time->getTime();
+        while (($this->time->getTime() - $startTime) < 15) {
+            $offset = $this->buildIndex($offset, $stopAt);
+            if ($offset >= $stopAt) {
+                break;
+            }
+        }
 
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
-		}
-	}
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+        }
+    }
 
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex(int $offset, int $stopAt): int {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'calendarid', 'uri', 'calendardata'])
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC')
-			->setMaxResults(500);
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex(int $offset, int $stopAt): int {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'calendarid', 'uri', 'calendardata'])
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC')
+            ->setMaxResults(500);
 
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$offset = $row['id'];
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $offset = $row['id'];
 
-			$calendarData = $row['calendardata'];
-			if (is_resource($calendarData)) {
-				$calendarData = stream_get_contents($calendarData);
-			}
+            $calendarData = $row['calendardata'];
+            if (is_resource($calendarData)) {
+                $calendarData = stream_get_contents($calendarData);
+            }
 
-			$this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
-		}
+            $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
+        }
 
-		return $offset;
-	}
+        return $offset;
+    }
 }

apps/dav/lib/Migration/Version1025Date20240308063933.php

Indentation +67 added lines, -67 removed lines

@@ -20,72 +20,72 @@
 
 class Version1025Date20240308063933 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IAppConfig $appConfig,
-		private IDBConnection $db,
-	) {
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure(): ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		foreach (['addressbookchanges', 'calendarchanges'] as $tableName) {
-			$table = $schema->getTable($tableName);
-			if (!$table->hasColumn('created_at')) {
-				$table->addColumn('created_at', Types::INTEGER, [
-					'notnull' => true,
-					'length' => 4,
-					'default' => 0,
-				]);
-			}
-		}
-
-		return $schema;
-	}
-
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void {
-		// The threshold is higher than the default of \OCA\DAV\BackgroundJob\PruneOutdatedSyncTokensJob
-		// but small enough to fit into a cluster transaction size.
-		// For a 50k users instance that would still keep 10 changes on average.
-		$limit = max(1, (int)$this->appConfig->getAppValue('totalNumberOfSyncTokensToKeep', '500000'));
-
-		foreach (['addressbookchanges', 'calendarchanges'] as $tableName) {
-			$thresholdSelect = $this->db->getQueryBuilder();
-			$thresholdSelect->select('id')
-				->from($tableName)
-				->orderBy('id', 'desc')
-				->setFirstResult($limit)
-				->setMaxResults(1);
-			$oldestIdResult = $thresholdSelect->executeQuery();
-			$oldestId = $oldestIdResult->fetchOne();
-			$oldestIdResult->closeCursor();
-
-			$qb = $this->db->getQueryBuilder();
-
-			$update = $qb->update($tableName)
-				->set('created_at', $qb->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
-				->where(
-					$qb->expr()->eq('created_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)),
-				);
-
-			// If there is a lot of data we only set timestamp for the most recent rows
-			// because the rest will be deleted by \OCA\DAV\BackgroundJob\PruneOutdatedSyncTokensJob
-			// anyway.
-			if ($oldestId !== false) {
-				$update->andWhere($qb->expr()->gt('id', $qb->createNamedParameter($oldestId, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
-			}
-
-			$updated = $update->executeStatement();
-
-			$output->debug('Added a default creation timestamp to ' . $updated . ' rows in ' . $tableName);
-		}
-	}
+    public function __construct(
+        private IAppConfig $appConfig,
+        private IDBConnection $db,
+    ) {
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure(): ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        foreach (['addressbookchanges', 'calendarchanges'] as $tableName) {
+            $table = $schema->getTable($tableName);
+            if (!$table->hasColumn('created_at')) {
+                $table->addColumn('created_at', Types::INTEGER, [
+                    'notnull' => true,
+                    'length' => 4,
+                    'default' => 0,
+                ]);
+            }
+        }
+
+        return $schema;
+    }
+
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void {
+        // The threshold is higher than the default of \OCA\DAV\BackgroundJob\PruneOutdatedSyncTokensJob
+        // but small enough to fit into a cluster transaction size.
+        // For a 50k users instance that would still keep 10 changes on average.
+        $limit = max(1, (int)$this->appConfig->getAppValue('totalNumberOfSyncTokensToKeep', '500000'));
+
+        foreach (['addressbookchanges', 'calendarchanges'] as $tableName) {
+            $thresholdSelect = $this->db->getQueryBuilder();
+            $thresholdSelect->select('id')
+                ->from($tableName)
+                ->orderBy('id', 'desc')
+                ->setFirstResult($limit)
+                ->setMaxResults(1);
+            $oldestIdResult = $thresholdSelect->executeQuery();
+            $oldestId = $oldestIdResult->fetchOne();
+            $oldestIdResult->closeCursor();
+
+            $qb = $this->db->getQueryBuilder();
+
+            $update = $qb->update($tableName)
+                ->set('created_at', $qb->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
+                ->where(
+                    $qb->expr()->eq('created_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)),
+                );
+
+            // If there is a lot of data we only set timestamp for the most recent rows
+            // because the rest will be deleted by \OCA\DAV\BackgroundJob\PruneOutdatedSyncTokensJob
+            // anyway.
+            if ($oldestId !== false) {
+                $update->andWhere($qb->expr()->gt('id', $qb->createNamedParameter($oldestId, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
+            }
+
+            $updated = $update->executeStatement();
+
+            $output->debug('Added a default creation timestamp to ' . $updated . ' rows in ' . $tableName);
+        }
+    }
 
 }

apps/dav/lib/Migration/RemoveClassifiedEventActivity.php

Indentation +98 added lines, -98 removed lines

@@ -15,102 +15,102 @@
 
 class RemoveClassifiedEventActivity implements IRepairStep {
 
-	public function __construct(
-		private IDBConnection $connection,
-	) {
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Remove activity entries of private events';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		if (!$this->connection->tableExists('activity')) {
-			return;
-		}
-
-		$deletedEvents = $this->removePrivateEventActivity();
-		$deletedEvents += $this->removeConfidentialUncensoredEventActivity();
-
-		$output->info("Removed $deletedEvents activity entries");
-	}
-
-	protected function removePrivateEventActivity(): int {
-		$deletedEvents = 0;
-
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('activity')
-			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
-			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
-			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
-			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
-			->from('calendarobjects', 'o')
-			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
-			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
-		$result = $query->executeQuery();
-
-		while ($row = $result->fetchAssociative()) {
-			if ($row['principaluri'] === null) {
-				continue;
-			}
-
-			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
-				->setParameter('type', 'calendar')
-				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
-			$deletedEvents += $delete->executeStatement();
-		}
-		$result->closeCursor();
-
-		return $deletedEvents;
-	}
-
-	protected function removeConfidentialUncensoredEventActivity(): int {
-		$deletedEvents = 0;
-
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('activity')
-			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
-			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
-			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
-			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
-			->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
-			->from('calendarobjects', 'o')
-			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
-			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
-		$result = $query->executeQuery();
-
-		while ($row = $result->fetchAssociative()) {
-			if ($row['principaluri'] === null) {
-				continue;
-			}
-
-			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
-				->setParameter('type', 'calendar')
-				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
-				->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
-			$deletedEvents += $delete->executeStatement();
-		}
-		$result->closeCursor();
-
-		return $deletedEvents;
-	}
-
-	protected function getPrincipal(string $principalUri): string {
-		$uri = explode('/', $principalUri);
-		return array_pop($uri);
-	}
+    public function __construct(
+        private IDBConnection $connection,
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Remove activity entries of private events';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        if (!$this->connection->tableExists('activity')) {
+            return;
+        }
+
+        $deletedEvents = $this->removePrivateEventActivity();
+        $deletedEvents += $this->removeConfidentialUncensoredEventActivity();
+
+        $output->info("Removed $deletedEvents activity entries");
+    }
+
+    protected function removePrivateEventActivity(): int {
+        $deletedEvents = 0;
+
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('activity')
+            ->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+            ->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+            ->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+            ->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('c.principaluri', 'o.calendarid', 'o.uid')
+            ->from('calendarobjects', 'o')
+            ->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+            ->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
+        $result = $query->executeQuery();
+
+        while ($row = $result->fetchAssociative()) {
+            if ($row['principaluri'] === null) {
+                continue;
+            }
+
+            $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+                ->setParameter('type', 'calendar')
+                ->setParameter('calendar_id', $row['calendarid'])
+                ->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
+            $deletedEvents += $delete->executeStatement();
+        }
+        $result->closeCursor();
+
+        return $deletedEvents;
+    }
+
+    protected function removeConfidentialUncensoredEventActivity(): int {
+        $deletedEvents = 0;
+
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('activity')
+            ->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+            ->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+            ->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+            ->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
+            ->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('c.principaluri', 'o.calendarid', 'o.uid')
+            ->from('calendarobjects', 'o')
+            ->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+            ->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
+        $result = $query->executeQuery();
+
+        while ($row = $result->fetchAssociative()) {
+            if ($row['principaluri'] === null) {
+                continue;
+            }
+
+            $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+                ->setParameter('type', 'calendar')
+                ->setParameter('calendar_id', $row['calendarid'])
+                ->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
+                ->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
+            $deletedEvents += $delete->executeStatement();
+        }
+        $result->closeCursor();
+
+        return $deletedEvents;
+    }
+
+    protected function getPrincipal(string $principalUri): string {
+        $uri = explode('/', $principalUri);
+        return array_pop($uri);
+    }
 }

apps/dav/lib/Migration/RemoveDeletedUsersCalendarSubscriptions.php

Indentation +105 added lines, -105 removed lines

@@ -15,109 +15,109 @@
 use OCP\Migration\IRepairStep;
 
 class RemoveDeletedUsersCalendarSubscriptions implements IRepairStep {
-	/** @var int */
-	private $progress = 0;
-
-	/** @var int[] */
-	private $orphanSubscriptionIds = [];
-
-	private const SUBSCRIPTIONS_CHUNK_SIZE = 1000;
-
-	public function __construct(
-		private IDBConnection $connection,
-		private IUserManager $userManager,
-	) {
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName(): string {
-		return 'Clean up old calendar subscriptions from deleted users that were not cleaned-up';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$nbSubscriptions = $this->countSubscriptions();
-
-		$output->startProgress($nbSubscriptions);
-
-		while ($this->progress < $nbSubscriptions) {
-			$this->checkSubscriptions();
-
-			$this->progress += self::SUBSCRIPTIONS_CHUNK_SIZE;
-			$output->advance(min(self::SUBSCRIPTIONS_CHUNK_SIZE, $nbSubscriptions));
-		}
-		$output->finishProgress();
-		$this->deleteOrphanSubscriptions();
-
-		$output->info(sprintf('%d calendar subscriptions without an user have been cleaned up', count($this->orphanSubscriptionIds)));
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	private function countSubscriptions(): int {
-		$qb = $this->connection->getQueryBuilder();
-		$query = $qb->select($qb->func()->count('*'))
-			->from('calendarsubscriptions');
-
-		$result = $query->executeQuery();
-		$count = $result->fetchOne();
-		$result->closeCursor();
-
-		if ($count !== false) {
-			$count = (int)$count;
-		} else {
-			$count = 0;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	private function checkSubscriptions(): void {
-		$qb = $this->connection->getQueryBuilder();
-		$query = $qb->selectDistinct(['id', 'principaluri'])
-			->from('calendarsubscriptions')
-			->setMaxResults(self::SUBSCRIPTIONS_CHUNK_SIZE)
-			->setFirstResult($this->progress);
-
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$username = $this->getPrincipal($row['principaluri']);
-			if (!$this->userManager->userExists($username)) {
-				$this->orphanSubscriptionIds[] = (int)$row['id'];
-			}
-		}
-		$result->closeCursor();
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	private function deleteOrphanSubscriptions(): void {
-		foreach ($this->orphanSubscriptionIds as $orphanSubscriptionID) {
-			$this->deleteOrphanSubscription($orphanSubscriptionID);
-		}
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	private function deleteOrphanSubscription(int $orphanSubscriptionID): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('calendarsubscriptions')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($orphanSubscriptionID)))
-			->executeStatement();
-	}
-
-	private function getPrincipal(string $principalUri): string {
-		$uri = explode('/', $principalUri);
-		return array_pop($uri);
-	}
+    /** @var int */
+    private $progress = 0;
+
+    /** @var int[] */
+    private $orphanSubscriptionIds = [];
+
+    private const SUBSCRIPTIONS_CHUNK_SIZE = 1000;
+
+    public function __construct(
+        private IDBConnection $connection,
+        private IUserManager $userManager,
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string {
+        return 'Clean up old calendar subscriptions from deleted users that were not cleaned-up';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $nbSubscriptions = $this->countSubscriptions();
+
+        $output->startProgress($nbSubscriptions);
+
+        while ($this->progress < $nbSubscriptions) {
+            $this->checkSubscriptions();
+
+            $this->progress += self::SUBSCRIPTIONS_CHUNK_SIZE;
+            $output->advance(min(self::SUBSCRIPTIONS_CHUNK_SIZE, $nbSubscriptions));
+        }
+        $output->finishProgress();
+        $this->deleteOrphanSubscriptions();
+
+        $output->info(sprintf('%d calendar subscriptions without an user have been cleaned up', count($this->orphanSubscriptionIds)));
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function countSubscriptions(): int {
+        $qb = $this->connection->getQueryBuilder();
+        $query = $qb->select($qb->func()->count('*'))
+            ->from('calendarsubscriptions');
+
+        $result = $query->executeQuery();
+        $count = $result->fetchOne();
+        $result->closeCursor();
+
+        if ($count !== false) {
+            $count = (int)$count;
+        } else {
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function checkSubscriptions(): void {
+        $qb = $this->connection->getQueryBuilder();
+        $query = $qb->selectDistinct(['id', 'principaluri'])
+            ->from('calendarsubscriptions')
+            ->setMaxResults(self::SUBSCRIPTIONS_CHUNK_SIZE)
+            ->setFirstResult($this->progress);
+
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $username = $this->getPrincipal($row['principaluri']);
+            if (!$this->userManager->userExists($username)) {
+                $this->orphanSubscriptionIds[] = (int)$row['id'];
+            }
+        }
+        $result->closeCursor();
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function deleteOrphanSubscriptions(): void {
+        foreach ($this->orphanSubscriptionIds as $orphanSubscriptionID) {
+            $this->deleteOrphanSubscription($orphanSubscriptionID);
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function deleteOrphanSubscription(int $orphanSubscriptionID): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('calendarsubscriptions')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($orphanSubscriptionID)))
+            ->executeStatement();
+    }
+
+    private function getPrincipal(string $principalUri): string {
+        $uri = explode('/', $principalUri);
+        return array_pop($uri);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 		$result->closeCursor();
 
 		if ($count !== false) {
-			$count = (int)$count;
+			$count = (int) $count;
 		} else {
 			$count = 0;
 		}
@@ -91,7 +91,7 @@ 
 		while ($row = $result->fetchAssociative()) {
 			$username = $this->getPrincipal($row['principaluri']);
 			if (!$this->userManager->userExists($username)) {
-				$this->orphanSubscriptionIds[] = (int)$row['id'];
+				$this->orphanSubscriptionIds[] = (int) $row['id'];
 			}
 		}
 		$result->closeCursor();

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

Indentation +101 added lines, -101 removed lines

@@ -16,105 +16,105 @@
 
 class CalDAVRemoveEmptyValue implements IRepairStep {
 
-	public function __construct(
-		private IDBConnection $db,
-		private CalDavBackend $calDavBackend,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function getName() {
-		return 'Fix broken values of calendar objects';
-	}
-
-	public function run(IOutput $output) {
-		$pattern = ';VALUE=:';
-		$count = $warnings = 0;
-
-		$objects = $this->getInvalidObjects($pattern);
-
-		$output->startProgress(count($objects));
-		foreach ($objects as $row) {
-			$calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
-			$data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
-
-			if ($data !== $calObject['calendardata']) {
-				$output->advance();
-
-				try {
-					$this->calDavBackend->getDenormalizedData($data);
-				} catch (InvalidDataException $e) {
-					$this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
-						'app' => 'dav',
-						'cal' => (int)$row['calendarid'],
-						'uri' => $row['uri'],
-					]);
-					$warnings++;
-					continue;
-				}
-
-				$this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
-				$count++;
-			}
-		}
-		$output->finishProgress();
-
-		if ($warnings > 0) {
-			$output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
-		}
-		if ($count > 0) {
-			$output->info(sprintf('Updated %d events', $count));
-		}
-	}
-
-	protected function getInvalidObjects($pattern) {
-		if ($this->db->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) {
-			$rows = [];
-			$chunkSize = 500;
-			$query = $this->db->getQueryBuilder();
-			$query->select($query->func()->count('*', 'num_entries'))
-				->from('calendarobjects');
-			$result = $query->executeQuery();
-			$count = $result->fetchOne();
-			$result->closeCursor();
-
-			$numChunks = ceil($count / $chunkSize);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['calendarid', 'uri', 'calendardata'])
-				->from('calendarobjects')
-				->setMaxResults($chunkSize);
-			for ($chunk = 0; $chunk < $numChunks; $chunk++) {
-				$query->setFirstResult($chunk * $chunkSize);
-				$result = $query->executeQuery();
-
-				while ($row = $result->fetchAssociative()) {
-					if (mb_strpos($row['calendardata'], $pattern) !== false) {
-						unset($row['calendardata']);
-						$rows[] = $row;
-					}
-				}
-				$result->closeCursor();
-			}
-			return $rows;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['calendarid', 'uri'])
-			->from('calendarobjects')
-			->where($query->expr()->like(
-				'calendardata',
-				$query->createNamedParameter(
-					'%' . $this->db->escapeLikeParameter($pattern) . '%',
-					IQueryBuilder::PARAM_STR
-				),
-				IQueryBuilder::PARAM_STR
-			));
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $rows;
-	}
+    public function __construct(
+        private IDBConnection $db,
+        private CalDavBackend $calDavBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function getName() {
+        return 'Fix broken values of calendar objects';
+    }
+
+    public function run(IOutput $output) {
+        $pattern = ';VALUE=:';
+        $count = $warnings = 0;
+
+        $objects = $this->getInvalidObjects($pattern);
+
+        $output->startProgress(count($objects));
+        foreach ($objects as $row) {
+            $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
+            $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
+
+            if ($data !== $calObject['calendardata']) {
+                $output->advance();
+
+                try {
+                    $this->calDavBackend->getDenormalizedData($data);
+                } catch (InvalidDataException $e) {
+                    $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
+                        'app' => 'dav',
+                        'cal' => (int)$row['calendarid'],
+                        'uri' => $row['uri'],
+                    ]);
+                    $warnings++;
+                    continue;
+                }
+
+                $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
+                $count++;
+            }
+        }
+        $output->finishProgress();
+
+        if ($warnings > 0) {
+            $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
+        }
+        if ($count > 0) {
+            $output->info(sprintf('Updated %d events', $count));
+        }
+    }
+
+    protected function getInvalidObjects($pattern) {
+        if ($this->db->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) {
+            $rows = [];
+            $chunkSize = 500;
+            $query = $this->db->getQueryBuilder();
+            $query->select($query->func()->count('*', 'num_entries'))
+                ->from('calendarobjects');
+            $result = $query->executeQuery();
+            $count = $result->fetchOne();
+            $result->closeCursor();
+
+            $numChunks = ceil($count / $chunkSize);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['calendarid', 'uri', 'calendardata'])
+                ->from('calendarobjects')
+                ->setMaxResults($chunkSize);
+            for ($chunk = 0; $chunk < $numChunks; $chunk++) {
+                $query->setFirstResult($chunk * $chunkSize);
+                $result = $query->executeQuery();
+
+                while ($row = $result->fetchAssociative()) {
+                    if (mb_strpos($row['calendardata'], $pattern) !== false) {
+                        unset($row['calendardata']);
+                        $rows[] = $row;
+                    }
+                }
+                $result->closeCursor();
+            }
+            return $rows;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['calendarid', 'uri'])
+            ->from('calendarobjects')
+            ->where($query->expr()->like(
+                'calendardata',
+                $query->createNamedParameter(
+                    '%' . $this->db->escapeLikeParameter($pattern) . '%',
+                    IQueryBuilder::PARAM_STR
+                ),
+                IQueryBuilder::PARAM_STR
+            ));
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $rows;
+    }
 }

apps/dav/lib/Migration/BuildSocialSearchIndexBackgroundJob.php

Indentation +58 added lines, -58 removed lines

@@ -17,72 +17,72 @@
 use Psr\Log\LoggerInterface;
 
 class BuildSocialSearchIndexBackgroundJob extends QueuedJob {
-	public function __construct(
-		private IDBConnection $db,
-		private CardDavBackend $davBackend,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IDBConnection $db,
+        private CardDavBackend $davBackend,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	public function run($argument) {
-		$offset = $argument['offset'];
-		$stopAt = $argument['stopAt'];
+    public function run($argument) {
+        $offset = $argument['offset'];
+        $stopAt = $argument['stopAt'];
 
-		$this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
+        $this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
 
-		$offset = $this->buildIndex($offset, $stopAt);
+        $offset = $this->buildIndex($offset, $stopAt);
 
-		if ($offset >= $stopAt) {
-			$this->logger->info('All contacts with social profiles indexed');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New social profile indexing job scheduled with offset ' . $offset);
-		}
-	}
+        if ($offset >= $stopAt) {
+            $this->logger->info('All contacts with social profiles indexed');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New social profile indexing job scheduled with offset ' . $offset);
+        }
+    }
 
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex($offset, $stopAt) {
-		$startTime = $this->time->getTime();
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex($offset, $stopAt) {
+        $startTime = $this->time->getTime();
 
-		// get contacts with social profiles
-		$query = $this->db->getQueryBuilder();
-		$query->select('id', 'addressbookid', 'uri', 'carddata')
-			->from('cards', 'c')
-			->orderBy('id', 'ASC')
-			->where($query->expr()->like('carddata', $query->createNamedParameter('%SOCIALPROFILE%')))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter((int)$offset, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(100);
-		$social_cards = $query->executeQuery()->fetchAllAssociative();
+        // get contacts with social profiles
+        $query = $this->db->getQueryBuilder();
+        $query->select('id', 'addressbookid', 'uri', 'carddata')
+            ->from('cards', 'c')
+            ->orderBy('id', 'ASC')
+            ->where($query->expr()->like('carddata', $query->createNamedParameter('%SOCIALPROFILE%')))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter((int)$offset, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(100);
+        $social_cards = $query->executeQuery()->fetchAllAssociative();
 
-		if (empty($social_cards)) {
-			return $stopAt;
-		}
+        if (empty($social_cards)) {
+            return $stopAt;
+        }
 
-		// refresh identified contacts in order to re-index
-		foreach ($social_cards as $contact) {
-			$offset = $contact['id'];
-			$cardData = $contact['carddata'];
-			if (is_resource($cardData) && (get_resource_type($cardData) === 'stream')) {
-				$cardData = stream_get_contents($cardData);
-			}
-			$this->davBackend->updateCard($contact['addressbookid'], $contact['uri'], $cardData);
+        // refresh identified contacts in order to re-index
+        foreach ($social_cards as $contact) {
+            $offset = $contact['id'];
+            $cardData = $contact['carddata'];
+            if (is_resource($cardData) && (get_resource_type($cardData) === 'stream')) {
+                $cardData = stream_get_contents($cardData);
+            }
+            $this->davBackend->updateCard($contact['addressbookid'], $contact['uri'], $cardData);
 
-			// stop after 15sec (to be continued with next chunk)
-			if (($this->time->getTime() - $startTime) > 15) {
-				break;
-			}
-		}
+            // stop after 15sec (to be continued with next chunk)
+            if (($this->time->getTime() - $startTime) > 15) {
+                break;
+            }
+        }
 
-		return $offset;
-	}
+        return $offset;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 		$offset = $argument['offset'];
 		$stopAt = $argument['stopAt'];
 
-		$this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
+		$this->logger->info('Indexing social profile data ('.$offset.'/'.$stopAt.')');
 
 		$offset = $this->buildIndex($offset, $stopAt);
 
@@ -42,7 +42,7 @@ 
 				'offset' => $offset,
 				'stopAt' => $stopAt
 			]);
-			$this->logger->info('New social profile indexing job scheduled with offset ' . $offset);
+			$this->logger->info('New social profile indexing job scheduled with offset '.$offset);
 		}
 	}
 
@@ -60,7 +60,7 @@ 
 			->from('cards', 'c')
 			->orderBy('id', 'ASC')
 			->where($query->expr()->like('carddata', $query->createNamedParameter('%SOCIALPROFILE%')))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter((int)$offset, IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->gt('id', $query->createNamedParameter((int) $offset, IQueryBuilder::PARAM_INT)))
 			->setMaxResults(100);
 		$social_cards = $query->executeQuery()->fetchAllAssociative();