nextcloud / server

lib/public/Comments/Events/BeforeCommentUpdatedEvent.php

Indentation +7 added lines, -7 removed lines

@@ -18,11 +18,11 @@
  */
 #[Consumable(since: '33.0.0')]
 final class BeforeCommentUpdatedEvent extends CommentsEvent {
-	/**
-	 * CommentEvent constructor.
-	 */
-	public function __construct(IComment $comment) {
-		/** @psalm-suppress DeprecatedConstant */
-		parent::__construct(CommentsEvent::EVENT_PRE_UPDATE, $comment);
-	}
+    /**
+     * CommentEvent constructor.
+     */
+    public function __construct(IComment $comment) {
+        /** @psalm-suppress DeprecatedConstant */
+        parent::__construct(CommentsEvent::EVENT_PRE_UPDATE, $comment);
+    }
 }

lib/public/Comments/Events/CommentAddedEvent.php

Indentation +7 added lines, -7 removed lines

@@ -18,11 +18,11 @@
  */
 #[Consumable(since: '33.0.0')]
 final class CommentAddedEvent extends CommentsEvent {
-	/**
-	 * CommentAddedEvent constructor.
-	 */
-	public function __construct(IComment $comment) {
-		/** @psalm-suppress DeprecatedConstant */
-		parent::__construct(CommentsEvent::EVENT_ADD, $comment);
-	}
+    /**
+     * CommentAddedEvent constructor.
+     */
+    public function __construct(IComment $comment) {
+        /** @psalm-suppress DeprecatedConstant */
+        parent::__construct(CommentsEvent::EVENT_ADD, $comment);
+    }
 }

lib/public/Comments/Events/CommentDeletedEvent.php

Indentation +7 added lines, -7 removed lines

@@ -18,11 +18,11 @@
  */
 #[Consumable(since: '33.0.0')]
 final class CommentDeletedEvent extends CommentsEvent {
-	/**
-	 * CommentRemovedEvent constructor.
-	 */
-	public function __construct(IComment $comment) {
-		/** @psalm-suppress DeprecatedConstant */
-		parent::__construct(CommentsEvent::EVENT_DELETE, $comment);
-	}
+    /**
+     * CommentRemovedEvent constructor.
+     */
+    public function __construct(IComment $comment) {
+        /** @psalm-suppress DeprecatedConstant */
+        parent::__construct(CommentsEvent::EVENT_DELETE, $comment);
+    }
 }

lib/public/Comments/Events/CommentUpdatedEvent.php

Indentation +7 added lines, -7 removed lines

@@ -18,11 +18,11 @@
  */
 #[Consumable(since: '33.0.0')]
 final class CommentUpdatedEvent extends CommentsEvent {
-	/**
-	 * CommentUpdatedEvent constructor.
-	 */
-	public function __construct(IComment $comment) {
-		/** @psalm-suppress DeprecatedConstant */
-		parent::__construct(CommentsEvent::EVENT_UPDATE, $comment);
-	}
+    /**
+     * CommentUpdatedEvent constructor.
+     */
+    public function __construct(IComment $comment) {
+        /** @psalm-suppress DeprecatedConstant */
+        parent::__construct(CommentsEvent::EVENT_UPDATE, $comment);
+    }
 }

lib/public/Comments/CommentsEvent.php

Indentation +44 added lines, -44 removed lines

@@ -19,54 +19,54 @@
  */
 #[Consumable(since: '9.0.0')]
 class CommentsEvent extends Event {
-	/**
-	 * @since 11.0.0
-	 * @deprecated 33.0.0 Use \OCP\Comments\Events\CommentAddedEvent instead.
-	 */
-	public const EVENT_ADD = 'OCP\Comments\ICommentsManager::addComment';
+    /**
+     * @since 11.0.0
+     * @deprecated 33.0.0 Use \OCP\Comments\Events\CommentAddedEvent instead.
+     */
+    public const EVENT_ADD = 'OCP\Comments\ICommentsManager::addComment';
 
-	/**
-	 * @since 11.0.0
-	 * @deprecated 33.0.0 Use \OCP\Comments\Events\BeforeCommentUpdatedEvent instead.
-	 */
-	public const EVENT_PRE_UPDATE = 'OCP\Comments\ICommentsManager::preUpdateComment';
+    /**
+     * @since 11.0.0
+     * @deprecated 33.0.0 Use \OCP\Comments\Events\BeforeCommentUpdatedEvent instead.
+     */
+    public const EVENT_PRE_UPDATE = 'OCP\Comments\ICommentsManager::preUpdateComment';
 
-	/**
-	 * @since 11.0.0
-	 * @deprecated 33.0.0 Use \OCP\Comments\Events\CommentUpdatedEvent instead.
-	 */
-	public const EVENT_UPDATE = 'OCP\Comments\ICommentsManager::updateComment';
+    /**
+     * @since 11.0.0
+     * @deprecated 33.0.0 Use \OCP\Comments\Events\CommentUpdatedEvent instead.
+     */
+    public const EVENT_UPDATE = 'OCP\Comments\ICommentsManager::updateComment';
 
-	/**
-	 * @since 11.0.0
-	 * @deprecated 33.0.0 Use \OCP\Comments\Events\CommentDeletedEvent instead.
-	 */
-	public const EVENT_DELETE = 'OCP\Comments\ICommentsManager::deleteComment';
+    /**
+     * @since 11.0.0
+     * @deprecated 33.0.0 Use \OCP\Comments\Events\CommentDeletedEvent instead.
+     */
+    public const EVENT_DELETE = 'OCP\Comments\ICommentsManager::deleteComment';
 
-	/**
-	 * CommentsEvent constructor.
-	 *
-	 * @since 9.0.0
-	 */
-	public function __construct(
-		protected readonly string $event,
-		protected readonly IComment $comment,
-	) {
-		parent::__construct();
-	}
+    /**
+     * CommentsEvent constructor.
+     *
+     * @since 9.0.0
+     */
+    public function __construct(
+        protected readonly string $event,
+        protected readonly IComment $comment,
+    ) {
+        parent::__construct();
+    }
 
-	/**
-	 * @since 9.0.0
-	 * @depreacted Since 33.0.0 use instanceof CommentAddedEvent, CommentRemovedEvent, CommentUpdatedEvent or BeforeCommentUpdatedEvent instead.
-	 */
-	public function getEvent(): string {
-		return $this->event;
-	}
+    /**
+     * @since 9.0.0
+     * @depreacted Since 33.0.0 use instanceof CommentAddedEvent, CommentRemovedEvent, CommentUpdatedEvent or BeforeCommentUpdatedEvent instead.
+     */
+    public function getEvent(): string {
+        return $this->event;
+    }
 
-	/**
-	 * @since 9.0.0
-	 */
-	public function getComment(): IComment {
-		return $this->comment;
-	}
+    /**
+     * @since 9.0.0
+     */
+    public function getComment(): IComment {
+        return $this->comment;
+    }
 }

lib/public/Comments/CommentsEntityEvent.php

Indentation +42 added lines, -42 removed lines

@@ -18,46 +18,46 @@
  */
 #[Consumable(since: '9.1.0')]
 class CommentsEntityEvent extends Event {
-	/**
-	 * @since 9.1.0
-	 * @deprecated 22.0.0 - Listen to the typed event instead.
-	 */
-	public const EVENT_ENTITY = 'OCP\Comments\ICommentsManager::registerEntity';
-
-	/** @var (\Closure(string $id): bool)[] */
-	protected array $collections = [];
-
-	/**
-	 * DispatcherEvent constructor.
-	 *
-	 * @since 9.1.0
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * @param string $name
-	 * @param \Closure(string $id):bool $entityExistsFunction The closure should take one
-	 *                                                        argument, which is the id of the entity, that comments
-	 *                                                        should be handled for. The return should then be bool,
-	 *                                                        depending on whether comments are allowed (true) or not.
-	 * @throws \OutOfBoundsException when the entity name is already taken
-	 * @since 9.1.0
-	 */
-	public function addEntityCollection(string $name, \Closure $entityExistsFunction): void {
-		if (isset($this->collections[$name])) {
-			throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
-		}
-
-		$this->collections[$name] = $entityExistsFunction;
-	}
-
-	/**
-	 * @return (\Closure(string $id): bool)[]
-	 * @since 9.1.0
-	 */
-	public function getEntityCollections(): array {
-		return $this->collections;
-	}
+    /**
+     * @since 9.1.0
+     * @deprecated 22.0.0 - Listen to the typed event instead.
+     */
+    public const EVENT_ENTITY = 'OCP\Comments\ICommentsManager::registerEntity';
+
+    /** @var (\Closure(string $id): bool)[] */
+    protected array $collections = [];
+
+    /**
+     * DispatcherEvent constructor.
+     *
+     * @since 9.1.0
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * @param string $name
+     * @param \Closure(string $id):bool $entityExistsFunction The closure should take one
+     *                                                        argument, which is the id of the entity, that comments
+     *                                                        should be handled for. The return should then be bool,
+     *                                                        depending on whether comments are allowed (true) or not.
+     * @throws \OutOfBoundsException when the entity name is already taken
+     * @since 9.1.0
+     */
+    public function addEntityCollection(string $name, \Closure $entityExistsFunction): void {
+        if (isset($this->collections[$name])) {
+            throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
+        }
+
+        $this->collections[$name] = $entityExistsFunction;
+    }
+
+    /**
+     * @return (\Closure(string $id): bool)[]
+     * @since 9.1.0
+     */
+    public function getEntityCollections(): array {
+        return $this->collections;
+    }
 }

lib/private/Comments/Manager.php

Indentation +1539 added lines, -1539 removed lines

@@ -33,1543 +33,1543 @@
 use Psr\Log\LoggerInterface;
 
 class Manager implements ICommentsManager {
-	/** @var IComment[] */
-	protected array $commentsCache = [];
-
-	/** @var \Closure[] */
-	protected array $eventHandlerClosures = [];
-
-	/** @var ICommentsEventHandler[] */
-	protected array $eventHandlers = [];
-
-	/** @var \Closure[] */
-	protected array $displayNameResolvers = [];
-
-	public function __construct(
-		protected IDBConnection $dbConn,
-		protected LoggerInterface $logger,
-		protected IConfig $config,
-		protected ITimeFactory $timeFactory,
-		protected IEmojiHelper $emojiHelper,
-		protected IInitialStateService $initialStateService,
-		protected IRootFolder $rootFolder,
-		protected IEventDispatcher $eventDispatcher,
-	) {
-	}
-
-	/**
-	 * converts data base data into PHP native, proper types as defined by
-	 * IComment interface.
-	 *
-	 * @param array $data
-	 */
-	protected function normalizeDatabaseData(array $data): array {
-		$data['id'] = (string)$data['id'];
-		$data['parent_id'] = (string)$data['parent_id'];
-		$data['topmost_parent_id'] = (string)$data['topmost_parent_id'];
-		$data['creation_timestamp'] = new \DateTime($data['creation_timestamp']);
-		if (!is_null($data['latest_child_timestamp'])) {
-			$data['latest_child_timestamp'] = new \DateTime($data['latest_child_timestamp']);
-		}
-		if (!is_null($data['expire_date'])) {
-			$data['expire_date'] = new \DateTime($data['expire_date']);
-		}
-		$data['children_count'] = (int)$data['children_count'];
-		$data['reference_id'] = $data['reference_id'];
-		$data['meta_data'] = json_decode($data['meta_data'], true);
-		if ($this->supportReactions()) {
-			if ($data['reactions'] !== null) {
-				$list = json_decode($data['reactions'], true);
-				// Ordering does not work on the database with group concat and Oracle,
-				// So we simply sort on the output.
-				if (is_array($list)) {
-					uasort($list, static function ($a, $b) {
-						if ($a === $b) {
-							return 0;
-						}
-						return ($a > $b) ? -1 : 1;
-					});
-					$data['reactions'] = $list;
-				} else {
-					$data['reactions'] = [];
-				}
-			} else {
-				$data['reactions'] = [];
-			}
-		}
-		return $data;
-	}
-
-	public function getCommentFromData(array $data): IComment {
-		return new Comment($this->normalizeDatabaseData($data));
-	}
-
-	/**
-	 * prepares a comment for an insert or update operation after making sure
-	 * all necessary fields have a value assigned.
-	 *
-	 * @param IComment $comment
-	 * @return IComment returns the same updated IComment instance as provided
-	 *                  by parameter for convenience
-	 * @throws \UnexpectedValueException
-	 */
-	protected function prepareCommentForDatabaseWrite(IComment $comment): IComment {
-		if (!$comment->getActorType()
-			|| $comment->getActorId() === ''
-			|| !$comment->getObjectType()
-			|| $comment->getObjectId() === ''
-			|| !$comment->getVerb()
-		) {
-			throw new \UnexpectedValueException('Actor, Object and Verb information must be provided for saving');
-		}
-
-		if ($comment->getVerb() === 'reaction' && !$this->emojiHelper->isValidSingleEmoji($comment->getMessage())) {
-			// 4 characters: laptop + person + gender + skin color => "

apps/comments/lib/Listener/CommentsEntityEventListener.php

Indentation +18 added lines, -18 removed lines

@@ -15,25 +15,25 @@
 
 /** @template-implements IEventListener<CommentsEntityEvent> */
 class CommentsEntityEventListener implements IEventListener {
-	public function __construct(
-		private IRootFolder $rootFolder,
-		private ?string $userId = null,
-	) {
-	}
+    public function __construct(
+        private IRootFolder $rootFolder,
+        private ?string $userId = null,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof CommentsEntityEvent)) {
-			// Unrelated
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof CommentsEntityEvent)) {
+            // Unrelated
+            return;
+        }
 
-		if ($this->userId === null) {
-			return;
-		}
+        if ($this->userId === null) {
+            return;
+        }
 
-		$event->addEntityCollection('files', function ($name): bool {
-			$nodes = $this->rootFolder->getUserFolder($this->userId)->getById((int)$name);
-			return !empty($nodes);
-		});
-	}
+        $event->addEntityCollection('files', function ($name): bool {
+            $nodes = $this->rootFolder->getUserFolder($this->userId)->getById((int)$name);
+            return !empty($nodes);
+        });
+    }
 }

apps/comments/lib/Listener/CommentsEventListener.php

Indentation +41 added lines, -41 removed lines

@@ -18,45 +18,45 @@
 
 /** @template-implements IEventListener<CommentsEvent|Event> */
 class CommentsEventListener implements IEventListener {
-	public function __construct(
-		private ActivityListener $activityListener,
-		private NotificationListener $notificationListener,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if (!$event instanceof CommentsEvent) {
-			return;
-		}
-
-		if ($event->getComment()->getObjectType() !== 'files') {
-			// this is a 'files'-specific Handler
-			return;
-		}
-
-		$eventType = $event->getEvent();
-		if ($eventType === CommentsEvent::EVENT_ADD) {
-			$this->notificationHandler($event);
-			$this->activityHandler($event);
-			return;
-		}
-
-		$applicableEvents = [
-			CommentsEvent::EVENT_PRE_UPDATE,
-			CommentsEvent::EVENT_UPDATE,
-			CommentsEvent::EVENT_DELETE,
-		];
-		if (in_array($eventType, $applicableEvents)) {
-			$this->notificationHandler($event);
-			return;
-		}
-	}
-
-	private function activityHandler(CommentsEvent $event): void {
-		$this->activityListener->commentEvent($event);
-	}
-
-	private function notificationHandler(CommentsEvent $event): void {
-		$this->notificationListener->evaluate($event);
-	}
+    public function __construct(
+        private ActivityListener $activityListener,
+        private NotificationListener $notificationListener,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if (!$event instanceof CommentsEvent) {
+            return;
+        }
+
+        if ($event->getComment()->getObjectType() !== 'files') {
+            // this is a 'files'-specific Handler
+            return;
+        }
+
+        $eventType = $event->getEvent();
+        if ($eventType === CommentsEvent::EVENT_ADD) {
+            $this->notificationHandler($event);
+            $this->activityHandler($event);
+            return;
+        }
+
+        $applicableEvents = [
+            CommentsEvent::EVENT_PRE_UPDATE,
+            CommentsEvent::EVENT_UPDATE,
+            CommentsEvent::EVENT_DELETE,
+        ];
+        if (in_array($eventType, $applicableEvents)) {
+            $this->notificationHandler($event);
+            return;
+        }
+    }
+
+    private function activityHandler(CommentsEvent $event): void {
+        $this->activityListener->commentEvent($event);
+    }
+
+    private function notificationHandler(CommentsEvent $event): void {
+        $this->notificationListener->evaluate($event);
+    }
 }