nextcloud / server

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

Indentation +457 added lines, -457 removed lines

@@ -39,461 +39,461 @@
  */
 class Backend {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/**
-	 * @param IActivityManager $activityManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * Creates activities when a calendar was creates
-	 *
-	 * @param array $calendarData
-	 */
-	public function onCalendarAdd(array $calendarData) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
-	}
-
-	/**
-	 * Creates activities when a calendar was updated
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $properties
-	 */
-	public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
-	}
-
-	/**
-	 * Creates activities when a calendar was deleted
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 */
-	public function onCalendarDelete(array $calendarData, array $shares) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was touched
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $changedProperties
-	 */
-	protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['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('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		$changedVisibleInformation = array_intersect([
-			'{DAV:}displayname',
-			'{http://apple.com/ns/ical/}calendar-color'
-		], array_keys($changedProperties));
-
-		if (empty($shares) || ($action === Calendar::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,
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was (un-)shared
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
-		$principal = explode('/', $calendarData['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('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->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,
-					$calendarData,
-					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
-				);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
-					} else if ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} else if ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $calendarData['id'],
-						'uri' => $calendarData['uri'],
-						'name' => $calendarData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::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, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} else if ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $calendarData['id'],
-						'uri' => $calendarData['uri'],
-						'name' => $calendarData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::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($principal, $shares) {
-		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($gid, IEvent $event, array $properties, $subject) {
-		$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($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
-		$event->setAffectedUser($user)
-			->setSubject(
-				$user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
-				[
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $properties['id'],
-						'uri' => $properties['uri'],
-						'name' => $properties['{DAV:}displayname'],
-					],
-				]
-			);
-
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * Creates activities when a calendar object was created/updated/deleted
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $objectData
-	 */
-	public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
-
-		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
-			$action .= '_completed';
-		} else if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
-			$action .= '_needs_action';
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
-			->setAuthor($currentUser);
-
-		$users = $this->getUsersForShares($shares);
-		$users[] = $owner;
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'object' => [
-							'id' => $object['id'],
-							'name' => $object['name'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * @param array $objectData
-	 * @return string[]|bool
-	 */
-	protected function getObjectNameAndType(array $objectData) {
-		$vObject = Reader::read($objectData['calendardata']);
-		$component = $componentType = null;
-		foreach($vObject->getComponents() as $component) {
-			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
-				$componentType = $component->name;
-				break;
-			}
-		}
-
-		if (!$componentType) {
-			// Calendar objects must have a VEVENT or VTODO component
-			return false;
-		}
-
-		if ($componentType === 'VEVENT') {
-			return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
-		}
-		return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
-	}
-
-	/**
-	 * Get all users that have access to a given calendar
-	 *
-	 * @param array $shares
-	 * @return string[]
-	 */
-	protected function getUsersForShares(array $shares) {
-		$users = $groups = [];
-		foreach ($shares as $share) {
-			$prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
-			if ($prinical[1] === 'users') {
-				$users[] = $prinical[2];
-			} else if ($prinical[1] === 'groups') {
-				$groups[] = $prinical[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;
+
+    /**
+     * @param IActivityManager $activityManager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->activityManager = $activityManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * Creates activities when a calendar was creates
+     *
+     * @param array $calendarData
+     */
+    public function onCalendarAdd(array $calendarData) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
+    }
+
+    /**
+     * Creates activities when a calendar was updated
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $properties
+     */
+    public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
+    }
+
+    /**
+     * Creates activities when a calendar was deleted
+     *
+     * @param array $calendarData
+     * @param array $shares
+     */
+    public function onCalendarDelete(array $calendarData, array $shares) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was touched
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $changedProperties
+     */
+    protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['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('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        $changedVisibleInformation = array_intersect([
+            '{DAV:}displayname',
+            '{http://apple.com/ns/ical/}calendar-color'
+        ], array_keys($changedProperties));
+
+        if (empty($shares) || ($action === Calendar::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,
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was (un-)shared
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $add
+     * @param array $remove
+     */
+    public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
+        $principal = explode('/', $calendarData['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('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->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,
+                    $calendarData,
+                    Calendar::SUBJECT_UNSHARE_USER,
+                    Calendar::SUBJECT_DELETE . '_self'
+                );
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+                    } else if ($principal[2] === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } else if ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $calendarData['id'],
+                        'uri' => $calendarData['uri'],
+                        'name' => $calendarData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::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, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_you';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } else if ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $calendarData['id'],
+                        'uri' => $calendarData['uri'],
+                        'name' => $calendarData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::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($principal, $shares) {
+        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($gid, IEvent $event, array $properties, $subject) {
+        $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($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
+        $event->setAffectedUser($user)
+            ->setSubject(
+                $user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
+                [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $properties['id'],
+                        'uri' => $properties['uri'],
+                        'name' => $properties['{DAV:}displayname'],
+                    ],
+                ]
+            );
+
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * Creates activities when a calendar object was created/updated/deleted
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $objectData
+     */
+    public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $object = $this->getObjectNameAndType($objectData);
+        $action = $action . '_' . $object['type'];
+
+        if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
+            $action .= '_completed';
+        } else if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
+            $action .= '_needs_action';
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
+            ->setAuthor($currentUser);
+
+        $users = $this->getUsersForShares($shares);
+        $users[] = $owner;
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'object' => [
+                            'id' => $object['id'],
+                            'name' => $object['name'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * @param array $objectData
+     * @return string[]|bool
+     */
+    protected function getObjectNameAndType(array $objectData) {
+        $vObject = Reader::read($objectData['calendardata']);
+        $component = $componentType = null;
+        foreach($vObject->getComponents() as $component) {
+            if (in_array($component->name, ['VEVENT', 'VTODO'])) {
+                $componentType = $component->name;
+                break;
+            }
+        }
+
+        if (!$componentType) {
+            // Calendar objects must have a VEVENT or VTODO component
+            return false;
+        }
+
+        if ($componentType === 'VEVENT') {
+            return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
+        }
+        return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
+    }
+
+    /**
+     * Get all users that have access to a given calendar
+     *
+     * @param array $shares
+     * @return string[]
+     */
+    protected function getUsersForShares(array $shares) {
+        $users = $groups = [];
+        foreach ($shares as $share) {
+            $prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
+            if ($prinical[1] === 'users') {
+                $users[] = $prinical[2];
+            } else if ($prinical[1] === 'groups') {
+                $groups[] = $prinical[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 +18 added lines, -18 removed lines

@@ -133,7 +133,7 @@ 
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $currentUser,
 						'calendar' => [
@@ -186,7 +186,7 @@ 
 					$event,
 					$calendarData,
 					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
+					Calendar::SUBJECT_DELETE.'_self'
 				);
 
 				if ($owner !== $principal[2]) {
@@ -201,15 +201,15 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
 					} else if ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -230,13 +230,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -272,13 +272,13 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_you';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -299,13 +299,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -403,7 +403,7 @@ 
 		}
 
 		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
+		$action = $action.'_'.$object['type'];
 
 		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
 			$action .= '_completed';
@@ -423,7 +423,7 @@ 
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $event->getAuthor(),
 						'calendar' => [
@@ -448,7 +448,7 @@ 
 	protected function getObjectNameAndType(array $objectData) {
 		$vObject = Reader::read($objectData['calendardata']);
 		$component = $componentType = null;
-		foreach($vObject->getComponents() as $component) {
+		foreach ($vObject->getComponents() as $component) {
 			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
 				$componentType = $component->name;
 				break;

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

Indentation +120 added lines, -120 removed lines

@@ -30,124 +30,124 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[] cached displayNames - key is the UID and value the displayname */
-	protected $displayNames = [];
-
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array $eventData
-	 * @return array
-	 */
-	protected function generateObjectParameter($eventData) {
-		if (!is_array($eventData) || !isset($eventData['id']) || !isset($eventData['name'])) {
-			throw new \InvalidArgumentException();
-		}
-
-		return [
-			'type' => 'calendar-event',
-			'id' => $eventData['id'],
-			'name' => $eventData['name'],
-		];
-	}
-
-	/**
-	 * @param array $data
-	 * @param IL10N $l
-	 * @return array
-	 */
-	protected function generateCalendarParameter($data, IL10N $l) {
-		if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
-			return [
-				'type' => 'calendar',
-				'id' => $data['id'],
-				'name' => $l->t('Personal'),
-			];
-		}
-
-		return [
-			'type' => 'calendar',
-			'id' => $data['id'],
-			'name' => $data['name'],
-		];
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $name
-	 * @return array
-	 */
-	protected function generateLegacyCalendarParameter($id, $name) {
-		return [
-			'type' => 'calendar',
-			'id' => $id,
-			'name' => $name,
-		];
-	}
-
-	/**
-	 * @param string $id
-	 * @return array
-	 */
-	protected function generateGroupParameter($id) {
-		return [
-			'type' => 'group',
-			'id' => $id,
-			'name' => $id,
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[] cached displayNames - key is the UID and value the displayname */
+    protected $displayNames = [];
+
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array $eventData
+     * @return array
+     */
+    protected function generateObjectParameter($eventData) {
+        if (!is_array($eventData) || !isset($eventData['id']) || !isset($eventData['name'])) {
+            throw new \InvalidArgumentException();
+        }
+
+        return [
+            'type' => 'calendar-event',
+            'id' => $eventData['id'],
+            'name' => $eventData['name'],
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @param IL10N $l
+     * @return array
+     */
+    protected function generateCalendarParameter($data, IL10N $l) {
+        if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
+            $data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+            return [
+                'type' => 'calendar',
+                'id' => $data['id'],
+                'name' => $l->t('Personal'),
+            ];
+        }
+
+        return [
+            'type' => 'calendar',
+            'id' => $data['id'],
+            'name' => $data['name'],
+        ];
+    }
+
+    /**
+     * @param int $id
+     * @param string $name
+     * @return array
+     */
+    protected function generateLegacyCalendarParameter($id, $name) {
+        return [
+            'type' => 'calendar',
+            'id' => $id,
+            'name' => $name,
+        ];
+    }
+
+    /**
+     * @param string $id
+     * @return array
+     */
+    protected function generateGroupParameter($id) {
+        return [
+            'type' => 'group',
+            'id' => $id,
+            'name' => $id,
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/comments/lib/Activity/Provider.php

Indentation +236 added lines, -236 removed lines

@@ -34,240 +34,240 @@
 
 class Provider implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var string[] */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IManager $activityManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, ICommentsManager $commentsManager, IUserManager $userManager, IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->commentsManager = $commentsManager;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'comments') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('comments', $language);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			$this->parseMessage($event);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
-			}
-
-			if ($this->activityManager->isFormattingFilteredObject()) {
-				try {
-					return $this->parseShortVersion($event);
-				} catch (\InvalidArgumentException $e) {
-					// Ignore and simply use the long version...
-				}
-			}
-
-			return $this->parseLongVersion($event);
-		} else {
-			throw new \InvalidArgumentException();
-		}
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseShortVersion(IEvent $event) {
-		$subjectParameters = $this->getSubjectParameters($event);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You commented'))
-					->setRichSubject($this->l->t('You commented'), []);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters['actor']);
-				$event->setParsedSubject($this->l->t('%1$s commented', [$author['name']]))
-					->setRichSubject($this->l->t('{author} commented'), [
-						'author' => $author,
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseLongVersion(IEvent $event) {
-		$subjectParameters = $this->getSubjectParameters($event);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You commented on %1$s', [
-						$subjectParameters['filePath'],
-					]))
-					->setRichSubject($this->l->t('You commented on {file}'), [
-						'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
-					]);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters['actor']);
-				$event->setParsedSubject($this->l->t('%1$s commented on %2$s', [
-						$author['name'],
-						$subjectParameters['filePath'],
-					]))
-					->setRichSubject($this->l->t('{author} commented on {file}'), [
-						'author' => $author,
-						'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getSubjectParameters(IEvent $event) {
-		$subjectParameters = $event->getSubjectParameters();
-		if (isset($subjectParameters['fileId'])) {
-			return $subjectParameters;
-		}
-
-		// Fix subjects from 12.0.3 and older
-		//
-		// Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		return [
-			'actor' => $subjectParameters[0],
-			'fileId' => (int) $event->getObjectId(),
-			'filePath' => trim($subjectParameters[1], '/'),
-		];
-	}
-
-	/**
-	 * @param IEvent $event
-	 */
-	protected function parseMessage(IEvent $event) {
-		$messageParameters = $event->getMessageParameters();
-		if (empty($messageParameters)) {
-			// Email
-			return;
-		}
-
-		$commentId = isset($messageParameters['commentId']) ? $messageParameters['commentId'] : $messageParameters[0];
-
-		try {
-			$comment = $this->commentsManager->get((string) $commentId);
-			$message = $comment->getMessage();
-			$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
-
-			$mentionCount = 1;
-			$mentions = [];
-			foreach ($comment->getMentions() as $mention) {
-				if ($mention['type'] !== 'user') {
-					continue;
-				}
-
-				$message = preg_replace(
-					'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
-					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
-					$message
-				);
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
-				$mentionCount++;
-			}
-
-			$event->setParsedMessage($comment->getMessage())
-				->setRichMessage($message, $mentions);
-		} catch (NotFoundException $e) {
-		}
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => $path,
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var ICommentsManager */
+    protected $commentsManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var string[] */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IManager $activityManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, ICommentsManager $commentsManager, IUserManager $userManager, IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->commentsManager = $commentsManager;
+        $this->userManager = $userManager;
+        $this->activityManager = $activityManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'comments') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('comments', $language);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            $this->parseMessage($event);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+            }
+
+            if ($this->activityManager->isFormattingFilteredObject()) {
+                try {
+                    return $this->parseShortVersion($event);
+                } catch (\InvalidArgumentException $e) {
+                    // Ignore and simply use the long version...
+                }
+            }
+
+            return $this->parseLongVersion($event);
+        } else {
+            throw new \InvalidArgumentException();
+        }
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    protected function parseShortVersion(IEvent $event) {
+        $subjectParameters = $this->getSubjectParameters($event);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You commented'))
+                    ->setRichSubject($this->l->t('You commented'), []);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters['actor']);
+                $event->setParsedSubject($this->l->t('%1$s commented', [$author['name']]))
+                    ->setRichSubject($this->l->t('{author} commented'), [
+                        'author' => $author,
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    protected function parseLongVersion(IEvent $event) {
+        $subjectParameters = $this->getSubjectParameters($event);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You commented on %1$s', [
+                        $subjectParameters['filePath'],
+                    ]))
+                    ->setRichSubject($this->l->t('You commented on {file}'), [
+                        'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
+                    ]);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters['actor']);
+                $event->setParsedSubject($this->l->t('%1$s commented on %2$s', [
+                        $author['name'],
+                        $subjectParameters['filePath'],
+                    ]))
+                    ->setRichSubject($this->l->t('{author} commented on {file}'), [
+                        'author' => $author,
+                        'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getSubjectParameters(IEvent $event) {
+        $subjectParameters = $event->getSubjectParameters();
+        if (isset($subjectParameters['fileId'])) {
+            return $subjectParameters;
+        }
+
+        // Fix subjects from 12.0.3 and older
+        //
+        // Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        return [
+            'actor' => $subjectParameters[0],
+            'fileId' => (int) $event->getObjectId(),
+            'filePath' => trim($subjectParameters[1], '/'),
+        ];
+    }
+
+    /**
+     * @param IEvent $event
+     */
+    protected function parseMessage(IEvent $event) {
+        $messageParameters = $event->getMessageParameters();
+        if (empty($messageParameters)) {
+            // Email
+            return;
+        }
+
+        $commentId = isset($messageParameters['commentId']) ? $messageParameters['commentId'] : $messageParameters[0];
+
+        try {
+            $comment = $this->commentsManager->get((string) $commentId);
+            $message = $comment->getMessage();
+            $message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
+
+            $mentionCount = 1;
+            $mentions = [];
+            foreach ($comment->getMentions() as $mention) {
+                if ($mention['type'] !== 'user') {
+                    continue;
+                }
+
+                $message = preg_replace(
+                    '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
+                    //'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
+                    '${1}' . '{mention' . $mentionCount . '}' . '${3}',
+                    $message
+                );
+                $mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+                $mentionCount++;
+            }
+
+            $event->setParsedMessage($comment->getMessage())
+                ->setRichMessage($message, $mentions);
+        } catch (NotFoundException $e) {
+        }
+    }
+
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => $path,
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Todo.php

Indentation +105 added lines, -105 removed lines

@@ -25,120 +25,120 @@
 
 class Todo extends Event {
 
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
+            throw new \InvalidArgumentException();
+        }
 
-		$this->l = $this->languageFactory->get('dav', $language);
+        $this->l = $this->languageFactory->get('dav', $language);
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
-		}
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
+        }
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
-			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
-			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
-			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
-			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
-			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
-			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+            $subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+            $subject = $this->l->t('You created todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+            $subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+            $subject = $this->l->t('You deleted todo {todo} from list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+            $subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+            $subject = $this->l->t('You updated todo {todo} in list {calendar}');
 
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
-			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
-			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
-			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
-			$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+            $subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+            $subject = $this->l->t('You solved todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+            $subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
+            $subject = $this->l->t('You reopened todo {todo} in list {calendar}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		$event = $this->eventMerger->mergeEvents('todo', $event, $previousEvent);
+        $event = $this->eventMerger->mergeEvents('todo', $event, $previousEvent);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_todo':
-				case self::SUBJECT_OBJECT_DELETE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'todo' => $this->generateObjectParameter($parameters['object']),
-					];
-				case self::SUBJECT_OBJECT_ADD . '_todo_self':
-				case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'todo' => $this->generateObjectParameter($parameters['object']),
-					];
-			}
-		}
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            switch ($subject) {
+                case self::SUBJECT_OBJECT_ADD . '_todo':
+                case self::SUBJECT_OBJECT_DELETE . '_todo':
+                case self::SUBJECT_OBJECT_UPDATE . '_todo':
+                case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
+                case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'todo' => $this->generateObjectParameter($parameters['object']),
+                    ];
+                case self::SUBJECT_OBJECT_ADD . '_todo_self':
+                case self::SUBJECT_OBJECT_DELETE . '_todo_self':
+                case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
+                case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
+                case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'todo' => $this->generateObjectParameter($parameters['object']),
+                    ];
+            }
+        }
 
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_todo':
-			case self::SUBJECT_OBJECT_DELETE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'todo' => $this->generateObjectParameter($parameters[2]),
-				];
-			case self::SUBJECT_OBJECT_ADD . '_todo_self':
-			case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
-				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'todo' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        switch ($subject) {
+            case self::SUBJECT_OBJECT_ADD . '_todo':
+            case self::SUBJECT_OBJECT_DELETE . '_todo':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'todo' => $this->generateObjectParameter($parameters[2]),
+                ];
+            case self::SUBJECT_OBJECT_ADD . '_todo_self':
+            case self::SUBJECT_OBJECT_DELETE . '_todo_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+                return [
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'todo' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
 
-		throw new \InvalidArgumentException();
-	}
+        throw new \InvalidArgumentException();
+    }
 }

Spacing +32 added lines, -32 removed lines

@@ -46,26 +46,26 @@ 
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo') {
 			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo_self') {
 			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo') {
 			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo_self') {
 			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo') {
 			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_self') {
 			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
 
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed') {
 			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self') {
 			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action') {
 			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self') {
 			$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -90,21 +90,21 @@ 
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_todo':
-				case self::SUBJECT_OBJECT_DELETE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+				case self::SUBJECT_OBJECT_ADD.'_todo':
+				case self::SUBJECT_OBJECT_DELETE.'_todo':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_todo_self':
-				case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+				case self::SUBJECT_OBJECT_ADD.'_todo_self':
+				case self::SUBJECT_OBJECT_DELETE.'_todo_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
@@ -118,23 +118,23 @@ 
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_todo':
-			case self::SUBJECT_OBJECT_DELETE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+			case self::SUBJECT_OBJECT_ADD.'_todo':
+			case self::SUBJECT_OBJECT_DELETE.'_todo':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_todo_self':
-			case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+			case self::SUBJECT_OBJECT_ADD.'_todo_self':
+			case self::SUBJECT_OBJECT_DELETE.'_todo_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
 				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

Indentation +219 added lines, -219 removed lines

@@ -31,223 +31,223 @@
 
 class Calendar extends Base {
 
-	const SUBJECT_ADD = 'calendar_add';
-	const SUBJECT_UPDATE = 'calendar_update';
-	const SUBJECT_DELETE = 'calendar_delete';
-	const SUBJECT_SHARE_USER = 'calendar_user_share';
-	const SUBJECT_SHARE_GROUP = 'calendar_group_share';
-	const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
-	const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
-		parent::__construct($userManager);
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('dav', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_ADD) {
-			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
-			$subject = $this->l->t('You created calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_DELETE) {
-			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
-			$subject = $this->l->t('You deleted calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_UPDATE) {
-			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
-			$subject = $this->l->t('You updated calendar {calendar}');
-
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
-
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('calendar', $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);
-			} else if (isset($parsedParameters['group'])) {
-				// Couldn't group by calendar, maybe we can group by groups
-				$event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
-			}
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			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']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-					];
-				case self::SUBJECT_SHARE_USER . '_you':
-				case self::SUBJECT_UNSHARE_USER . '_you':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'user' => $this->generateUserParameter($parameters['user']),
-					];
-				case self::SUBJECT_SHARE_USER . '_by':
-				case self::SUBJECT_UNSHARE_USER . '_by':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'user' => $this->generateUserParameter($parameters['user']),
-					];
-				case self::SUBJECT_SHARE_GROUP . '_you':
-				case self::SUBJECT_UNSHARE_GROUP . '_you':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'group' => $this->generateGroupParameter($parameters['group']),
-					];
-				case self::SUBJECT_SHARE_GROUP . '_by':
-				case self::SUBJECT_UNSHARE_GROUP . '_by':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'group' => $this->generateGroupParameter($parameters['group']),
-					];
-			}
-		}
-
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		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[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_ADD = 'calendar_add';
+    const SUBJECT_UPDATE = 'calendar_update';
+    const SUBJECT_DELETE = 'calendar_delete';
+    const SUBJECT_SHARE_USER = 'calendar_user_share';
+    const SUBJECT_SHARE_GROUP = 'calendar_group_share';
+    const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
+    const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
+        parent::__construct($userManager);
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('dav', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_ADD) {
+            $subject = $this->l->t('{actor} created calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+            $subject = $this->l->t('You created calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_DELETE) {
+            $subject = $this->l->t('{actor} deleted calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+            $subject = $this->l->t('You deleted calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_UPDATE) {
+            $subject = $this->l->t('{actor} updated calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+            $subject = $this->l->t('You updated calendar {calendar}');
+
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with you');
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from you');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
+
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('calendar', $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);
+            } else if (isset($parsedParameters['group'])) {
+                // Couldn't group by calendar, maybe we can group by groups
+                $event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
+            }
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            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']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                    ];
+                case self::SUBJECT_SHARE_USER . '_you':
+                case self::SUBJECT_UNSHARE_USER . '_you':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'user' => $this->generateUserParameter($parameters['user']),
+                    ];
+                case self::SUBJECT_SHARE_USER . '_by':
+                case self::SUBJECT_UNSHARE_USER . '_by':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'user' => $this->generateUserParameter($parameters['user']),
+                    ];
+                case self::SUBJECT_SHARE_GROUP . '_you':
+                case self::SUBJECT_UNSHARE_GROUP . '_you':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'group' => $this->generateGroupParameter($parameters['group']),
+                    ];
+                case self::SUBJECT_SHARE_GROUP . '_by':
+                case self::SUBJECT_UNSHARE_GROUP . '_by':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'group' => $this->generateGroupParameter($parameters['group']),
+                    ];
+            }
+        }
+
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        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[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_you':
+            case self::SUBJECT_UNSHARE_USER . '_you':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_by':
+            case self::SUBJECT_UNSHARE_USER . '_by':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_you':
+            case self::SUBJECT_UNSHARE_GROUP . '_you':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_by':
+            case self::SUBJECT_UNSHARE_GROUP . '_by':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

Spacing +41 added lines, -41 removed lines

@@ -92,39 +92,39 @@ 
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $this->l->t('You created calendar {calendar}');
 		} else if ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $this->l->t('You deleted calendar {calendar}');
 		} else if ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $this->l->t('You updated calendar {calendar}');
 
 		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
 		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
 
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -160,39 +160,39 @@ 
 		if (isset($parameters['calendar'])) {
 			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']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->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 [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->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']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->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 [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->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']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
@@ -208,42 +208,42 @@ 
 		// they will get the dead entries in their stream.
 		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[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 				];
-			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 [
 					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 				];
-			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 [
 					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
-			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 [
 					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 				];
-			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 [
 					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
 		}

apps/dav/lib/CalDAV/Activity/Provider/Event.php

Indentation +133 added lines, -133 removed lines

@@ -31,137 +31,137 @@
 
 class Event extends Base {
 
-	const SUBJECT_OBJECT_ADD = 'object_add';
-	const SUBJECT_OBJECT_UPDATE = 'object_update';
-	const SUBJECT_OBJECT_DELETE = 'object_delete';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
-		parent::__construct($userManager);
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('dav', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
-			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
-			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
-			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
-			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
-			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
-			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateObjectParameter($parameters['object']),
-					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateObjectParameter($parameters['object']),
-					];
-			}
-		}
-
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_OBJECT_ADD = 'object_add';
+    const SUBJECT_OBJECT_UPDATE = 'object_update';
+    const SUBJECT_OBJECT_DELETE = 'object_delete';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
+        parent::__construct($userManager);
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('dav', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+            $subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+            $subject = $this->l->t('You created event {event} in calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+            $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+            $subject = $this->l->t('You deleted event {event} from calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+            $subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+            $subject = $this->l->t('You updated event {event} in calendar {calendar}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            switch ($subject) {
+                case self::SUBJECT_OBJECT_ADD . '_event':
+                case self::SUBJECT_OBJECT_DELETE . '_event':
+                case self::SUBJECT_OBJECT_UPDATE . '_event':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateObjectParameter($parameters['object']),
+                    ];
+                case self::SUBJECT_OBJECT_ADD . '_event_self':
+                case self::SUBJECT_OBJECT_DELETE . '_event_self':
+                case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateObjectParameter($parameters['object']),
+                    ];
+            }
+        }
+
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        switch ($subject) {
+            case self::SUBJECT_OBJECT_ADD . '_event':
+            case self::SUBJECT_OBJECT_DELETE . '_event':
+            case self::SUBJECT_OBJECT_UPDATE . '_event':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+            case self::SUBJECT_OBJECT_ADD . '_event_self':
+            case self::SUBJECT_OBJECT_DELETE . '_event_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                return [
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -86,17 +86,17 @@ 
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
 			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
 			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
 			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
 			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -121,17 +121,17 @@ 
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
+				case self::SUBJECT_OBJECT_ADD.'_event':
+				case self::SUBJECT_OBJECT_DELETE.'_event':
+				case self::SUBJECT_OBJECT_UPDATE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+				case self::SUBJECT_OBJECT_ADD.'_event_self':
+				case self::SUBJECT_OBJECT_DELETE.'_event_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateObjectParameter($parameters['object']),
@@ -145,19 +145,19 @@ 
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
+			case self::SUBJECT_OBJECT_ADD.'_event':
+			case self::SUBJECT_OBJECT_DELETE.'_event':
+			case self::SUBJECT_OBJECT_UPDATE.'_event':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+			case self::SUBJECT_OBJECT_ADD.'_event_self':
+			case self::SUBJECT_OBJECT_DELETE.'_event_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
 		}