nextcloud / server

apps/files_trashbin/lib/Migration/Version1010Date20200630192639.php

Indentation +50 added lines, -50 removed lines

@@ -33,55 +33,55 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1010Date20200630192639 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('files_trash')) {
-			$table = $schema->createTable('files_trash');
-			$table->addColumn('auto_id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('id', Types::STRING, [
-				'notnull' => true,
-				'length' => 250,
-				'default' => '',
-			]);
-			$table->addColumn('user', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('timestamp', Types::STRING, [
-				'notnull' => true,
-				'length' => 12,
-				'default' => '',
-			]);
-			$table->addColumn('location', Types::STRING, [
-				'notnull' => true,
-				'length' => 512,
-				'default' => '',
-			]);
-			$table->addColumn('type', Types::STRING, [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('mime', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['auto_id']);
-			$table->addIndex(['id'], 'id_index');
-			$table->addIndex(['timestamp'], 'timestamp_index');
-			$table->addIndex(['user'], 'user_index');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('files_trash')) {
+            $table = $schema->createTable('files_trash');
+            $table->addColumn('auto_id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('id', Types::STRING, [
+                'notnull' => true,
+                'length' => 250,
+                'default' => '',
+            ]);
+            $table->addColumn('user', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('timestamp', Types::STRING, [
+                'notnull' => true,
+                'length' => 12,
+                'default' => '',
+            ]);
+            $table->addColumn('location', Types::STRING, [
+                'notnull' => true,
+                'length' => 512,
+                'default' => '',
+            ]);
+            $table->addColumn('type', Types::STRING, [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('mime', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['auto_id']);
+            $table->addIndex(['id'], 'id_index');
+            $table->addIndex(['timestamp'], 'timestamp_index');
+            $table->addIndex(['user'], 'user_index');
+        }
+        return $schema;
+    }
 }

apps/files_sharing/lib/Migration/Version21000Date20201223143245.php

Indentation +30 added lines, -30 removed lines

@@ -34,37 +34,37 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version21000Date20201223143245 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('share_external')) {
-			$table = $schema->getTable('share_external');
-			$changed = false;
-			if (!$table->hasColumn('parent')) {
-				$table->addColumn('parent', Types::BIGINT, [
-					'notnull' => false,
-					'default' => -1,
-				]);
-				$changed = true;
-			}
-			if (!$table->hasColumn('share_type')) {
-				$table->addColumn('share_type', Types::INTEGER, [
-					'notnull' => false,
-					'length' => 4,
-				]);
-				$changed = true;
-			}
-			if ($table->hasColumn('lastscan')) {
-				$table->dropColumn('lastscan');
-				$changed = true;
-			}
+        if ($schema->hasTable('share_external')) {
+            $table = $schema->getTable('share_external');
+            $changed = false;
+            if (!$table->hasColumn('parent')) {
+                $table->addColumn('parent', Types::BIGINT, [
+                    'notnull' => false,
+                    'default' => -1,
+                ]);
+                $changed = true;
+            }
+            if (!$table->hasColumn('share_type')) {
+                $table->addColumn('share_type', Types::INTEGER, [
+                    'notnull' => false,
+                    'length' => 4,
+                ]);
+                $changed = true;
+            }
+            if ($table->hasColumn('lastscan')) {
+                $table->dropColumn('lastscan');
+                $changed = true;
+            }
 
-			if ($changed) {
-				return $schema;
-			}
-		}
+            if ($changed) {
+                return $schema;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

lib/private/DB/SQLiteSessionInit.php

Indentation +34 added lines, -34 removed lines

@@ -31,42 +31,42 @@
 use Doctrine\DBAL\Events;
 
 class SQLiteSessionInit implements EventSubscriber {
-	/**
-	 * @var bool
-	 */
-	private $caseSensitiveLike;
+    /**
+     * @var bool
+     */
+    private $caseSensitiveLike;
 
-	/**
-	 * @var string
-	 */
-	private $journalMode;
+    /**
+     * @var string
+     */
+    private $journalMode;
 
-	/**
-	 * Configure case sensitive like for each connection
-	 *
-	 * @param bool $caseSensitiveLike
-	 * @param string $journalMode
-	 */
-	public function __construct($caseSensitiveLike, $journalMode) {
-		$this->caseSensitiveLike = $caseSensitiveLike;
-		$this->journalMode = $journalMode;
-	}
+    /**
+     * Configure case sensitive like for each connection
+     *
+     * @param bool $caseSensitiveLike
+     * @param string $journalMode
+     */
+    public function __construct($caseSensitiveLike, $journalMode) {
+        $this->caseSensitiveLike = $caseSensitiveLike;
+        $this->journalMode = $journalMode;
+    }
 
-	/**
-	 * @param ConnectionEventArgs $args
-	 * @return void
-	 */
-	public function postConnect(ConnectionEventArgs $args) {
-		$sensitive = $this->caseSensitiveLike ? 'true' : 'false';
-		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
-		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
-		/** @var \Doctrine\DBAL\Driver\PDO\Connection $connection */
-		$connection = $args->getConnection()->getWrappedConnection();
-		$pdo = $connection->getWrappedConnection();
-		$pdo->sqliteCreateFunction('md5', 'md5', 1);
-	}
+    /**
+     * @param ConnectionEventArgs $args
+     * @return void
+     */
+    public function postConnect(ConnectionEventArgs $args) {
+        $sensitive = $this->caseSensitiveLike ? 'true' : 'false';
+        $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
+        $args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
+        /** @var \Doctrine\DBAL\Driver\PDO\Connection $connection */
+        $connection = $args->getConnection()->getWrappedConnection();
+        $pdo = $connection->getWrappedConnection();
+        $pdo->sqliteCreateFunction('md5', 'md5', 1);
+    }
 
-	public function getSubscribedEvents() {
-		return [Events::postConnect];
-	}
+    public function getSubscribedEvents() {
+        return [Events::postConnect];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
 	 */
 	public function postConnect(ConnectionEventArgs $args) {
 		$sensitive = $this->caseSensitiveLike ? 'true' : 'false';
-		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
-		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
+		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = '.$sensitive);
+		$args->getConnection()->executeUpdate('PRAGMA journal_mode = '.$this->journalMode);
 		/** @var \Doctrine\DBAL\Driver\PDO\Connection $connection */
 		$connection = $args->getConnection()->getWrappedConnection();
 		$pdo = $connection->getWrappedConnection();

core/Migrations/Version21000Date20210119195004.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version21000Date20210119195004 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('authtoken');
-		if ($table->hasIndex('authtoken_version_index')) {
-			$table->dropIndex('authtoken_version_index');
-		}
+        $table = $schema->getTable('authtoken');
+        if ($table->hasIndex('authtoken_version_index')) {
+            $table->dropIndex('authtoken_version_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version14000Date20180518120534.php

Indentation +18 added lines, -18 removed lines

@@ -31,24 +31,24 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180518120534 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('authtoken');
-		$table->addColumn('private_key', 'text', [
-			'notnull' => false,
-		]);
-		$table->addColumn('public_key', 'text', [
-			'notnull' => false,
-		]);
-		$table->addColumn('version', 'smallint', [
-			'notnull' => true,
-			'default' => 1,
-			'unsigned' => true,
-		]);
-		$table->addIndex(['uid'], 'authtoken_uid_index');
+        $table = $schema->getTable('authtoken');
+        $table->addColumn('private_key', 'text', [
+            'notnull' => false,
+        ]);
+        $table->addColumn('public_key', 'text', [
+            'notnull' => false,
+        ]);
+        $table->addColumn('version', 'smallint', [
+            'notnull' => true,
+            'default' => 1,
+            'unsigned' => true,
+        ]);
+        $table->addIndex(['uid'], 'authtoken_uid_index');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Repair/RepairDavShares.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 		$qb = $this->dbc->getQueryBuilder();
 		$qb->select(['id', 'principaluri'])
 			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX.'%')));
 
 		$updateQuery = $this->dbc->getQueryBuilder();
 		$updateQuery->update('dav_shares')
@@ -100,7 +100,7 @@ 
 			// + AND there are no ambivalent groups
 
 			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX.$encodedGid;
 				$logParameters = [
 					'app' => 'core',
 					'id' => $share['id'],

Indentation +76 added lines, -76 removed lines

@@ -21,89 +21,89 @@
 use function urlencode;
 
 class RepairDavShares implements IRepairStep {
-	protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
+    protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
 
-	/** @var bool */
-	private $hintInvalidShares = false;
+    /** @var bool */
+    private $hintInvalidShares = false;
 
-	public function __construct(
-		private IConfig $config,
-		private IDBConnection $dbc,
-		private IGroupManager $groupManager,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IDBConnection $dbc,
+        private IGroupManager $groupManager,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getName() {
-		return 'Repair DAV shares';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getName() {
+        return 'Repair DAV shares';
+    }
 
-	protected function repairUnencodedGroupShares() {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select(['id', 'principaluri'])
-			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+    protected function repairUnencodedGroupShares() {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select(['id', 'principaluri'])
+            ->from('dav_shares')
+            ->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
 
-		$updateQuery = $this->dbc->getQueryBuilder();
-		$updateQuery->update('dav_shares')
-			->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
-			->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
+        $updateQuery = $this->dbc->getQueryBuilder();
+        $updateQuery->update('dav_shares')
+            ->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
+            ->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
 
-		$statement = $qb->executeQuery();
-		while ($share = $statement->fetch()) {
-			$gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
-			$decodedGid = urldecode($gid);
-			$encodedGid = urlencode($gid);
-			if ($gid === $encodedGid
-				|| !$this->groupManager->groupExists($gid)
-				|| ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
-			) {
-				$this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
-				continue;
-			}
+        $statement = $qb->executeQuery();
+        while ($share = $statement->fetch()) {
+            $gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
+            $decodedGid = urldecode($gid);
+            $encodedGid = urlencode($gid);
+            if ($gid === $encodedGid
+                || !$this->groupManager->groupExists($gid)
+                || ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
+            ) {
+                $this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
+                continue;
+            }
 
-			// Repair when
-			// + the group name needs encoding
-			// + AND it is not encoded yet
-			// + AND there are no ambivalent groups
+            // Repair when
+            // + the group name needs encoding
+            // + AND it is not encoded yet
+            // + AND there are no ambivalent groups
 
-			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
-				$logParameters = [
-					'app' => 'core',
-					'id' => $share['id'],
-					'old' => $share['principaluri'],
-					'new' => $fixedPrincipal,
-				];
-				$updateQuery
-					->setParameter('updatedPrincipalUri', $fixedPrincipal)
-					->setParameter('shareId', $share['id'])
-					->executeStatement();
-				$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
-			} catch (Exception $e) {
-				$logParameters['message'] = $e->getMessage();
-				$logParameters['exception'] = $e;
-				$this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
-			}
-		}
-		return true;
-	}
+            try {
+                $fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+                $logParameters = [
+                    'app' => 'core',
+                    'id' => $share['id'],
+                    'old' => $share['principaluri'],
+                    'new' => $fixedPrincipal,
+                ];
+                $updateQuery
+                    ->setParameter('updatedPrincipalUri', $fixedPrincipal)
+                    ->setParameter('shareId', $share['id'])
+                    ->executeStatement();
+                $this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
+            } catch (Exception $e) {
+                $logParameters['message'] = $e->getMessage();
+                $logParameters['exception'] = $e;
+                $this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
-		if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
-			&& $this->repairUnencodedGroupShares()
-		) {
-			$output->info('Repaired DAV group shares');
-			if ($this->hintInvalidShares) {
-				$output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
-			}
-		}
-	}
+    /**
+     * @inheritDoc
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
+        if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
+            && $this->repairUnencodedGroupShares()
+        ) {
+            $output->info('Repaired DAV group shares');
+            if ($this->hintInvalidShares) {
+                $output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
+            }
+        }
+    }
 }

apps/dav/lib/Listener/CalendarContactInteractionListener.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 						}
 					}
 				} catch (Throwable $e) {
-					$this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
+					$this->logger->warning('Could not read calendar data for interaction events: '.$e->getMessage(), [
 						'exception' => $e,
 					]);
 				}

Indentation +109 added lines, -109 removed lines

@@ -30,113 +30,113 @@
 
 /** @template-implements IEventListener<CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarShareUpdatedEvent> */
 class CalendarContactInteractionListener implements IEventListener {
-	private const URI_USERS = 'principals/users/';
-
-	public function __construct(
-		private IEventDispatcher $dispatcher,
-		private IUserSession $userSession,
-		private Principal $principalConnector,
-		private IEmailValidator $emailValidator,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if (($user = $this->userSession->getUser()) === null) {
-			// Without user context we can't do anything
-			return;
-		}
-
-		if ($event instanceof CalendarObjectCreatedEvent || $event instanceof CalendarObjectUpdatedEvent) {
-			// users: href => principal:principals/users/admin
-			foreach ($event->getShares() as $share) {
-				if (!isset($share['href'])) {
-					continue;
-				}
-				$this->emitFromUri($share['href'], $user);
-			}
-
-			// emit interaction for email attendees as well
-			if (isset($event->getObjectData()['calendardata'])) {
-				try {
-					$calendar = Reader::read($event->getObjectData()['calendardata']);
-					if ($calendar->VEVENT) {
-						foreach ($calendar->VEVENT as $calendarEvent) {
-							$this->emitFromObject($calendarEvent, $user);
-						}
-					}
-				} catch (Throwable $e) {
-					$this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
-						'exception' => $e,
-					]);
-				}
-			}
-		}
-
-		if ($event instanceof CalendarShareUpdatedEvent && !empty($event->getAdded())) {
-			// group: href => principal:principals/groups/admin
-			// users: href => principal:principals/users/admin
-			foreach ($event->getAdded() as $added) {
-				if (!isset($added['href'])) {
-					// Nothing to work with
-					continue;
-				}
-				$this->emitFromUri($added['href'], $user);
-			}
-		}
-	}
-
-	private function emitFromUri(string $uri, IUser $user): void {
-		$principal = $this->principalConnector->findByUri(
-			$uri,
-			$this->principalConnector->getPrincipalPrefix()
-		);
-		if ($principal === null) {
-			// Invalid principal
-			return;
-		}
-		if (!str_starts_with($principal, self::URI_USERS)) {
-			// Not a user principal
-			return;
-		}
-
-		$uid = substr($principal, strlen(self::URI_USERS));
-		$this->dispatcher->dispatchTyped(
-			(new ContactInteractedWithEvent($user))->setUid($uid)
-		);
-	}
-
-	private function emitFromObject(VEvent $vevent, IUser $user): void {
-		if (!$vevent->ATTENDEE) {
-			// Nothing left to do
-			return;
-		}
-
-		foreach ($vevent->ATTENDEE as $attendee) {
-			if (!($attendee instanceof Property)) {
-				continue;
-			}
-
-			$cuType = $attendee->offsetGet('CUTYPE');
-			if ($cuType instanceof Parameter && $cuType->getValue() !== 'INDIVIDUAL') {
-				// Don't care about those
-				continue;
-			}
-
-			$mailTo = $attendee->getValue();
-			if (!str_starts_with($mailTo, 'mailto:')) {
-				// Doesn't look like an email
-				continue;
-			}
-			$email = substr($mailTo, strlen('mailto:'));
-			if (!$this->emailValidator->isValid($email)) {
-				// This really isn't a valid email
-				continue;
-			}
-
-			$this->dispatcher->dispatchTyped(
-				(new ContactInteractedWithEvent($user))->setEmail($email)
-			);
-		}
-	}
+    private const URI_USERS = 'principals/users/';
+
+    public function __construct(
+        private IEventDispatcher $dispatcher,
+        private IUserSession $userSession,
+        private Principal $principalConnector,
+        private IEmailValidator $emailValidator,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if (($user = $this->userSession->getUser()) === null) {
+            // Without user context we can't do anything
+            return;
+        }
+
+        if ($event instanceof CalendarObjectCreatedEvent || $event instanceof CalendarObjectUpdatedEvent) {
+            // users: href => principal:principals/users/admin
+            foreach ($event->getShares() as $share) {
+                if (!isset($share['href'])) {
+                    continue;
+                }
+                $this->emitFromUri($share['href'], $user);
+            }
+
+            // emit interaction for email attendees as well
+            if (isset($event->getObjectData()['calendardata'])) {
+                try {
+                    $calendar = Reader::read($event->getObjectData()['calendardata']);
+                    if ($calendar->VEVENT) {
+                        foreach ($calendar->VEVENT as $calendarEvent) {
+                            $this->emitFromObject($calendarEvent, $user);
+                        }
+                    }
+                } catch (Throwable $e) {
+                    $this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
+                        'exception' => $e,
+                    ]);
+                }
+            }
+        }
+
+        if ($event instanceof CalendarShareUpdatedEvent && !empty($event->getAdded())) {
+            // group: href => principal:principals/groups/admin
+            // users: href => principal:principals/users/admin
+            foreach ($event->getAdded() as $added) {
+                if (!isset($added['href'])) {
+                    // Nothing to work with
+                    continue;
+                }
+                $this->emitFromUri($added['href'], $user);
+            }
+        }
+    }
+
+    private function emitFromUri(string $uri, IUser $user): void {
+        $principal = $this->principalConnector->findByUri(
+            $uri,
+            $this->principalConnector->getPrincipalPrefix()
+        );
+        if ($principal === null) {
+            // Invalid principal
+            return;
+        }
+        if (!str_starts_with($principal, self::URI_USERS)) {
+            // Not a user principal
+            return;
+        }
+
+        $uid = substr($principal, strlen(self::URI_USERS));
+        $this->dispatcher->dispatchTyped(
+            (new ContactInteractedWithEvent($user))->setUid($uid)
+        );
+    }
+
+    private function emitFromObject(VEvent $vevent, IUser $user): void {
+        if (!$vevent->ATTENDEE) {
+            // Nothing left to do
+            return;
+        }
+
+        foreach ($vevent->ATTENDEE as $attendee) {
+            if (!($attendee instanceof Property)) {
+                continue;
+            }
+
+            $cuType = $attendee->offsetGet('CUTYPE');
+            if ($cuType instanceof Parameter && $cuType->getValue() !== 'INDIVIDUAL') {
+                // Don't care about those
+                continue;
+            }
+
+            $mailTo = $attendee->getValue();
+            if (!str_starts_with($mailTo, 'mailto:')) {
+                // Doesn't look like an email
+                continue;
+            }
+            $email = substr($mailTo, strlen('mailto:'));
+            if (!$this->emailValidator->isValid($email)) {
+                // This really isn't a valid email
+                continue;
+            }
+
+            $this->dispatcher->dispatchTyped(
+                (new ContactInteractedWithEvent($user))->setEmail($email)
+            );
+        }
+    }
 }

lib/private/AppFramework/Bootstrap/ServiceRegistration.php

Indentation +18 added lines, -18 removed lines

@@ -30,24 +30,24 @@
  * @template T
  */
 class ServiceRegistration extends ARegistration {
-	/**
-	 * @var string
-	 * @psalm-var class-string<T>
-	 */
-	private $service;
+    /**
+     * @var string
+     * @psalm-var class-string<T>
+     */
+    private $service;
 
-	/**
-	 * @psalm-param class-string<T> $service
-	 */
-	public function __construct(string $appId, string $service) {
-		parent::__construct($appId);
-		$this->service = $service;
-	}
+    /**
+     * @psalm-param class-string<T> $service
+     */
+    public function __construct(string $appId, string $service) {
+        parent::__construct($appId);
+        $this->service = $service;
+    }
 
-	/**
-	 * @psalm-return class-string<T>
-	 */
-	public function getService(): string {
-		return $this->service;
-	}
+    /**
+     * @psalm-return class-string<T>
+     */
+    public function getService(): string {
+        return $this->service;
+    }
 }

lib/private/Preview/WebP.php

Indentation +9 added lines, -9 removed lines

@@ -29,14 +29,14 @@
 use OCP\Files\FileInfo;
 
 class WebP extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/webp/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/webp/';
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)(imagetypes() & IMG_WEBP);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 	}
 
 	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
+		return (bool) (imagetypes() & IMG_WEBP);
 	}
 }