nextcloud / server

apps/contactsinteraction/lib/AddressBook.php

Indentation +133 added lines, -133 removed lines

@@ -41,138 +41,138 @@
 
 class AddressBook extends ExternalAddressBook implements IACL {
 
-	public const URI = 'recent';
-
-	use ACLTrait;
-
-	/** @var RecentContactMapper */
-	private $mapper;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var string */
-	private $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
-	 */
-	function createFile($name, $data = null) {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		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) {
-		try {
-			$this->mapper->find(
-				$this->getUid(),
-				(int)$name
-			);
-			return true;
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getLastModified() {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @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,
-		];
-	}
-
-	public function getOwner(): string {
-		return $this->principalUri;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getACL() {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-		];
-	}
-
-	private function getUid(): string {
-		list(, $uid) = \Sabre\Uri\split($this->principalUri);
-		return $uid;
-	}
+    public const URI = 'recent';
+
+    use ACLTrait;
+
+    /** @var RecentContactMapper */
+    private $mapper;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var string */
+    private $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
+     */
+    function createFile($name, $data = null) {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        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) {
+        try {
+            $this->mapper->find(
+                $this->getUid(),
+                (int)$name
+            );
+            return true;
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLastModified() {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @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,
+        ];
+    }
+
+    public function getOwner(): string {
+        return $this->principalUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getACL() {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+        ];
+    }
+
+    private function getUid(): string {
+        list(, $uid) = \Sabre\Uri\split($this->principalUri);
+        return $uid;
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -87,13 +87,13 @@ 
 			return new Card(
 				$this->mapper->find(
 					$this->getUid(),
-					(int)$name
+					(int) $name
 				),
 				$this->principalUri,
 				$this->getACL()
 			);
 		} catch (DoesNotExistException $ex) {
-			throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
+			throw new NotFound("Contact does not exist: ".$ex->getMessage(), 0, $ex);
 		}
 	}
 
@@ -102,7 +102,7 @@ 
 	 */
 	public function getChildren(): array {
 		return array_map(
-			function (RecentContact $contact) {
+			function(RecentContact $contact) {
 				return new Card(
 					$contact,
 					$this->principalUri,
@@ -120,7 +120,7 @@ 
 		try {
 			$this->mapper->find(
 				$this->getUid(),
-				(int)$name
+				(int) $name
 			);
 			return true;
 		} catch (DoesNotExistException $e) {
@@ -149,7 +149,7 @@ 
 		return [
 			'principaluri' => $this->principalUri,
 			'{DAV:}displayname' => $this->l10n->t('Recently contacted'),
-			'{' . Plugin::NS_OWNCLOUD . '}read-only' => true,
+			'{'.Plugin::NS_OWNCLOUD.'}read-only' => true,
 		];
 	}
 

apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php

Indentation +13 added lines, -13 removed lines

@@ -31,22 +31,22 @@
 
 class CleanupJob extends TimedJob {
 
-	/** @var RecentContactMapper */
-	private $mapper;
+    /** @var RecentContactMapper */
+    private $mapper;
 
-	public function __construct(ITimeFactory $time,
-								RecentContactMapper $mapper) {
-		parent::__construct($time);
+    public function __construct(ITimeFactory $time,
+                                RecentContactMapper $mapper) {
+        parent::__construct($time);
 
-		$this->setInterval(12 * 60 * 60);
+        $this->setInterval(12 * 60 * 60);
 
-		$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/Migration/Version010000Date20200304152605.php

Indentation +54 added lines, -54 removed lines

@@ -33,61 +33,61 @@
 
 class Version010000Date20200304152605 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return 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 ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable(RecentContactMapper::TABLE_NAME);
-		$table->addColumn('id', 'integer', [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->addColumn('actor_uid', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('uid', 'string', [
-			'notnull' => false,
-			'length' => 64,
-		]);
-		$table->addColumn('email', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('federated_cloud_id', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('card', 'blob', [
-			'notnull' => true,
-		]);
-		$table->addColumn('last_contact', 'integer', [
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->setPrimaryKey(['id']);
-		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
-		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
-		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
-		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
-		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
-		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+        $table = $schema->createTable(RecentContactMapper::TABLE_NAME);
+        $table->addColumn('id', 'integer', [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->addColumn('actor_uid', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('uid', 'string', [
+            'notnull' => false,
+            'length' => 64,
+        ]);
+        $table->addColumn('email', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('federated_cloud_id', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('card', 'blob', [
+            'notnull' => true,
+        ]);
+        $table->addColumn('last_contact', 'integer', [
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->setPrimaryKey(['id']);
+        // To find all recent entries
+        $table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+        // To find a specific entry
+        $table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+        // To find all recent entries with a given UID
+        $table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+        // To find all recent entries with a given email address
+        $table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+        // To find all recent entries with a give federated cloud id
+        $table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+        // For the cleanup
+        $table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
 
-		return $schema;
-	}
+        return $schema;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -75,17 +75,17 @@
 		]);
 		$table->setPrimaryKey(['id']);
 		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME.'_actor_uid');
 		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME.'_id_uid');
 		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME.'_uid');
 		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME.'_email');
 		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME.'_fed_id');
 		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME.'_last_contact');
 
 		return $schema;
 	}

apps/contactsinteraction/lib/AppInfo/Application.php

Indentation +8 added lines, -8 removed lines

@@ -37,16 +37,16 @@
 
 class Application extends App {
 
-	public const APP_ID = 'contactsinteraction';
+    public const APP_ID = 'contactsinteraction';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
+    public function __construct() {
+        parent::__construct(self::APP_ID);
 
-		$this->registerListeners($this->getContainer()->query(IEventDispatcher::class));
-	}
+        $this->registerListeners($this->getContainer()->query(IEventDispatcher::class));
+    }
 
-	private function registerListeners(IEventDispatcher $dispatcher): void {
-		$dispatcher->addServiceListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
-	}
+    private function registerListeners(IEventDispatcher $dispatcher): void {
+        $dispatcher->addServiceListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
+    }
 
 }

apps/contactsinteraction/lib/Card.php

Indentation +100 added lines, -100 removed lines

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

apps/contactsinteraction/lib/Db/RecentContact.php

Indentation +20 added lines, -20 removed lines

@@ -43,31 +43,31 @@
  */
 class RecentContact extends Entity {
 
-	/** @var string */
-	protected $actorUid;
+    /** @var string */
+    protected $actorUid;
 
-	/** @var string|null */
-	protected $uid;
+    /** @var string|null */
+    protected $uid;
 
-	/** @var string|null */
-	protected $email;
+    /** @var string|null */
+    protected $email;
 
-	/** @var string|null */
-	protected $federatedCloudId;
+    /** @var string|null */
+    protected $federatedCloudId;
 
-	/** @var string */
-	protected $card;
+    /** @var string */
+    protected $card;
 
-	/** @var int */
-	protected $lastContact;
+    /** @var int */
+    protected $lastContact;
 
-	public function __construct() {
-		$this->addType('actorUid', 'string');
-		$this->addType('uid', 'string');
-		$this->addType('email', 'string');
-		$this->addType('federatedCloudId', 'string');
-		$this->addType('card', 'string');
-		$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', 'string');
+        $this->addType('lastContact', 'int');
+    }
 
 }

apps/contactsinteraction/lib/Db/CardSearchDao.php

Indentation +52 added lines, -52 removed lines

@@ -31,62 +31,62 @@
 
 class CardSearchDao {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $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|false $card */
-		$card = $result->fetchColumn(0);
+        $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|false $card */
+        $card = $result->fetchColumn(0);
 
-		if ($card === false) {
-			return null;
-		}
+        if ($card === false) {
+            return null;
+        }
 
-		return $card;
-	}
+        return $card;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		}
 		$addressbooksQuery->selectDistinct('id')
 			->from('addressbooks')
-			->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
+			->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))

apps/contactsinteraction/lib/Db/RecentContactMapper.php

Indentation +82 added lines, -82 removed lines

@@ -32,87 +32,87 @@
 
 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);
-	}
-
-	/**
-	 * @param string $uid
-	 * @param int $id
-	 *
-	 * @return RecentContact
-	 * @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);
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $uid
-	 * @param string|null $email
-	 * @param string|null $cloudId
-	 *
-	 * @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 cleanUp(int $olderThan): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$delete = $qb
-			->delete($this->getTableName())
-			->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
-
-		$delete->execute();
-	}
+    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);
+    }
+
+    /**
+     * @param string $uid
+     * @param int $id
+     *
+     * @return RecentContact
+     * @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);
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $uid
+     * @param string|null $email
+     * @param string|null $cloudId
+     *
+     * @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 cleanUp(int $olderThan): void {
+        $qb = $this->db->getQueryBuilder();
+
+        $delete = $qb
+            ->delete($this->getTableName())
+            ->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
+
+        $delete->execute();
+    }
 
 }

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

Indentation +125 added lines, -125 removed lines

@@ -42,130 +42,130 @@
 
 class ContactInteractionListener implements IEventListener {
 
-	/** @var RecentContactMapper */
-	private $mapper;
-
-	/** @var CardSearchDao */
-	private $cardSearchDao;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(RecentContactMapper $mapper,
-								CardSearchDao $cardSearchDao,
-								IUserManager $userManager,
-								ITimeFactory $timeFactory,
-								IL10N $l10nFactory,
-								ILogger $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;
-		}
-
-		$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->logException($e, [
-					'message' => 'Could not parse card to add recent category: ' . $e->getMessage(),
-					'level' => ILogger::WARN,
-				]);
-				$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->getUid() !== null) {
-			$props['X-NEXTCLOUD-UID'] = $contact->getUid();
-		}
-		if ($contact->getEmail() !== null) {
-			$props['EMAIL'] = $contact->getEmail();
-		}
-		if ($contact->getFederatedCloudId() !== null) {
-			$props['CLOUD'] = $contact->getFederatedCloudId();
-		}
-
-		return (new VCard($props))->serialize();
-	}
+    /** @var RecentContactMapper */
+    private $mapper;
+
+    /** @var CardSearchDao */
+    private $cardSearchDao;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(RecentContactMapper $mapper,
+                                CardSearchDao $cardSearchDao,
+                                IUserManager $userManager,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10nFactory,
+                                ILogger $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;
+        }
+
+        $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->logException($e, [
+                    'message' => 'Could not parse card to add recent category: ' . $e->getMessage(),
+                    'level' => ILogger::WARN,
+                ]);
+                $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->getUid() !== null) {
+            $props['X-NEXTCLOUD-UID'] = $contact->getUid();
+        }
+        if ($contact->getEmail() !== null) {
+            $props['EMAIL'] = $contact->getEmail();
+        }
+        if ($contact->getFederatedCloudId() !== null) {
+            $props['CLOUD'] = $contact->getFederatedCloudId();
+        }
+
+        return (new VCard($props))->serialize();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 				$contact->setCard($parsed->serialize());
 			} catch (Throwable $e) {
 				$this->logger->logException($e, [
-					'message' => 'Could not parse card to add recent category: ' . $e->getMessage(),
+					'message' => 'Could not parse card to add recent category: '.$e->getMessage(),
 					'level' => ILogger::WARN,
 				]);
 				$contact->setCard($copy);