nextcloud / server

apps/dav/lib/CardDAV/Activity/Filter.php

Indentation +47 added lines, -47 removed lines

@@ -29,59 +29,59 @@
 
 class Filter implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 */
-	public function getIdentifier(): string {
-		return 'contacts';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     */
+    public function getIdentifier(): string {
+        return 'contacts';
+    }
 
-	/**
-	 * @return string A translated string
-	 */
-	public function getName(): string {
-		return $this->l->t('Contacts');
-	}
+    /**
+     * @return string A translated string
+     */
+    public function getName(): string {
+        return $this->l->t('Contacts');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 */
-	public function getPriority(): int {
-		return 40;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     */
+    public function getPriority(): int {
+        return 40;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 */
-	public function getIcon(): string {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     */
+    public function getIcon(): string {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 */
-	public function filterTypes(array $types): array {
-		return array_intersect(['contacts'], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     */
+    public function filterTypes(array $types): array {
+        return array_intersect(['contacts'], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 */
-	public function allowedApps(): array {
-		return [];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     */
+    public function allowedApps(): array {
+        return [];
+    }
 }

apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php

Indentation +153 added lines, -153 removed lines

@@ -35,157 +35,157 @@
 use OCP\L10N\IFactory;
 
 class Addressbook extends Base {
-	public const SUBJECT_ADD = 'addressbook_add';
-	public const SUBJECT_UPDATE = 'addressbook_update';
-	public const SUBJECT_DELETE = 'addressbook_delete';
-	public const SUBJECT_SHARE_USER = 'addressbook_user_share';
-	public const SUBJECT_SHARE_GROUP = 'addressbook_group_share';
-	public const SUBJECT_UNSHARE_USER = 'addressbook_user_unshare';
-	public const SUBJECT_UNSHARE_GROUP = 'addressbook_group_unshare';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								IEventMerger $eventMerger) {
-		parent::__construct($userManager, $groupManager, $url);
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'addressbook') {
-			throw new \InvalidArgumentException();
-		}
-
-		$l = $this->languageFactory->get('dav', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_ADD) {
-			$subject = $l->t('{actor} created addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
-			$subject = $l->t('You created addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
-			$subject = $l->t('{actor} deleted addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
-			$subject = $l->t('You deleted addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
-			$subject = $l->t('{actor} updated addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
-			$subject = $l->t('You updated addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
-			$subject = $l->t('{actor} shared addressbook {addressbook} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
-			$subject = $l->t('You shared addressbook {addressbook} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
-			$subject = $l->t('{actor} shared addressbook {addressbook} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
-			$subject = $l->t('{actor} unshared addressbook {addressbook} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
-			$subject = $l->t('You unshared addressbook {addressbook} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
-			$subject = $l->t('{actor} unshared addressbook {addressbook} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
-			$subject = $l->t('{actor} unshared addressbook {addressbook} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
-			$subject = $l->t('You shared addressbook {addressbook} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
-			$subject = $l->t('{actor} shared addressbook {addressbook} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
-			$subject = $l->t('You unshared addressbook {addressbook} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
-			$subject = $l->t('{actor} unshared addressbook {addressbook} from group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event, $l);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('addressbook', $event, $previousEvent);
-
-		if ($event->getChildEvent() === null) {
-			if (isset($parsedParameters['user'])) {
-				// Couldn't group by calendar, maybe we can group by users
-				$event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-			} elseif (isset($parsedParameters['group'])) {
-				// Couldn't group by calendar, maybe we can group by groups
-				$event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
-			}
-		}
-
-		return $event;
-	}
-
-	protected function getParameters(IEvent $event, IL10N $l): array {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
-			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
-			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
-			case self::SUBJECT_SHARE_USER:
-			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
-				return [
-					'actor' => $this->generateUserParameter($parameters['actor']),
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
-				return [
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-					'user' => $this->generateUserParameter($parameters['user']),
-				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
-				return [
-					'actor' => $this->generateUserParameter($parameters['actor']),
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-					'user' => $this->generateUserParameter($parameters['user']),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
-				return [
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-					'group' => $this->generateGroupParameter($parameters['group']),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
-				return [
-					'actor' => $this->generateUserParameter($parameters['actor']),
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-					'group' => $this->generateGroupParameter($parameters['group']),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    public const SUBJECT_ADD = 'addressbook_add';
+    public const SUBJECT_UPDATE = 'addressbook_update';
+    public const SUBJECT_DELETE = 'addressbook_delete';
+    public const SUBJECT_SHARE_USER = 'addressbook_user_share';
+    public const SUBJECT_SHARE_GROUP = 'addressbook_group_share';
+    public const SUBJECT_UNSHARE_USER = 'addressbook_user_unshare';
+    public const SUBJECT_UNSHARE_GROUP = 'addressbook_group_unshare';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IEventMerger $eventMerger) {
+        parent::__construct($userManager, $groupManager, $url);
+        $this->languageFactory = $languageFactory;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'addressbook') {
+            throw new \InvalidArgumentException();
+        }
+
+        $l = $this->languageFactory->get('dav', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_ADD) {
+            $subject = $l->t('{actor} created addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+            $subject = $l->t('You created addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE) {
+            $subject = $l->t('{actor} deleted addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+            $subject = $l->t('You deleted addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
+            $subject = $l->t('{actor} updated addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+            $subject = $l->t('You updated addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
+            $subject = $l->t('{actor} shared addressbook {addressbook} with you');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+            $subject = $l->t('You shared addressbook {addressbook} with {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+            $subject = $l->t('{actor} shared addressbook {addressbook} with {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
+            $subject = $l->t('{actor} unshared addressbook {addressbook} from you');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+            $subject = $l->t('You unshared addressbook {addressbook} from {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+            $subject = $l->t('{actor} unshared addressbook {addressbook} from {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+            $subject = $l->t('{actor} unshared addressbook {addressbook} from themselves');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+            $subject = $l->t('You shared addressbook {addressbook} with group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+            $subject = $l->t('{actor} shared addressbook {addressbook} with group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+            $subject = $l->t('You unshared addressbook {addressbook} from group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+            $subject = $l->t('{actor} unshared addressbook {addressbook} from group {group}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event, $l);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('addressbook', $event, $previousEvent);
+
+        if ($event->getChildEvent() === null) {
+            if (isset($parsedParameters['user'])) {
+                // Couldn't group by calendar, maybe we can group by users
+                $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+            } elseif (isset($parsedParameters['group'])) {
+                // Couldn't group by calendar, maybe we can group by groups
+                $event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
+            }
+        }
+
+        return $event;
+    }
+
+    protected function getParameters(IEvent $event, IL10N $l): array {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_ADD:
+            case self::SUBJECT_ADD . '_self':
+            case self::SUBJECT_DELETE:
+            case self::SUBJECT_DELETE . '_self':
+            case self::SUBJECT_UPDATE:
+            case self::SUBJECT_UPDATE . '_self':
+            case self::SUBJECT_SHARE_USER:
+            case self::SUBJECT_UNSHARE_USER:
+            case self::SUBJECT_UNSHARE_USER . '_self':
+                return [
+                    'actor' => $this->generateUserParameter($parameters['actor']),
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                ];
+            case self::SUBJECT_SHARE_USER . '_you':
+            case self::SUBJECT_UNSHARE_USER . '_you':
+                return [
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                    'user' => $this->generateUserParameter($parameters['user']),
+                ];
+            case self::SUBJECT_SHARE_USER . '_by':
+            case self::SUBJECT_UNSHARE_USER . '_by':
+                return [
+                    'actor' => $this->generateUserParameter($parameters['actor']),
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                    'user' => $this->generateUserParameter($parameters['user']),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_you':
+            case self::SUBJECT_UNSHARE_GROUP . '_you':
+                return [
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                    'group' => $this->generateGroupParameter($parameters['group']),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_by':
+            case self::SUBJECT_UNSHARE_GROUP . '_by':
+                return [
+                    'actor' => $this->generateUserParameter($parameters['actor']),
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                    'group' => $this->generateGroupParameter($parameters['group']),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

Spacing +24 added lines, -24 removed lines

@@ -86,37 +86,37 @@ 
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $l->t('{actor} created addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $l->t('You created addressbook {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $l->t('{actor} deleted addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $l->t('You deleted addressbook {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $l->t('{actor} updated addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $l->t('You updated addressbook {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
 			$subject = $l->t('{actor} shared addressbook {addressbook} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
 			$subject = $l->t('You shared addressbook {addressbook} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
 			$subject = $l->t('{actor} shared addressbook {addressbook} with {user}');
 		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
 			$subject = $l->t('{actor} unshared addressbook {addressbook} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
 			$subject = $l->t('You unshared addressbook {addressbook} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
 			$subject = $l->t('{actor} unshared addressbook {addressbook} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
 			$subject = $l->t('{actor} unshared addressbook {addressbook} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
 			$subject = $l->t('You shared addressbook {addressbook} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
 			$subject = $l->t('{actor} shared addressbook {addressbook} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
 			$subject = $l->t('You unshared addressbook {addressbook} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
 			$subject = $l->t('{actor} unshared addressbook {addressbook} from group {group}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -146,39 +146,39 @@ 
 
 		switch ($subject) {
 			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
+			case self::SUBJECT_ADD.'_self':
 			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
+			case self::SUBJECT_DELETE.'_self':
 			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
+			case self::SUBJECT_UPDATE.'_self':
 			case self::SUBJECT_SHARE_USER:
 			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
+			case self::SUBJECT_UNSHARE_USER.'_self':
 				return [
 					'actor' => $this->generateUserParameter($parameters['actor']),
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
+			case self::SUBJECT_SHARE_USER.'_you':
+			case self::SUBJECT_UNSHARE_USER.'_you':
 				return [
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'user' => $this->generateUserParameter($parameters['user']),
 				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
+			case self::SUBJECT_SHARE_USER.'_by':
+			case self::SUBJECT_UNSHARE_USER.'_by':
 				return [
 					'actor' => $this->generateUserParameter($parameters['actor']),
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'user' => $this->generateUserParameter($parameters['user']),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
+			case self::SUBJECT_SHARE_GROUP.'_you':
+			case self::SUBJECT_UNSHARE_GROUP.'_you':
 				return [
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'group' => $this->generateGroupParameter($parameters['group']),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
+			case self::SUBJECT_SHARE_GROUP.'_by':
+			case self::SUBJECT_UNSHARE_GROUP.'_by':
 				return [
 					'actor' => $this->generateUserParameter($parameters['actor']),
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),

apps/dav/lib/CardDAV/Activity/Provider/Base.php

Indentation +116 added lines, -116 removed lines

@@ -37,120 +37,120 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[]  */
-	protected $userDisplayNames = [];
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $groupDisplayNames = [];
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	public function __construct(IUserManager $userManager,
-								IGroupManager $groupManager,
-								IURLGenerator $urlGenerator) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->url = $urlGenerator;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array $data
-	 * @param IL10N $l
-	 * @return array
-	 */
-	protected function generateAddressbookParameter(array $data, IL10N $l): array {
-		if ($data['uri'] === CardDavBackend::PERSONAL_ADDRESSBOOK_URI &&
-			$data['name'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME) {
-			return [
-				'type' => 'addressbook',
-				'id' => $data['id'],
-				'name' => $l->t('Personal'),
-			];
-		}
-
-		return [
-			'type' => 'addressbook',
-			'id' => $data['id'],
-			'name' => $data['name'],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter(string $uid): array {
-		if (!isset($this->userDisplayNames[$uid])) {
-			$this->userDisplayNames[$uid] = $this->getUserDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userDisplayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getUserDisplayName(string $uid): string {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		}
-		return $uid;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return array
-	 */
-	protected function generateGroupParameter(string $gid): array {
-		if (!isset($this->groupDisplayNames[$gid])) {
-			$this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
-		}
-
-		return [
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $this->groupDisplayNames[$gid],
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupDisplayName(string $gid): string {
-		$group = $this->groupManager->get($gid);
-		if ($group instanceof IGroup) {
-			return $group->getDisplayName();
-		}
-		return $gid;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[]  */
+    protected $userDisplayNames = [];
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $groupDisplayNames = [];
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IURLGenerator $urlGenerator) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->url = $urlGenerator;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array $data
+     * @param IL10N $l
+     * @return array
+     */
+    protected function generateAddressbookParameter(array $data, IL10N $l): array {
+        if ($data['uri'] === CardDavBackend::PERSONAL_ADDRESSBOOK_URI &&
+            $data['name'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME) {
+            return [
+                'type' => 'addressbook',
+                'id' => $data['id'],
+                'name' => $l->t('Personal'),
+            ];
+        }
+
+        return [
+            'type' => 'addressbook',
+            'id' => $data['id'],
+            'name' => $data['name'],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter(string $uid): array {
+        if (!isset($this->userDisplayNames[$uid])) {
+            $this->userDisplayNames[$uid] = $this->getUserDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userDisplayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getUserDisplayName(string $uid): string {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        }
+        return $uid;
+    }
+
+    /**
+     * @param string $gid
+     * @return array
+     */
+    protected function generateGroupParameter(string $gid): array {
+        if (!isset($this->groupDisplayNames[$gid])) {
+            $this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
+        }
+
+        return [
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $this->groupDisplayNames[$gid],
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupDisplayName(string $gid): string {
+        $group = $this->groupManager->get($gid);
+        if ($group instanceof IGroup) {
+            return $group->getDisplayName();
+        }
+        return $gid;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			$replacements[] = $parameter['name'];
 		}
 

apps/dav/lib/CardDAV/Activity/Provider/Card.php

Indentation +105 added lines, -105 removed lines

@@ -36,109 +36,109 @@
 use OCP\L10N\IFactory;
 
 class Card extends Base {
-	public const SUBJECT_ADD = 'card_add';
-	public const SUBJECT_UPDATE = 'card_update';
-	public const SUBJECT_DELETE = 'card_delete';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								IEventMerger $eventMerger,
-								IAppManager $appManager) {
-		parent::__construct($userManager, $groupManager, $url);
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'card') {
-			throw new \InvalidArgumentException();
-		}
-
-		$l = $this->languageFactory->get('dav', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_ADD) {
-			$subject = $l->t('{actor} created contact {card} in addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
-			$subject = $l->t('You created contact {card} in addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
-			$subject = $l->t('{actor} deleted contact {card} from addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
-			$subject = $l->t('You deleted contact {card} from addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
-			$subject = $l->t('{actor} updated contact {card} in addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
-			$subject = $l->t('You updated contact {card} in addressbook {addressbook}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event, $l);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('card', $event, $previousEvent);
-		return $event;
-	}
-
-	protected function getParameters(IEvent $event, IL10N $l): array {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_ADD:
-			case self::SUBJECT_DELETE:
-			case self::SUBJECT_UPDATE:
-				return [
-					'actor' => $this->generateUserParameter($parameters['actor']),
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-					'card' => $this->generateCardParameter($parameters['card']),
-				];
-			case self::SUBJECT_ADD . '_self':
-			case self::SUBJECT_DELETE . '_self':
-			case self::SUBJECT_UPDATE . '_self':
-				return [
-					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
-					'card' => $this->generateCardParameter($parameters['card']),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
-
-	private function generateCardParameter(array $cardData): array {
-		return [
-			'type' => 'addressbook-contact',
-			'id' => $cardData['id'],
-			'name' => $cardData['name'],
-		];
-	}
+    public const SUBJECT_ADD = 'card_add';
+    public const SUBJECT_UPDATE = 'card_update';
+    public const SUBJECT_DELETE = 'card_delete';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IEventMerger $eventMerger,
+                                IAppManager $appManager) {
+        parent::__construct($userManager, $groupManager, $url);
+        $this->languageFactory = $languageFactory;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'card') {
+            throw new \InvalidArgumentException();
+        }
+
+        $l = $this->languageFactory->get('dav', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_ADD) {
+            $subject = $l->t('{actor} created contact {card} in addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+            $subject = $l->t('You created contact {card} in addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE) {
+            $subject = $l->t('{actor} deleted contact {card} from addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+            $subject = $l->t('You deleted contact {card} from addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
+            $subject = $l->t('{actor} updated contact {card} in addressbook {addressbook}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+            $subject = $l->t('You updated contact {card} in addressbook {addressbook}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event, $l);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('card', $event, $previousEvent);
+        return $event;
+    }
+
+    protected function getParameters(IEvent $event, IL10N $l): array {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_ADD:
+            case self::SUBJECT_DELETE:
+            case self::SUBJECT_UPDATE:
+                return [
+                    'actor' => $this->generateUserParameter($parameters['actor']),
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                    'card' => $this->generateCardParameter($parameters['card']),
+                ];
+            case self::SUBJECT_ADD . '_self':
+            case self::SUBJECT_DELETE . '_self':
+            case self::SUBJECT_UPDATE . '_self':
+                return [
+                    'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
+                    'card' => $this->generateCardParameter($parameters['card']),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    private function generateCardParameter(array $cardData): array {
+        return [
+            'type' => 'addressbook-contact',
+            'id' => $cardData['id'],
+            'name' => $cardData['name'],
+        ];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -88,15 +88,15 @@ 
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $l->t('{actor} created contact {card} in addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $l->t('You created contact {card} in addressbook {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $l->t('{actor} deleted contact {card} from addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $l->t('You deleted contact {card} from addressbook {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $l->t('{actor} updated contact {card} in addressbook {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $l->t('You updated contact {card} in addressbook {addressbook}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -122,9 +122,9 @@ 
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'card' => $this->generateCardParameter($parameters['card']),
 				];
-			case self::SUBJECT_ADD . '_self':
-			case self::SUBJECT_DELETE . '_self':
-			case self::SUBJECT_UPDATE . '_self':
+			case self::SUBJECT_ADD.'_self':
+			case self::SUBJECT_DELETE.'_self':
+			case self::SUBJECT_UPDATE.'_self':
 				return [
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'card' => $this->generateCardParameter($parameters['card']),

apps/dav/lib/CardDAV/Activity/Setting.php

Indentation +44 added lines, -44 removed lines

@@ -28,54 +28,54 @@
 use OCA\DAV\CalDAV\Activity\Setting\CalDAVSetting;
 
 class Setting extends CalDAVSetting {
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 */
-	public function getIdentifier(): string {
-		return 'contacts';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     */
+    public function getIdentifier(): string {
+        return 'contacts';
+    }
 
-	/**
-	 * @return string A translated string
-	 */
-	public function getName(): string {
-		return $this->l->t('A <strong>contact</strong> or <strong>addressbook</strong> was modified');
-	}
+    /**
+     * @return string A translated string
+     */
+    public function getName(): string {
+        return $this->l->t('A <strong>contact</strong> or <strong>addressbook</strong> was modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 */
-	public function getPriority(): int {
-		return 50;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     */
+    public function getPriority(): int {
+        return 50;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 */
-	public function canChangeStream(): bool {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     */
+    public function canChangeStream(): bool {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 */
-	public function isDefaultEnabledStream(): bool {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     */
+    public function isDefaultEnabledStream(): bool {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 */
-	public function canChangeMail(): bool {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     */
+    public function canChangeMail(): bool {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 */
-	public function isDefaultEnabledMail(): bool {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     */
+    public function isDefaultEnabledMail(): bool {
+        return false;
+    }
 }

apps/dav/lib/CardDAV/Activity/Backend.php

Indentation +441 added lines, -441 removed lines

@@ -41,445 +41,445 @@
 
 class Backend {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	public function __construct(IActivityManager $activityManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								IAppManager $appManager) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * Creates activities when an addressbook was creates
-	 *
-	 * @param array $addressbookData
-	 */
-	public function onAddressbookCreate(array $addressbookData): void {
-		$this->triggerAddressbookActivity(Addressbook::SUBJECT_ADD, $addressbookData);
-	}
-
-	/**
-	 * Creates activities when a calendar was updated
-	 *
-	 * @param array $addressbookData
-	 * @param array $shares
-	 * @param array $properties
-	 */
-	public function onAddressbookUpdate(array $addressbookData, array $shares, array $properties): void {
-		$this->triggerAddressbookActivity(Addressbook::SUBJECT_UPDATE, $addressbookData, $shares, $properties);
-	}
-
-	/**
-	 * Creates activities when a calendar was deleted
-	 *
-	 * @param array $addressbookData
-	 * @param array $shares
-	 */
-	public function onAddressbookDelete(array $addressbookData, array $shares): void {
-		$this->triggerAddressbookActivity(Addressbook::SUBJECT_DELETE, $addressbookData, $shares);
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was touched
-	 *
-	 * @param string $action
-	 * @param array $addressbookData
-	 * @param array $shares
-	 * @param array $changedProperties
-	 */
-	protected function triggerAddressbookActivity(string $action, array $addressbookData, array $shares = [], array $changedProperties = []): void {
-		if (!isset($addressbookData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $addressbookData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('addressbook', (int) $addressbookData['id'])
-			->setType('addressbook')
-			->setAuthor($currentUser);
-
-		$changedVisibleInformation = array_intersect([
-			'{DAV:}displayname',
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
-		], array_keys($changedProperties));
-
-		if (empty($shares) || ($action === Addressbook::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
-			$users = [$owner];
-		} else {
-			$users = $this->getUsersForShares($shares);
-			$users[] = $owner;
-		}
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						'actor' => $currentUser,
-						'addressbook' => [
-							'id' => (int) $addressbookData['id'],
-							'uri' => $addressbookData['uri'],
-							'name' => $addressbookData['{DAV:}displayname'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * Creates activities for all related users when an addressbook was (un-)shared
-	 *
-	 * @param array $addressbookData
-	 * @param array $shares
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function onAddressbookUpdateShares(array $addressbookData, array $shares, array $add, array $remove): void {
-		$principal = explode('/', $addressbookData['principaluri']);
-		$owner = $principal[2];
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('addressbook', (int) $addressbookData['id'])
-			->setType('addressbook')
-			->setAuthor($currentUser);
-
-		foreach ($remove as $principal) {
-			// principal:principals/users/test
-			$parts = explode(':', $principal, 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser(
-					$principal[2],
-					$event,
-					$addressbookData,
-					Addressbook::SUBJECT_UNSHARE_USER,
-					Addressbook::SUBJECT_DELETE . '_self'
-				);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'addressbook' => [
-							'id' => (int) $addressbookData['id'],
-							'uri' => $addressbookData['uri'],
-							'name' => $addressbookData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Addressbook::SUBJECT_UNSHARE_USER . '_you';
-					} elseif ($principal[2] === $event->getAuthor()) {
-						$subject = Addressbook::SUBJECT_UNSHARE_USER . '_self';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Addressbook::SUBJECT_UNSHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Addressbook::SUBJECT_UNSHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} elseif ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $addressbookData, Addressbook::SUBJECT_UNSHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'addressbook' => [
-						'id' => (int) $addressbookData['id'],
-						'uri' => $addressbookData['uri'],
-						'name' => $addressbookData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Addressbook::SUBJECT_UNSHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Addressbook::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Addressbook::SUBJECT_UNSHARE_GROUP . '_by';
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-
-		foreach ($add as $share) {
-			if ($this->isAlreadyShared($share['href'], $shares)) {
-				continue;
-			}
-
-			// principal:principals/users/test
-			$parts = explode(':', $share['href'], 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser($principal[2], $event, $addressbookData, Addressbook::SUBJECT_SHARE_USER);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'addressbook' => [
-							'id' => (int) $addressbookData['id'],
-							'uri' => $addressbookData['uri'],
-							'name' => $addressbookData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Addressbook::SUBJECT_SHARE_USER . '_you';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Addressbook::SUBJECT_SHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Addressbook::SUBJECT_SHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} elseif ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $addressbookData, Addressbook::SUBJECT_SHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'addressbook' => [
-						'id' => (int) $addressbookData['id'],
-						'uri' => $addressbookData['uri'],
-						'name' => $addressbookData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Addressbook::SUBJECT_SHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Addressbook::SUBJECT_SHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Addressbook::SUBJECT_SHARE_GROUP . '_by';
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-	}
-
-	/**
-	 * Checks if a calendar is already shared with a principal
-	 *
-	 * @param string $principal
-	 * @param array[] $shares
-	 * @return bool
-	 */
-	protected function isAlreadyShared(string $principal, array $shares): bool {
-		foreach ($shares as $share) {
-			if ($principal === $share['href']) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates the given activity for all members of the given group
-	 *
-	 * @param string $gid
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 */
-	protected function triggerActivityGroup(string $gid, IEvent $event, array $properties, string $subject): void {
-		$group = $this->groupManager->get($gid);
-
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				// Exclude current user
-				if ($user->getUID() !== $event->getAuthor()) {
-					$this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Creates the given activity for the given user
-	 *
-	 * @param string $user
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 * @param string $subjectSelf
-	 */
-	protected function triggerActivityUser(string $user, IEvent $event, array $properties, string $subject, string $subjectSelf = ''): void {
-		$event->setAffectedUser($user)
-			->setSubject(
-				$user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
-				[
-					'actor' => $event->getAuthor(),
-					'addressbook' => [
-						'id' => (int) $properties['id'],
-						'uri' => $properties['uri'],
-						'name' => $properties['{DAV:}displayname'],
-					],
-				]
-			);
-
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * Creates activities when a card was created/updated/deleted
-	 *
-	 * @param string $action
-	 * @param array $addressbookData
-	 * @param array $shares
-	 * @param array $cardData
-	 */
-	public function triggerCardActivity(string $action, array $addressbookData, array $shares, array $cardData): void {
-		if (!isset($addressbookData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $addressbookData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$card = $this->getCardNameAndId($cardData);
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('addressbook', (int) $addressbookData['id'])
-			->setType('card')
-			->setAuthor($currentUser);
-
-		$users = $this->getUsersForShares($shares);
-		$users[] = $owner;
-
-		// Users for share can return the owner itself if the calendar is published
-		foreach (array_unique($users) as $user) {
-			$params = [
-				'actor' => $event->getAuthor(),
-				'addressbook' => [
-					'id' => (int) $addressbookData['id'],
-					'uri' => $addressbookData['uri'],
-					'name' => $addressbookData['{DAV:}displayname'],
-				],
-				'card' => [
-					'id' => $card['id'],
-					'name' => $card['name'],
-				],
-			];
-
-
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					$params
-				);
-
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * @param array $cardData
-	 * @return string[]
-	 */
-	protected function getCardNameAndId(array $cardData): array {
-		$vObject = Reader::read($cardData['carddata']);
-		return ['id' => (string) $vObject->UID, 'name' => (string) ($vObject->FN ?? '')];
-	}
-
-	/**
-	 * Get all users that have access to a given calendar
-	 *
-	 * @param array $shares
-	 * @return string[]
-	 */
-	protected function getUsersForShares(array $shares): array {
-		$users = $groups = [];
-		foreach ($shares as $share) {
-			$principal = explode('/', $share['{http://owncloud.org/ns}principal']);
-			if ($principal[1] === 'users') {
-				$users[] = $principal[2];
-			} elseif ($principal[1] === 'groups') {
-				$groups[] = $principal[2];
-			}
-		}
-
-		if (!empty($groups)) {
-			foreach ($groups as $gid) {
-				$group = $this->groupManager->get($gid);
-				if ($group instanceof IGroup) {
-					foreach ($group->getUsers() as $user) {
-						$users[] = $user->getUID();
-					}
-				}
-			}
-		}
-
-		return array_unique($users);
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    public function __construct(IActivityManager $activityManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                IAppManager $appManager) {
+        $this->activityManager = $activityManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * Creates activities when an addressbook was creates
+     *
+     * @param array $addressbookData
+     */
+    public function onAddressbookCreate(array $addressbookData): void {
+        $this->triggerAddressbookActivity(Addressbook::SUBJECT_ADD, $addressbookData);
+    }
+
+    /**
+     * Creates activities when a calendar was updated
+     *
+     * @param array $addressbookData
+     * @param array $shares
+     * @param array $properties
+     */
+    public function onAddressbookUpdate(array $addressbookData, array $shares, array $properties): void {
+        $this->triggerAddressbookActivity(Addressbook::SUBJECT_UPDATE, $addressbookData, $shares, $properties);
+    }
+
+    /**
+     * Creates activities when a calendar was deleted
+     *
+     * @param array $addressbookData
+     * @param array $shares
+     */
+    public function onAddressbookDelete(array $addressbookData, array $shares): void {
+        $this->triggerAddressbookActivity(Addressbook::SUBJECT_DELETE, $addressbookData, $shares);
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was touched
+     *
+     * @param string $action
+     * @param array $addressbookData
+     * @param array $shares
+     * @param array $changedProperties
+     */
+    protected function triggerAddressbookActivity(string $action, array $addressbookData, array $shares = [], array $changedProperties = []): void {
+        if (!isset($addressbookData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $addressbookData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('addressbook', (int) $addressbookData['id'])
+            ->setType('addressbook')
+            ->setAuthor($currentUser);
+
+        $changedVisibleInformation = array_intersect([
+            '{DAV:}displayname',
+            '{' . Plugin::NS_CARDDAV . '}addressbook-description',
+        ], array_keys($changedProperties));
+
+        if (empty($shares) || ($action === Addressbook::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
+            $users = [$owner];
+        } else {
+            $users = $this->getUsersForShares($shares);
+            $users[] = $owner;
+        }
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        'actor' => $currentUser,
+                        'addressbook' => [
+                            'id' => (int) $addressbookData['id'],
+                            'uri' => $addressbookData['uri'],
+                            'name' => $addressbookData['{DAV:}displayname'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * Creates activities for all related users when an addressbook was (un-)shared
+     *
+     * @param array $addressbookData
+     * @param array $shares
+     * @param array $add
+     * @param array $remove
+     */
+    public function onAddressbookUpdateShares(array $addressbookData, array $shares, array $add, array $remove): void {
+        $principal = explode('/', $addressbookData['principaluri']);
+        $owner = $principal[2];
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('addressbook', (int) $addressbookData['id'])
+            ->setType('addressbook')
+            ->setAuthor($currentUser);
+
+        foreach ($remove as $principal) {
+            // principal:principals/users/test
+            $parts = explode(':', $principal, 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser(
+                    $principal[2],
+                    $event,
+                    $addressbookData,
+                    Addressbook::SUBJECT_UNSHARE_USER,
+                    Addressbook::SUBJECT_DELETE . '_self'
+                );
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'addressbook' => [
+                            'id' => (int) $addressbookData['id'],
+                            'uri' => $addressbookData['uri'],
+                            'name' => $addressbookData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Addressbook::SUBJECT_UNSHARE_USER . '_you';
+                    } elseif ($principal[2] === $event->getAuthor()) {
+                        $subject = Addressbook::SUBJECT_UNSHARE_USER . '_self';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Addressbook::SUBJECT_UNSHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Addressbook::SUBJECT_UNSHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } elseif ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $addressbookData, Addressbook::SUBJECT_UNSHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'addressbook' => [
+                        'id' => (int) $addressbookData['id'],
+                        'uri' => $addressbookData['uri'],
+                        'name' => $addressbookData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Addressbook::SUBJECT_UNSHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Addressbook::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Addressbook::SUBJECT_UNSHARE_GROUP . '_by';
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+
+        foreach ($add as $share) {
+            if ($this->isAlreadyShared($share['href'], $shares)) {
+                continue;
+            }
+
+            // principal:principals/users/test
+            $parts = explode(':', $share['href'], 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser($principal[2], $event, $addressbookData, Addressbook::SUBJECT_SHARE_USER);
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'addressbook' => [
+                            'id' => (int) $addressbookData['id'],
+                            'uri' => $addressbookData['uri'],
+                            'name' => $addressbookData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Addressbook::SUBJECT_SHARE_USER . '_you';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Addressbook::SUBJECT_SHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Addressbook::SUBJECT_SHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } elseif ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $addressbookData, Addressbook::SUBJECT_SHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'addressbook' => [
+                        'id' => (int) $addressbookData['id'],
+                        'uri' => $addressbookData['uri'],
+                        'name' => $addressbookData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Addressbook::SUBJECT_SHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Addressbook::SUBJECT_SHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Addressbook::SUBJECT_SHARE_GROUP . '_by';
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+    }
+
+    /**
+     * Checks if a calendar is already shared with a principal
+     *
+     * @param string $principal
+     * @param array[] $shares
+     * @return bool
+     */
+    protected function isAlreadyShared(string $principal, array $shares): bool {
+        foreach ($shares as $share) {
+            if ($principal === $share['href']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Creates the given activity for all members of the given group
+     *
+     * @param string $gid
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     */
+    protected function triggerActivityGroup(string $gid, IEvent $event, array $properties, string $subject): void {
+        $group = $this->groupManager->get($gid);
+
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                // Exclude current user
+                if ($user->getUID() !== $event->getAuthor()) {
+                    $this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
+                }
+            }
+        }
+    }
+
+    /**
+     * Creates the given activity for the given user
+     *
+     * @param string $user
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     * @param string $subjectSelf
+     */
+    protected function triggerActivityUser(string $user, IEvent $event, array $properties, string $subject, string $subjectSelf = ''): void {
+        $event->setAffectedUser($user)
+            ->setSubject(
+                $user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
+                [
+                    'actor' => $event->getAuthor(),
+                    'addressbook' => [
+                        'id' => (int) $properties['id'],
+                        'uri' => $properties['uri'],
+                        'name' => $properties['{DAV:}displayname'],
+                    ],
+                ]
+            );
+
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * Creates activities when a card was created/updated/deleted
+     *
+     * @param string $action
+     * @param array $addressbookData
+     * @param array $shares
+     * @param array $cardData
+     */
+    public function triggerCardActivity(string $action, array $addressbookData, array $shares, array $cardData): void {
+        if (!isset($addressbookData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $addressbookData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $card = $this->getCardNameAndId($cardData);
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('addressbook', (int) $addressbookData['id'])
+            ->setType('card')
+            ->setAuthor($currentUser);
+
+        $users = $this->getUsersForShares($shares);
+        $users[] = $owner;
+
+        // Users for share can return the owner itself if the calendar is published
+        foreach (array_unique($users) as $user) {
+            $params = [
+                'actor' => $event->getAuthor(),
+                'addressbook' => [
+                    'id' => (int) $addressbookData['id'],
+                    'uri' => $addressbookData['uri'],
+                    'name' => $addressbookData['{DAV:}displayname'],
+                ],
+                'card' => [
+                    'id' => $card['id'],
+                    'name' => $card['name'],
+                ],
+            ];
+
+
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    $params
+                );
+
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * @param array $cardData
+     * @return string[]
+     */
+    protected function getCardNameAndId(array $cardData): array {
+        $vObject = Reader::read($cardData['carddata']);
+        return ['id' => (string) $vObject->UID, 'name' => (string) ($vObject->FN ?? '')];
+    }
+
+    /**
+     * Get all users that have access to a given calendar
+     *
+     * @param array $shares
+     * @return string[]
+     */
+    protected function getUsersForShares(array $shares): array {
+        $users = $groups = [];
+        foreach ($shares as $share) {
+            $principal = explode('/', $share['{http://owncloud.org/ns}principal']);
+            if ($principal[1] === 'users') {
+                $users[] = $principal[2];
+            } elseif ($principal[1] === 'groups') {
+                $groups[] = $principal[2];
+            }
+        }
+
+        if (!empty($groups)) {
+            foreach ($groups as $gid) {
+                $group = $this->groupManager->get($gid);
+                if ($group instanceof IGroup) {
+                    foreach ($group->getUsers() as $user) {
+                        $users[] = $user->getUID();
+                    }
+                }
+            }
+        }
+
+        return array_unique($users);
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -124,7 +124,7 @@ 
 
 		$changedVisibleInformation = array_intersect([
 			'{DAV:}displayname',
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description',
 		], array_keys($changedProperties));
 
 		if (empty($shares) || ($action === Addressbook::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
@@ -137,7 +137,7 @@ 
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $currentUser,
 						'addressbook' => [
@@ -190,7 +190,7 @@ 
 					$event,
 					$addressbookData,
 					Addressbook::SUBJECT_UNSHARE_USER,
-					Addressbook::SUBJECT_DELETE . '_self'
+					Addressbook::SUBJECT_DELETE.'_self'
 				);
 
 				if ($owner !== $principal[2]) {
@@ -205,15 +205,15 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Addressbook::SUBJECT_UNSHARE_USER . '_you';
+						$subject = Addressbook::SUBJECT_UNSHARE_USER.'_you';
 					} elseif ($principal[2] === $event->getAuthor()) {
-						$subject = Addressbook::SUBJECT_UNSHARE_USER . '_self';
+						$subject = Addressbook::SUBJECT_UNSHARE_USER.'_self';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Addressbook::SUBJECT_UNSHARE_USER . '_you', $parameters);
+							->setSubject(Addressbook::SUBJECT_UNSHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Addressbook::SUBJECT_UNSHARE_USER . '_by';
+						$subject = Addressbook::SUBJECT_UNSHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -234,13 +234,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Addressbook::SUBJECT_UNSHARE_GROUP . '_you';
+					$subject = Addressbook::SUBJECT_UNSHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Addressbook::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+						->setSubject(Addressbook::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Addressbook::SUBJECT_UNSHARE_GROUP . '_by';
+					$subject = Addressbook::SUBJECT_UNSHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -276,13 +276,13 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Addressbook::SUBJECT_SHARE_USER . '_you';
+						$subject = Addressbook::SUBJECT_SHARE_USER.'_you';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Addressbook::SUBJECT_SHARE_USER . '_you', $parameters);
+							->setSubject(Addressbook::SUBJECT_SHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Addressbook::SUBJECT_SHARE_USER . '_by';
+						$subject = Addressbook::SUBJECT_SHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -303,13 +303,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Addressbook::SUBJECT_SHARE_GROUP . '_you';
+					$subject = Addressbook::SUBJECT_SHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Addressbook::SUBJECT_SHARE_GROUP . '_you', $parameters);
+						->setSubject(Addressbook::SUBJECT_SHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Addressbook::SUBJECT_SHARE_GROUP . '_by';
+					$subject = Addressbook::SUBJECT_SHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -435,7 +435,7 @@ 
 
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					$params
 				);
 

apps/dav/lib/Listener/CardListener.php

Indentation +63 added lines, -63 removed lines

@@ -36,73 +36,73 @@
 use function sprintf;
 
 class CardListener implements IEventListener {
-	/** @var ActivityBackend */
-	private $activityBackend;
+    /** @var ActivityBackend */
+    private $activityBackend;
 
-	/** @var LoggerInterface */
-	private $logger;
+    /** @var LoggerInterface */
+    private $logger;
 
-	public function __construct(ActivityBackend $activityBackend,
-								LoggerInterface $logger) {
-		$this->activityBackend = $activityBackend;
-		$this->logger = $logger;
-	}
+    public function __construct(ActivityBackend $activityBackend,
+                                LoggerInterface $logger) {
+        $this->activityBackend = $activityBackend;
+        $this->logger = $logger;
+    }
 
-	public function handle(Event $event): void {
-		if ($event instanceof CardCreatedEvent) {
-			try {
-				$this->activityBackend->triggerCardActivity(
-					Card::SUBJECT_ADD,
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getCardData()
-				);
+    public function handle(Event $event): void {
+        if ($event instanceof CardCreatedEvent) {
+            try {
+                $this->activityBackend->triggerCardActivity(
+                    Card::SUBJECT_ADD,
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getCardData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for a new card in addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CardUpdatedEvent) {
-			try {
-				$this->activityBackend->triggerCardActivity(
-					Card::SUBJECT_UPDATE,
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getCardData()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for a new card in addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook creation, so we just log it
+                $this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CardUpdatedEvent) {
+            try {
+                $this->activityBackend->triggerCardActivity(
+                    Card::SUBJECT_UPDATE,
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getCardData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for a changed card in addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CardDeletedEvent) {
-			try {
-				$this->activityBackend->triggerCardActivity(
-					Card::SUBJECT_DELETE,
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getCardData()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for a changed card in addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook update, so we just log it
+                $this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CardDeletedEvent) {
+            try {
+                $this->activityBackend->triggerCardActivity(
+                    Card::SUBJECT_DELETE,
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getCardData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for a deleted card in addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+                $this->logger->debug(
+                    sprintf('Activity generated for a deleted card in addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook deletion, so we just log it
+                $this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -81,7 +81,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a changed card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -99,7 +99,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

apps/dav/lib/Listener/AddressbookListener.php

Indentation +74 added lines, -74 removed lines

@@ -36,85 +36,85 @@
 use function sprintf;
 
 class AddressbookListener implements IEventListener {
-	/** @var ActivityBackend */
-	private $activityBackend;
+    /** @var ActivityBackend */
+    private $activityBackend;
 
-	/** @var LoggerInterface */
-	private $logger;
+    /** @var LoggerInterface */
+    private $logger;
 
-	public function __construct(ActivityBackend $activityBackend,
-								LoggerInterface $logger) {
-		$this->activityBackend = $activityBackend;
-		$this->logger = $logger;
-	}
+    public function __construct(ActivityBackend $activityBackend,
+                                LoggerInterface $logger) {
+        $this->activityBackend = $activityBackend;
+        $this->logger = $logger;
+    }
 
-	public function handle(Event $event): void {
-		if ($event instanceof AddressBookCreatedEvent) {
-			try {
-				$this->activityBackend->onAddressbookCreate(
-					$event->getAddressBookData()
-				);
+    public function handle(Event $event): void {
+        if ($event instanceof AddressBookCreatedEvent) {
+            try {
+                $this->activityBackend->onAddressbookCreate(
+                    $event->getAddressBookData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for new addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof AddressBookUpdatedEvent) {
-			try {
-				$this->activityBackend->onAddressbookUpdate(
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getMutations()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for new addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook creation, so we just log it
+                $this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof AddressBookUpdatedEvent) {
+            try {
+                $this->activityBackend->onAddressbookUpdate(
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getMutations()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for changed addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof AddressBookDeletedEvent) {
-			try {
-				$this->activityBackend->onAddressbookDelete(
-					$event->getAddressBookData(),
-					$event->getShares()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for changed addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook update, so we just log it
+                $this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof AddressBookDeletedEvent) {
+            try {
+                $this->activityBackend->onAddressbookDelete(
+                    $event->getAddressBookData(),
+                    $event->getShares()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for deleted addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof AddressBookShareUpdatedEvent) {
-			try {
-				$this->activityBackend->onAddressbookUpdateShares(
-					$event->getAddressBookData(),
-					$event->getOldShares(),
-					$event->getAdded(),
-					$event->getRemoved()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for deleted addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook deletion, so we just log it
+                $this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof AddressBookShareUpdatedEvent) {
+            try {
+                $this->activityBackend->onAddressbookUpdateShares(
+                    $event->getAddressBookData(),
+                    $event->getOldShares(),
+                    $event->getAdded(),
+                    $event->getRemoved()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for (un)sharing addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+                $this->logger->debug(
+                    sprintf('Activity generated for (un)sharing addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook creation, so we just log it
+                $this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -77,7 +77,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a changed addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -93,7 +93,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -111,7 +111,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for (un)sharing addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

apps/dav/lib/AppInfo/Application.php

Indentation +263 added lines, -263 removed lines

@@ -92,276 +92,276 @@
 use function is_null;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'dav';
+    public const APP_ID = 'dav';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(PhotoCache::class, function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
 
-			return new PhotoCache(
-				$server->getAppDataDir('dav-photocache'),
-				$c->get(ILogger::class)
-			);
-		});
+            return new PhotoCache(
+                $server->getAppDataDir('dav-photocache'),
+                $c->get(ILogger::class)
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
+        $context->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register Search Providers
 		 */
-		$context->registerSearchProvider(ContactsSearchProvider::class);
-		$context->registerSearchProvider(EventsSearchProvider::class);
-		$context->registerSearchProvider(TasksSearchProvider::class);
-
-		/**
-		 * Register event listeners
-		 */
-		$context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
-		$context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
-
-
-		$context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, CardListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
-
-		$context->registerNotifierService(Notifier::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		\OC_App::loadApps(['dav']);
-
-		$context->injectFn([$this, 'registerHooks']);
-		$context->injectFn([$this, 'registerContactsManager']);
-		$context->injectFn([$this, 'registerCalendarManager']);
-		$context->injectFn([$this, 'registerCalendarReminders']);
-	}
-
-	public function registerHooks(HookManager $hm,
-								   EventDispatcherInterface $dispatcher,
-								   IAppContainer $container,
-								   IServerContainer $serverContainer) {
-		$hm->setup();
-
-		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
-			if ($event instanceof GenericEvent) {
-				$hm->firstLogin($event->getSubject());
-			}
-		});
-
-		$birthdayListener = function ($event) use ($container): void {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardChanged(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri'),
-					(string) $event->getArgument('cardData')
-				);
-			}
-		};
-
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardDeleted(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri')
-				);
-			}
-		});
-
-		$clearPhotoCache = function ($event) use ($container): void {
-			if ($event instanceof GenericEvent) {
-				/** @var PhotoCache $p */
-				$p = $container->query(PhotoCache::class);
-				$p->delete(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		};
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
-
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
-			$user = $event->getSubject();
-			/** @var SyncService $syncService */
-			$syncService = $container->query(SyncService::class);
-			$syncService->updateUser($user);
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdateShares(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('add'),
-				$event->getArgument('remove')
-			);
-
-			// Here we should recalculate if reminders should be sent to new or old sharees
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarPublication(
-				$event->getArgument('calendarData'),
-				$event->getArgument('public')
-			);
-		});
-
-
-		$dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-			function (GenericEvent $event) {
-				/** @var CardDavBackend $cardDavBackend */
-				$cardDavBackend = \OC::$server->query(CardDavBackend::class);
-				$addressBookUri = $event->getSubject();
-				$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-				if (!is_null($addressBook)) {
-					$cardDavBackend->deleteAddressBook($addressBook['id']);
-				}
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				/**
-				 * Initial subscription refetch
-				 *
-				 * @var RefreshWebcalService $refreshWebcalService
-				 */
-				$refreshWebcalService = $container->query(RefreshWebcalService::class);
-				$refreshWebcalService->refreshSubscription(
-					(string) $subscriptionData['principaluri'],
-					(string) $subscriptionData['uri']
-				);
-
-				$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-
-				/** @var CalDavBackend $calDavBackend */
-				$calDavBackend = $container->query(CalDavBackend::class);
-				$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-			}
-		);
-
-		$eventHandler = function () use ($container, $serverContainer): void {
-			try {
-				/** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
-				$job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
-				$job->run([]);
-				$serverContainer->getJobList()->setLastRun($job);
-			} catch (Exception $ex) {
-				$serverContainer->getLogger()->logException($ex);
-			}
-		};
-
-		$dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
-		$dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
-	}
-
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = \OC::$server->getUserSession()->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
-
-	private function setupContactsProvider(IContactsManager $contactsManager,
-										   IAppContainer $container,
-										   string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	private function setupSystemContactsProvider(IContactsManager $contactsManager,
-												 IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
-	}
-
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-											 IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager) {
-			$user = \OC::$server->getUserSession()->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
-
-	private function setupCalendarProvider(ICalendarManager $calendarManager,
-										   IAppContainer $container,
-										   $userId) {
-		$cm = $container->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
-
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-											   ILogger $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->logException($ex);
-		}
-	}
+        $context->registerSearchProvider(ContactsSearchProvider::class);
+        $context->registerSearchProvider(EventsSearchProvider::class);
+        $context->registerSearchProvider(TasksSearchProvider::class);
+
+        /**
+         * Register event listeners
+         */
+        $context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
+        $context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
+
+
+        $context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, CardListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
+
+        $context->registerNotifierService(Notifier::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        \OC_App::loadApps(['dav']);
+
+        $context->injectFn([$this, 'registerHooks']);
+        $context->injectFn([$this, 'registerContactsManager']);
+        $context->injectFn([$this, 'registerCalendarManager']);
+        $context->injectFn([$this, 'registerCalendarReminders']);
+    }
+
+    public function registerHooks(HookManager $hm,
+                                    EventDispatcherInterface $dispatcher,
+                                    IAppContainer $container,
+                                    IServerContainer $serverContainer) {
+        $hm->setup();
+
+        // first time login event setup
+        $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+            if ($event instanceof GenericEvent) {
+                $hm->firstLogin($event->getSubject());
+            }
+        });
+
+        $birthdayListener = function ($event) use ($container): void {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardChanged(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri'),
+                    (string) $event->getArgument('cardData')
+                );
+            }
+        };
+
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardDeleted(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri')
+                );
+            }
+        });
+
+        $clearPhotoCache = function ($event) use ($container): void {
+            if ($event instanceof GenericEvent) {
+                /** @var PhotoCache $p */
+                $p = $container->query(PhotoCache::class);
+                $p->delete(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        };
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
+
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
+            $user = $event->getSubject();
+            /** @var SyncService $syncService */
+            $syncService = $container->query(SyncService::class);
+            $syncService->updateUser($user);
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdateShares(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('add'),
+                $event->getArgument('remove')
+            );
+
+            // Here we should recalculate if reminders should be sent to new or old sharees
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarPublication(
+                $event->getArgument('calendarData'),
+                $event->getArgument('public')
+            );
+        });
+
+
+        $dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
+            function (GenericEvent $event) {
+                /** @var CardDavBackend $cardDavBackend */
+                $cardDavBackend = \OC::$server->query(CardDavBackend::class);
+                $addressBookUri = $event->getSubject();
+                $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+                if (!is_null($addressBook)) {
+                    $cardDavBackend->deleteAddressBook($addressBook['id']);
+                }
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                /**
+                 * Initial subscription refetch
+                 *
+                 * @var RefreshWebcalService $refreshWebcalService
+                 */
+                $refreshWebcalService = $container->query(RefreshWebcalService::class);
+                $refreshWebcalService->refreshSubscription(
+                    (string) $subscriptionData['principaluri'],
+                    (string) $subscriptionData['uri']
+                );
+
+                $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+
+                /** @var CalDavBackend $calDavBackend */
+                $calDavBackend = $container->query(CalDavBackend::class);
+                $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+            }
+        );
+
+        $eventHandler = function () use ($container, $serverContainer): void {
+            try {
+                /** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
+                $job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
+                $job->run([]);
+                $serverContainer->getJobList()->setLastRun($job);
+            } catch (Exception $ex) {
+                $serverContainer->getLogger()->logException($ex);
+            }
+        };
+
+        $dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
+        $dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
+    }
+
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = \OC::$server->getUserSession()->getUser();
+            if (!is_null($user)) {
+                $this->setupContactsProvider($cm, $container, $user->getUID());
+            } else {
+                $this->setupSystemContactsProvider($cm, $container);
+            }
+        });
+    }
+
+    private function setupContactsProvider(IContactsManager $contactsManager,
+                                            IAppContainer $container,
+                                            string $userID): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    private function setupSystemContactsProvider(IContactsManager $contactsManager,
+                                                    IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+    }
+
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+                                                IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager) {
+            $user = \OC::$server->getUserSession()->getUser();
+            if ($user !== null) {
+                $this->setupCalendarProvider($calendarManager, $container, $user->getUID());
+            }
+        });
+    }
+
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+                                            IAppContainer $container,
+                                            $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
+
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+                                                ILogger $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->logException($ex);
+        }
+    }
 }