nextcloud / server

apps/dav/lib/CardDAV/Integration/ExternalAddressBook.php

Indentation +79 added lines, -79 removed lines

@@ -34,93 +34,93 @@
  */
 abstract class ExternalAddressBook implements IAddressBook, DAV\IProperties {
 
-	/** @var string */
-	private const PREFIX = 'z-app-generated';
+    /** @var string */
+    private const PREFIX = 'z-app-generated';
 
-	/**
-	 * @var string
-	 *
-	 * Double dash is a valid delimiter,
-	 * because it will always split the URIs correctly:
-	 * - our prefix contains only one dash and won't be split
-	 * - appIds are not allowed to contain dashes as per spec:
-	 * > must contain only lowercase ASCII characters and underscore
-	 * - explode has a limit of three, so even if the app-generated
-	 *   URI has double dashes, it won't be split
-	 */
-	private const DELIMITER = '--';
+    /**
+     * @var string
+     *
+     * Double dash is a valid delimiter,
+     * because it will always split the URIs correctly:
+     * - our prefix contains only one dash and won't be split
+     * - appIds are not allowed to contain dashes as per spec:
+     * > must contain only lowercase ASCII characters and underscore
+     * - explode has a limit of three, so even if the app-generated
+     *   URI has double dashes, it won't be split
+     */
+    private const DELIMITER = '--';
 
-	private string $appId;
-	private string $uri;
+    private string $appId;
+    private string $uri;
 
-	public function __construct(string $appId, string $uri) {
-		$this->appId = $appId;
-		$this->uri = $uri;
-	}
+    public function __construct(string $appId, string $uri) {
+        $this->appId = $appId;
+        $this->uri = $uri;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function getName() {
-		return implode(self::DELIMITER, [
-			self::PREFIX,
-			$this->appId,
-			$this->uri,
-		]);
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function getName() {
+        return implode(self::DELIMITER, [
+            self::PREFIX,
+            $this->appId,
+            $this->uri,
+        ]);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function setName($name) {
-		throw new DAV\Exception\MethodNotAllowed('Renaming address books is not yet supported');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function setName($name) {
+        throw new DAV\Exception\MethodNotAllowed('Renaming address books is not yet supported');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function createDirectory($name) {
-		throw new DAV\Exception\MethodNotAllowed('Creating collections in address book objects is not allowed');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function createDirectory($name) {
+        throw new DAV\Exception\MethodNotAllowed('Creating collections in address book objects is not allowed');
+    }
 
-	/**
-	 * Checks whether the address book uri is app-generated
-	 *
-	 * @param string $uri
-	 *
-	 * @return bool
-	 */
-	public static function isAppGeneratedAddressBook(string $uri): bool {
-		return strpos($uri, self::PREFIX) === 0 && substr_count($uri, self::DELIMITER) >= 2;
-	}
+    /**
+     * Checks whether the address book uri is app-generated
+     *
+     * @param string $uri
+     *
+     * @return bool
+     */
+    public static function isAppGeneratedAddressBook(string $uri): bool {
+        return strpos($uri, self::PREFIX) === 0 && substr_count($uri, self::DELIMITER) >= 2;
+    }
 
-	/**
-	 * Splits an app-generated uri into appId and uri
-	 *
-	 * @param string $uri
-	 *
-	 * @return array
-	 */
-	public static function splitAppGeneratedAddressBookUri(string $uri): array {
-		$array = array_slice(explode(self::DELIMITER, $uri, 3), 1);
-		// Check the array has expected amount of elements
-		// and none of them is an empty string
-		if (\count($array) !== 2 || \in_array('', $array, true)) {
-			throw new \InvalidArgumentException('Provided address book uri was not app-generated');
-		}
+    /**
+     * Splits an app-generated uri into appId and uri
+     *
+     * @param string $uri
+     *
+     * @return array
+     */
+    public static function splitAppGeneratedAddressBookUri(string $uri): array {
+        $array = array_slice(explode(self::DELIMITER, $uri, 3), 1);
+        // Check the array has expected amount of elements
+        // and none of them is an empty string
+        if (\count($array) !== 2 || \in_array('', $array, true)) {
+            throw new \InvalidArgumentException('Provided address book uri was not app-generated');
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	/**
-	 * Checks whether a address book name the user wants to create violates
-	 * the reserved name for URIs
-	 *
-	 * @param string $uri
-	 *
-	 * @return bool
-	 */
-	public static function doesViolateReservedName(string $uri): bool {
-		return strpos($uri, self::PREFIX) === 0;
-	}
+    /**
+     * Checks whether a address book name the user wants to create violates
+     * the reserved name for URIs
+     *
+     * @param string $uri
+     *
+     * @return bool
+     */
+    public static function doesViolateReservedName(string $uri): bool {
+        return strpos($uri, self::PREFIX) === 0;
+    }
 }

apps/contactsinteraction/lib/Card.php

Indentation +95 added lines, -95 removed lines

@@ -34,99 +34,99 @@
 use Sabre\DAVACL\IACL;
 
 class Card implements ICard, IACL {
-	use ACLTrait;
-
-	private RecentContact $contact;
-	private string $principal;
-	private array $acls;
-
-	public function __construct(RecentContact $contact, string $principal, array $acls) {
-		$this->contact = $contact;
-		$this->principal = $principal;
-		$this->acls = $acls;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOwner(): ?string {
-		return $this->principal;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getACL(): array {
-		return $this->acls;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setAcls(array $acls): void {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function put($data): ?string {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function get() {
-		return $this->contact->getCard();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getContentType(): ?string {
-		return 'text/vcard; charset=utf-8';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getETag(): ?string {
-		return '"' . md5((string) $this->getLastModified()) . '"';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getSize(): int {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function delete(): void {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return (string) $this->contact->getId();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setName($name): void {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getLastModified(): ?int {
-		return $this->contact->getLastContact();
-	}
+    use ACLTrait;
+
+    private RecentContact $contact;
+    private string $principal;
+    private array $acls;
+
+    public function __construct(RecentContact $contact, string $principal, array $acls) {
+        $this->contact = $contact;
+        $this->principal = $principal;
+        $this->acls = $acls;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOwner(): ?string {
+        return $this->principal;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getACL(): array {
+        return $this->acls;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setAcls(array $acls): void {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function put($data): ?string {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get() {
+        return $this->contact->getCard();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getContentType(): ?string {
+        return 'text/vcard; charset=utf-8';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getETag(): ?string {
+        return '"' . md5((string) $this->getLastModified()) . '"';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSize(): int {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(): void {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return (string) $this->contact->getId();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setName($name): void {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLastModified(): ?int {
+        return $this->contact->getLastContact();
+    }
 }

apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php

Indentation +13 added lines, -13 removed lines

@@ -31,21 +31,21 @@
 use OCP\BackgroundJob\TimedJob;
 
 class CleanupJob extends TimedJob {
-	private RecentContactMapper $mapper;
+    private RecentContactMapper $mapper;
 
-	public function __construct(ITimeFactory $time,
-								RecentContactMapper $mapper) {
-		parent::__construct($time);
+    public function __construct(ITimeFactory $time,
+                                RecentContactMapper $mapper) {
+        parent::__construct($time);
 
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
 
-		$this->mapper = $mapper;
-	}
+        $this->mapper = $mapper;
+    }
 
-	protected function run($argument) {
-		$time = $this->time->getDateTime();
-		$time->modify('-7days');
-		$this->mapper->cleanUp($time->getTimestamp());
-	}
+    protected function run($argument) {
+        $time = $this->time->getDateTime();
+        $time->modify('-7days');
+        $this->mapper->cleanUp($time->getTimestamp());
+    }
 }

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

Indentation +117 added lines, -117 removed lines

@@ -41,121 +41,121 @@
 use Throwable;
 
 class ContactInteractionListener implements IEventListener {
-	private RecentContactMapper $mapper;
-	private CardSearchDao $cardSearchDao;
-	private IUserManager $userManager;
-	private ITimeFactory $timeFactory;
-	private IL10N $l10n;
-	private LoggerInterface $logger;
-
-	public function __construct(RecentContactMapper $mapper,
-								CardSearchDao $cardSearchDao,
-								IUserManager $userManager,
-								ITimeFactory $timeFactory,
-								IL10N $l10nFactory,
-								LoggerInterface $logger) {
-		$this->mapper = $mapper;
-		$this->cardSearchDao = $cardSearchDao;
-		$this->userManager = $userManager;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10nFactory;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof ContactInteractedWithEvent)) {
-			return;
-		}
-
-		if ($event->getUid() === null && $event->getEmail() === null && $event->getFederatedCloudId() === null) {
-			$this->logger->warning("Contact interaction event has no user identifier set");
-			return;
-		}
-
-		if ($event->getUid() !== null && $event->getUid() === $event->getActor()->getUID()) {
-			$this->logger->info("Ignoring contact interaction with self");
-			return;
-		}
-
-		$existing = $this->mapper->findMatch(
-			$event->getActor(),
-			$event->getUid(),
-			$event->getEmail(),
-			$event->getFederatedCloudId()
-		);
-		if (!empty($existing)) {
-			$now = $this->timeFactory->getTime();
-			foreach ($existing as $c) {
-				$c->setLastContact($now);
-				$this->mapper->update($c);
-			}
-
-			return;
-		}
-
-		$contact = new RecentContact();
-		$contact->setActorUid($event->getActor()->getUID());
-		if ($event->getUid() !== null) {
-			$contact->setUid($event->getUid());
-		}
-		if ($event->getEmail() !== null) {
-			$contact->setEmail($event->getEmail());
-		}
-		if ($event->getFederatedCloudId() !== null) {
-			$contact->setFederatedCloudId($event->getFederatedCloudId());
-		}
-		$contact->setLastContact($this->timeFactory->getTime());
-
-		$copy = $this->cardSearchDao->findExisting(
-			$event->getActor(),
-			$event->getUid(),
-			$event->getEmail(),
-			$event->getFederatedCloudId()
-		);
-		if ($copy !== null) {
-			try {
-				$parsed = Reader::read($copy, Reader::OPTION_FORGIVING);
-				$parsed->CATEGORIES = $this->l10n->t('Recently contacted');
-				$contact->setCard($parsed->serialize());
-			} catch (Throwable $e) {
-				$this->logger->warning(
-					'Could not parse card to add recent category: ' . $e->getMessage(),
-					[
-						'exception' => $e,
-					]);
-				$contact->setCard($copy);
-			}
-		} else {
-			$contact->setCard($this->generateCard($contact));
-		}
-		$this->mapper->insert($contact);
-	}
-
-	private function getDisplayName(?string $uid): ?string {
-		if ($uid === null) {
-			return null;
-		}
-		if (($user = $this->userManager->get($uid)) === null) {
-			return null;
-		}
-
-		return $user->getDisplayName();
-	}
-
-	private function generateCard(RecentContact $contact): string {
-		$props = [
-			'URI' => UUIDUtil::getUUID(),
-			'FN' => $this->getDisplayName($contact->getUid()) ?? $contact->getEmail() ?? $contact->getFederatedCloudId(),
-			'CATEGORIES' => $this->l10n->t('Recently contacted'),
-		];
-
-		if ($contact->getEmail() !== null) {
-			$props['EMAIL'] = $contact->getEmail();
-		}
-		if ($contact->getFederatedCloudId() !== null) {
-			$props['CLOUD'] = $contact->getFederatedCloudId();
-		}
-
-		return (new VCard($props))->serialize();
-	}
+    private RecentContactMapper $mapper;
+    private CardSearchDao $cardSearchDao;
+    private IUserManager $userManager;
+    private ITimeFactory $timeFactory;
+    private IL10N $l10n;
+    private LoggerInterface $logger;
+
+    public function __construct(RecentContactMapper $mapper,
+                                CardSearchDao $cardSearchDao,
+                                IUserManager $userManager,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10nFactory,
+                                LoggerInterface $logger) {
+        $this->mapper = $mapper;
+        $this->cardSearchDao = $cardSearchDao;
+        $this->userManager = $userManager;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10nFactory;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof ContactInteractedWithEvent)) {
+            return;
+        }
+
+        if ($event->getUid() === null && $event->getEmail() === null && $event->getFederatedCloudId() === null) {
+            $this->logger->warning("Contact interaction event has no user identifier set");
+            return;
+        }
+
+        if ($event->getUid() !== null && $event->getUid() === $event->getActor()->getUID()) {
+            $this->logger->info("Ignoring contact interaction with self");
+            return;
+        }
+
+        $existing = $this->mapper->findMatch(
+            $event->getActor(),
+            $event->getUid(),
+            $event->getEmail(),
+            $event->getFederatedCloudId()
+        );
+        if (!empty($existing)) {
+            $now = $this->timeFactory->getTime();
+            foreach ($existing as $c) {
+                $c->setLastContact($now);
+                $this->mapper->update($c);
+            }
+
+            return;
+        }
+
+        $contact = new RecentContact();
+        $contact->setActorUid($event->getActor()->getUID());
+        if ($event->getUid() !== null) {
+            $contact->setUid($event->getUid());
+        }
+        if ($event->getEmail() !== null) {
+            $contact->setEmail($event->getEmail());
+        }
+        if ($event->getFederatedCloudId() !== null) {
+            $contact->setFederatedCloudId($event->getFederatedCloudId());
+        }
+        $contact->setLastContact($this->timeFactory->getTime());
+
+        $copy = $this->cardSearchDao->findExisting(
+            $event->getActor(),
+            $event->getUid(),
+            $event->getEmail(),
+            $event->getFederatedCloudId()
+        );
+        if ($copy !== null) {
+            try {
+                $parsed = Reader::read($copy, Reader::OPTION_FORGIVING);
+                $parsed->CATEGORIES = $this->l10n->t('Recently contacted');
+                $contact->setCard($parsed->serialize());
+            } catch (Throwable $e) {
+                $this->logger->warning(
+                    'Could not parse card to add recent category: ' . $e->getMessage(),
+                    [
+                        'exception' => $e,
+                    ]);
+                $contact->setCard($copy);
+            }
+        } else {
+            $contact->setCard($this->generateCard($contact));
+        }
+        $this->mapper->insert($contact);
+    }
+
+    private function getDisplayName(?string $uid): ?string {
+        if ($uid === null) {
+            return null;
+        }
+        if (($user = $this->userManager->get($uid)) === null) {
+            return null;
+        }
+
+        return $user->getDisplayName();
+    }
+
+    private function generateCard(RecentContact $contact): string {
+        $props = [
+            'URI' => UUIDUtil::getUUID(),
+            'FN' => $this->getDisplayName($contact->getUid()) ?? $contact->getEmail() ?? $contact->getFederatedCloudId(),
+            'CATEGORIES' => $this->l10n->t('Recently contacted'),
+        ];
+
+        if ($contact->getEmail() !== null) {
+            $props['EMAIL'] = $contact->getEmail();
+        }
+        if ($contact->getFederatedCloudId() !== null) {
+            $props['CLOUD'] = $contact->getFederatedCloudId();
+        }
+
+        return (new VCard($props))->serialize();
+    }
 }

apps/contactsinteraction/lib/AddressBook.php

Indentation +129 added lines, -129 removed lines

@@ -40,133 +40,133 @@
 use Sabre\DAVACL\IACL;
 
 class AddressBook extends ExternalAddressBook implements IACL {
-	use ACLTrait;
-
-	public const URI = 'recent';
-
-	private RecentContactMapper $mapper;
-	private IL10N $l10n;
-	private string $principalUri;
-
-	public function __construct(RecentContactMapper $mapper,
-								IL10N $l10n,
-								string $principalUri) {
-		parent::__construct(Application::APP_ID, self::URI);
-
-		$this->mapper = $mapper;
-		$this->l10n = $l10n;
-		$this->principalUri = $principalUri;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function delete(): void {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function createFile($name, $data = null) {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws NotFound
-	 */
-	public function getChild($name): Card {
-		try {
-			return new Card(
-				$this->mapper->find(
-					$this->getUid(),
-					(int)$name
-				),
-				$this->principalUri,
-				$this->getACL()
-			);
-		} catch (DoesNotExistException $ex) {
-			throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChildren(): array {
-		return array_map(
-			function (RecentContact $contact) {
-				return new Card(
-					$contact,
-					$this->principalUri,
-					$this->getACL()
-				);
-			},
-			$this->mapper->findAll($this->getUid())
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function childExists($name): bool {
-		try {
-			$this->mapper->find(
-				$this->getUid(),
-				(int)$name
-			);
-			return true;
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getLastModified(): ?int {
-		return $this->mapper->findLastUpdatedForUserId($this->getUid());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getProperties($properties) {
-		return [
-			'principaluri' => $this->principalUri,
-			'{DAV:}displayname' => $this->l10n->t('Recently contacted'),
-			'{' . Plugin::NS_OWNCLOUD . '}read-only' => true,
-			'{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0),
-		];
-	}
-
-	public function getOwner(): string {
-		return $this->principalUri;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getACL(): array {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-		];
-	}
-
-	private function getUid(): string {
-		[, $uid] = \Sabre\Uri\split($this->principalUri);
-		return $uid;
-	}
+    use ACLTrait;
+
+    public const URI = 'recent';
+
+    private RecentContactMapper $mapper;
+    private IL10N $l10n;
+    private string $principalUri;
+
+    public function __construct(RecentContactMapper $mapper,
+                                IL10N $l10n,
+                                string $principalUri) {
+        parent::__construct(Application::APP_ID, self::URI);
+
+        $this->mapper = $mapper;
+        $this->l10n = $l10n;
+        $this->principalUri = $principalUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(): void {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createFile($name, $data = null) {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     * @throws NotFound
+     */
+    public function getChild($name): Card {
+        try {
+            return new Card(
+                $this->mapper->find(
+                    $this->getUid(),
+                    (int)$name
+                ),
+                $this->principalUri,
+                $this->getACL()
+            );
+        } catch (DoesNotExistException $ex) {
+            throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChildren(): array {
+        return array_map(
+            function (RecentContact $contact) {
+                return new Card(
+                    $contact,
+                    $this->principalUri,
+                    $this->getACL()
+                );
+            },
+            $this->mapper->findAll($this->getUid())
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function childExists($name): bool {
+        try {
+            $this->mapper->find(
+                $this->getUid(),
+                (int)$name
+            );
+            return true;
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLastModified(): ?int {
+        return $this->mapper->findLastUpdatedForUserId($this->getUid());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function propPatch(PropPatch $propPatch) {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getProperties($properties) {
+        return [
+            'principaluri' => $this->principalUri,
+            '{DAV:}displayname' => $this->l10n->t('Recently contacted'),
+            '{' . Plugin::NS_OWNCLOUD . '}read-only' => true,
+            '{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0),
+        ];
+    }
+
+    public function getOwner(): string {
+        return $this->principalUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getACL(): array {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+        ];
+    }
+
+    private function getUid(): string {
+        [, $uid] = \Sabre\Uri\split($this->principalUri);
+        return $uid;
+    }
 }

apps/contactsinteraction/lib/Db/RecentContactMapper.php

Indentation +93 added lines, -93 removed lines

@@ -35,97 +35,97 @@
  * @template-extends QBMapper<RecentContact>
  */
 class RecentContactMapper extends QBMapper {
-	public const TABLE_NAME = 'recent_contact';
-
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, self::TABLE_NAME);
-	}
-
-	/**
-	 * @return RecentContact[]
-	 */
-	public function findAll(string $uid): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$select = $qb
-			->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
-
-		return $this->findEntities($select);
-	}
-
-	/**
-	 * @throws DoesNotExistException
-	 */
-	public function find(string $uid, int $id): RecentContact {
-		$qb = $this->db->getQueryBuilder();
-
-		$select = $qb
-			->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, $qb::PARAM_INT)))
-			->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
-
-		return $this->findEntity($select);
-	}
-
-	/**
-	 * @return RecentContact[]
-	 */
-	public function findMatch(IUser $user,
-							  ?string $uid,
-							  ?string $email,
-							  ?string $cloudId): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$or = $qb->expr()->orX();
-		if ($uid !== null) {
-			$or->add($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-		}
-		if ($email !== null) {
-			$or->add($qb->expr()->eq('email', $qb->createNamedParameter($email)));
-		}
-		if ($cloudId !== null) {
-			$or->add($qb->expr()->eq('federated_cloud_id', $qb->createNamedParameter($cloudId)));
-		}
-
-		$select = $qb
-			->select('*')
-			->from($this->getTableName())
-			->where($or)
-			->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($user->getUID())));
-
-		return $this->findEntities($select);
-	}
-
-	public function findLastUpdatedForUserId(string $uid): ?int {
-		$qb = $this->db->getQueryBuilder();
-
-		$select = $qb
-			->select('last_contact')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)))
-			->orderBy('last_contact', 'DESC')
-			->setMaxResults(1);
-
-		$cursor = $select->executeQuery();
-		$row = $cursor->fetch();
-
-		if ($row === false) {
-			return null;
-		}
-
-		return (int)$row['last_contact'];
-	}
-
-	public function cleanUp(int $olderThan): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$delete = $qb
-			->delete($this->getTableName())
-			->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
-
-		$delete->executeStatement();
-	}
+    public const TABLE_NAME = 'recent_contact';
+
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, self::TABLE_NAME);
+    }
+
+    /**
+     * @return RecentContact[]
+     */
+    public function findAll(string $uid): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $select = $qb
+            ->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
+
+        return $this->findEntities($select);
+    }
+
+    /**
+     * @throws DoesNotExistException
+     */
+    public function find(string $uid, int $id): RecentContact {
+        $qb = $this->db->getQueryBuilder();
+
+        $select = $qb
+            ->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, $qb::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
+
+        return $this->findEntity($select);
+    }
+
+    /**
+     * @return RecentContact[]
+     */
+    public function findMatch(IUser $user,
+                              ?string $uid,
+                              ?string $email,
+                              ?string $cloudId): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $or = $qb->expr()->orX();
+        if ($uid !== null) {
+            $or->add($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+        }
+        if ($email !== null) {
+            $or->add($qb->expr()->eq('email', $qb->createNamedParameter($email)));
+        }
+        if ($cloudId !== null) {
+            $or->add($qb->expr()->eq('federated_cloud_id', $qb->createNamedParameter($cloudId)));
+        }
+
+        $select = $qb
+            ->select('*')
+            ->from($this->getTableName())
+            ->where($or)
+            ->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($user->getUID())));
+
+        return $this->findEntities($select);
+    }
+
+    public function findLastUpdatedForUserId(string $uid): ?int {
+        $qb = $this->db->getQueryBuilder();
+
+        $select = $qb
+            ->select('last_contact')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)))
+            ->orderBy('last_contact', 'DESC')
+            ->setMaxResults(1);
+
+        $cursor = $select->executeQuery();
+        $row = $cursor->fetch();
+
+        if ($row === false) {
+            return null;
+        }
+
+        return (int)$row['last_contact'];
+    }
+
+    public function cleanUp(int $olderThan): void {
+        $qb = $this->db->getQueryBuilder();
+
+        $delete = $qb
+            ->delete($this->getTableName())
+            ->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
+
+        $delete->executeStatement();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			return null;
 		}
 
-		return (int)$row['last_contact'];
+		return (int) $row['last_contact'];
 	}
 
 	public function cleanUp(int $olderThan): void {

apps/contactsinteraction/lib/Db/CardSearchDao.php

Indentation +54 added lines, -54 removed lines

@@ -32,63 +32,63 @@
 use function stream_get_contents;
 
 class CardSearchDao {
-	private IDBConnection $db;
+    private IDBConnection $db;
 
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
 
-	public function findExisting(IUser $user,
-								 ?string $uid,
-								 ?string $email,
-								 ?string $cloudId): ?string {
-		$addressbooksQuery = $this->db->getQueryBuilder();
-		$cardQuery = $this->db->getQueryBuilder();
-		$propQuery = $this->db->getQueryBuilder();
+    public function findExisting(IUser $user,
+                                 ?string $uid,
+                                 ?string $email,
+                                 ?string $cloudId): ?string {
+        $addressbooksQuery = $this->db->getQueryBuilder();
+        $cardQuery = $this->db->getQueryBuilder();
+        $propQuery = $this->db->getQueryBuilder();
 
-		$propOr = $propQuery->expr()->orX();
-		if ($uid !== null) {
-			$propOr->add($propQuery->expr()->andX(
-				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('UID')),
-				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($uid))
-			));
-		}
-		if ($email !== null) {
-			$propOr->add($propQuery->expr()->andX(
-				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('EMAIL')),
-				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($email))
-			));
-		}
-		if ($cloudId !== null) {
-			$propOr->add($propQuery->expr()->andX(
-				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('CLOUD')),
-				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($cloudId))
-			));
-		}
-		$addressbooksQuery->selectDistinct('id')
-			->from('addressbooks')
-			->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
-		$propQuery->selectDistinct('cardid')
-			->from('cards_properties')
-			->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($propOr)
-			->groupBy('cardid');
-		$cardQuery->select('carddata')
-			->from('cards')
-			->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->setMaxResults(1);
-		$result = $cardQuery->execute();
-		/** @var string|resource|false $card */
-		$card = $result->fetchOne();
+        $propOr = $propQuery->expr()->orX();
+        if ($uid !== null) {
+            $propOr->add($propQuery->expr()->andX(
+                $propQuery->expr()->eq('name', $cardQuery->createNamedParameter('UID')),
+                $propQuery->expr()->eq('value', $cardQuery->createNamedParameter($uid))
+            ));
+        }
+        if ($email !== null) {
+            $propOr->add($propQuery->expr()->andX(
+                $propQuery->expr()->eq('name', $cardQuery->createNamedParameter('EMAIL')),
+                $propQuery->expr()->eq('value', $cardQuery->createNamedParameter($email))
+            ));
+        }
+        if ($cloudId !== null) {
+            $propOr->add($propQuery->expr()->andX(
+                $propQuery->expr()->eq('name', $cardQuery->createNamedParameter('CLOUD')),
+                $propQuery->expr()->eq('value', $cardQuery->createNamedParameter($cloudId))
+            ));
+        }
+        $addressbooksQuery->selectDistinct('id')
+            ->from('addressbooks')
+            ->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
+        $propQuery->selectDistinct('cardid')
+            ->from('cards_properties')
+            ->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
+            ->andWhere($propOr)
+            ->groupBy('cardid');
+        $cardQuery->select('carddata')
+            ->from('cards')
+            ->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
+            ->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
+            ->setMaxResults(1);
+        $result = $cardQuery->execute();
+        /** @var string|resource|false $card */
+        $card = $result->fetchOne();
 
-		if ($card === false) {
-			return null;
-		}
-		if (is_resource($card)) {
-			return stream_get_contents($card);
-		}
+        if ($card === false) {
+            return null;
+        }
+        if (is_resource($card)) {
+            return stream_get_contents($card);
+        }
 
-		return $card;
-	}
+        return $card;
+    }
 }

apps/contactsinteraction/lib/Db/RecentContact.php

Indentation +14 added lines, -14 removed lines

@@ -42,19 +42,19 @@
  * @method int getLastContact()
  */
 class RecentContact extends Entity {
-	protected string $actorUid = '';
-	protected ?string $uid = null;
-	protected ?string $email = null;
-	protected ?string $federatedCloudId = null;
-	protected string $card = '';
-	protected int $lastContact = -1;
+    protected string $actorUid = '';
+    protected ?string $uid = null;
+    protected ?string $email = null;
+    protected ?string $federatedCloudId = null;
+    protected string $card = '';
+    protected int $lastContact = -1;
 
-	public function __construct() {
-		$this->addType('actorUid', 'string');
-		$this->addType('uid', 'string');
-		$this->addType('email', 'string');
-		$this->addType('federatedCloudId', 'string');
-		$this->addType('card', 'blob');
-		$this->addType('lastContact', 'int');
-	}
+    public function __construct() {
+        $this->addType('actorUid', 'string');
+        $this->addType('uid', 'string');
+        $this->addType('email', 'string');
+        $this->addType('federatedCloudId', 'string');
+        $this->addType('card', 'blob');
+        $this->addType('lastContact', 'int');
+    }
 }