nextcloud / server

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);
+    }
 }

apps/comments/lib/Activity/Provider.php

Indentation +175 added lines, -175 removed lines

@@ -18,179 +18,179 @@
 use OCP\L10N\IFactory;
 
 class Provider implements IProvider {
-	public function __construct(
-		protected IFactory $languageFactory,
-		protected IURLGenerator $url,
-		protected ICommentsManager $commentsManager,
-		protected IUserManager $userManager,
-		protected IManager $activityManager,
-	) {
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws UnknownActivityException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'comments') {
-			throw new UnknownActivityException();
-		}
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			$l = $this->languageFactory->get('comments', $language);
-
-			$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, $l);
-				} catch (UnknownActivityException) {
-					// Ignore and simply use the long version...
-				}
-			}
-
-			return $this->parseLongVersion($event, $l);
-		}
-		throw new UnknownActivityException();
-
-	}
-
-	/**
-	 * @throws UnknownActivityException
-	 */
-	protected function parseShortVersion(IEvent $event, IL10N $l): IEvent {
-		$subjectParameters = $this->getSubjectParameters($event);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
-				$event->setRichSubject($l->t('You commented'), []);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters['actor']);
-				$event->setRichSubject($l->t('{author} commented'), [
-					'author' => $author,
-				]);
-			}
-		} else {
-			throw new UnknownActivityException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @throws UnknownActivityException
-	 */
-	protected function parseLongVersion(IEvent $event, IL10N $l): IEvent {
-		$subjectParameters = $this->getSubjectParameters($event);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($l->t('You commented on %1$s', [
-					$subjectParameters['filePath'],
-				]))
-					->setRichSubject($l->t('You commented on {file}'), [
-						'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
-					]);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters['actor']);
-				$event->setParsedSubject($l->t('%1$s commented on %2$s', [
-					$author['name'],
-					$subjectParameters['filePath'],
-				]))
-					->setRichSubject($l->t('{author} commented on {file}'), [
-						'author' => $author,
-						'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
-					]);
-			}
-		} else {
-			throw new UnknownActivityException();
-		}
-
-		return $event;
-	}
-
-	protected function getSubjectParameters(IEvent $event): array {
-		$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' => $event->getObjectId(),
-			'filePath' => trim($subjectParameters[1], '/'),
-		];
-	}
-
-	protected function parseMessage(IEvent $event): void {
-		$messageParameters = $event->getMessageParameters();
-		if (empty($messageParameters)) {
-			// Email
-			return;
-		}
-
-		$commentId = $messageParameters['commentId'] ?? $messageParameters[0];
-
-		try {
-			$comment = $this->commentsManager->get((string)$commentId);
-			$message = $comment->getMessage();
-
-			$mentionCount = 1;
-			$mentions = [];
-			foreach ($comment->getMentions() as $mention) {
-				if ($mention['type'] !== 'user') {
-					continue;
-				}
-
-				$message = str_replace('@"' . $mention['id'] . '"', '{mention' . $mentionCount . '}', $message);
-				if (!str_contains($mention['id'], ' ') && !str_starts_with($mention['id'], 'guest/')) {
-					$message = str_replace('@' . $mention['id'], '{mention' . $mentionCount . '}', $message);
-				}
-
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
-				$mentionCount++;
-			}
-
-			$event->setParsedMessage($comment->getMessage())
-				->setRichMessage($message, $mentions);
-		} catch (NotFoundException $e) {
-		}
-	}
-
-	/**
-	 * @return array<string, string>
-	 */
-	protected function generateFileParameter(int $id, string $path): array {
-		return [
-			'type' => 'file',
-			'id' => (string)$id,
-			'name' => basename($path),
-			'path' => $path,
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    public function __construct(
+        protected IFactory $languageFactory,
+        protected IURLGenerator $url,
+        protected ICommentsManager $commentsManager,
+        protected IUserManager $userManager,
+        protected IManager $activityManager,
+    ) {
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws UnknownActivityException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
+        if ($event->getApp() !== 'comments') {
+            throw new UnknownActivityException();
+        }
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            $l = $this->languageFactory->get('comments', $language);
+
+            $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, $l);
+                } catch (UnknownActivityException) {
+                    // Ignore and simply use the long version...
+                }
+            }
+
+            return $this->parseLongVersion($event, $l);
+        }
+        throw new UnknownActivityException();
+
+    }
+
+    /**
+     * @throws UnknownActivityException
+     */
+    protected function parseShortVersion(IEvent $event, IL10N $l): IEvent {
+        $subjectParameters = $this->getSubjectParameters($event);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
+                $event->setRichSubject($l->t('You commented'), []);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters['actor']);
+                $event->setRichSubject($l->t('{author} commented'), [
+                    'author' => $author,
+                ]);
+            }
+        } else {
+            throw new UnknownActivityException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @throws UnknownActivityException
+     */
+    protected function parseLongVersion(IEvent $event, IL10N $l): IEvent {
+        $subjectParameters = $this->getSubjectParameters($event);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($l->t('You commented on %1$s', [
+                    $subjectParameters['filePath'],
+                ]))
+                    ->setRichSubject($l->t('You commented on {file}'), [
+                        'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
+                    ]);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters['actor']);
+                $event->setParsedSubject($l->t('%1$s commented on %2$s', [
+                    $author['name'],
+                    $subjectParameters['filePath'],
+                ]))
+                    ->setRichSubject($l->t('{author} commented on {file}'), [
+                        'author' => $author,
+                        'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
+                    ]);
+            }
+        } else {
+            throw new UnknownActivityException();
+        }
+
+        return $event;
+    }
+
+    protected function getSubjectParameters(IEvent $event): array {
+        $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' => $event->getObjectId(),
+            'filePath' => trim($subjectParameters[1], '/'),
+        ];
+    }
+
+    protected function parseMessage(IEvent $event): void {
+        $messageParameters = $event->getMessageParameters();
+        if (empty($messageParameters)) {
+            // Email
+            return;
+        }
+
+        $commentId = $messageParameters['commentId'] ?? $messageParameters[0];
+
+        try {
+            $comment = $this->commentsManager->get((string)$commentId);
+            $message = $comment->getMessage();
+
+            $mentionCount = 1;
+            $mentions = [];
+            foreach ($comment->getMentions() as $mention) {
+                if ($mention['type'] !== 'user') {
+                    continue;
+                }
+
+                $message = str_replace('@"' . $mention['id'] . '"', '{mention' . $mentionCount . '}', $message);
+                if (!str_contains($mention['id'], ' ') && !str_starts_with($mention['id'], 'guest/')) {
+                    $message = str_replace('@' . $mention['id'], '{mention' . $mentionCount . '}', $message);
+                }
+
+                $mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+                $mentionCount++;
+            }
+
+            $event->setParsedMessage($comment->getMessage())
+                ->setRichMessage($message, $mentions);
+        } catch (NotFoundException $e) {
+        }
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function generateFileParameter(int $id, string $path): array {
+        return [
+            'type' => 'file',
+            'id' => (string)$id,
+            'name' => basename($path),
+            'path' => $path,
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 }

apps/comments/lib/Activity/Setting.php

Indentation +40 added lines, -40 removed lines

@@ -10,44 +10,44 @@
 use OCP\IL10N;
 
 class Setting extends ActivitySettings {
-	public function __construct(
-		protected readonly IL10N $l,
-	) {
-	}
-
-	public function getIdentifier(): string {
-		return 'comments';
-	}
-
-	public function getName(): string {
-		return $this->l->t('<strong>Comments</strong> for files');
-	}
-
-	public function getGroupIdentifier(): string {
-		return 'files';
-	}
-
-	public function getGroupName(): string {
-		return $this->l->t('Files');
-	}
-
-	public function getPriority(): int {
-		return 50;
-	}
-
-	public function canChangeStream(): bool {
-		return true;
-	}
-
-	public function isDefaultEnabledStream(): bool {
-		return true;
-	}
-
-	public function canChangeMail(): bool {
-		return true;
-	}
-
-	public function isDefaultEnabledMail(): bool {
-		return false;
-	}
+    public function __construct(
+        protected readonly IL10N $l,
+    ) {
+    }
+
+    public function getIdentifier(): string {
+        return 'comments';
+    }
+
+    public function getName(): string {
+        return $this->l->t('<strong>Comments</strong> for files');
+    }
+
+    public function getGroupIdentifier(): string {
+        return 'files';
+    }
+
+    public function getGroupName(): string {
+        return $this->l->t('Files');
+    }
+
+    public function getPriority(): int {
+        return 50;
+    }
+
+    public function canChangeStream(): bool {
+        return true;
+    }
+
+    public function isDefaultEnabledStream(): bool {
+        return true;
+    }
+
+    public function canChangeMail(): bool {
+        return true;
+    }
+
+    public function isDefaultEnabledMail(): bool {
+        return false;
+    }
 }

apps/comments/tests/Unit/Notification/ListenerTest.php

Indentation +163 added lines, -163 removed lines

@@ -21,167 +21,167 @@
 use Test\TestCase;
 
 class ListenerTest extends TestCase {
-	protected IManager&MockObject $notificationManager;
-	protected IUserManager&MockObject $userManager;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected Listener $listener;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$this->listener = new Listener(
-			$this->notificationManager,
-			$this->userManager
-		);
-	}
-
-	public static function eventProvider(): array {
-		return [
-			['add', 'notify'],
-			['update', 'notify'],
-			['pre_update', 'markProcessed'],
-			['delete', 'markProcessed']
-		];
-	}
-
-	/**
-	 * @param string $eventType
-	 * @param string $notificationMethod
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
-	public function testEvaluate(string $eventType, $notificationMethod): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getCreationDateTime')
-			->willReturn(new \DateTime());
-		$comment->expects($this->once())
-			->method('getMentions')
-			->willReturn([
-				[ 'type' => 'user', 'id' => 'foobar'],
-				[ 'type' => 'user', 'id' => 'barfoo'],
-				[ 'type' => 'user', 'id' => 'foo@bar.com'],
-				[ 'type' => 'user', 'id' => 'bar@foo.org@foobar.io'],
-				[ 'type' => 'user', 'id' => '23452-4333-54353-2342'],
-				[ 'type' => 'user', 'id' => 'yolo'],
-			]);
-		$comment->expects($this->atLeastOnce())
-			->method('getId')
-			->willReturn('1234');
-
-		$event = match ($eventType) {
-			'add' => new CommentAddedEvent($comment),
-			'pre_update' => new BeforeCommentUpdatedEvent($comment),
-			'update' => new CommentUpdatedEvent($comment),
-			'delete' => new CommentDeletedEvent($comment),
-		};
-
-		/** @var INotification|MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->any())
-			->method($this->anything())
-			->willReturn($notification);
-		$notification->expects($this->exactly(6))
-			->method('setUser');
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->exactly(6))
-			->method($notificationMethod)
-			->with($this->isInstanceOf('\OCP\Notification\INotification'));
-
-		$this->userManager->expects($this->exactly(6))
-			->method('userExists')
-			->willReturnMap([
-				['foobar', true],
-				['barfoo', true],
-				['foo@bar.com', true],
-				['bar@foo.org@foobar.io', true],
-				['23452-4333-54353-2342', true],
-				['yolo', true]
-			]);
-
-		$this->listener->evaluate($event);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
-	public function testEvaluateNoMentions(string $eventType): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getCreationDateTime')
-			->willReturn(new \DateTime());
-		$comment->expects($this->once())
-			->method('getMentions')
-			->willReturn([]);
-
-		$event = match ($eventType) {
-			'add' => new CommentAddedEvent($comment),
-			'pre_update' => new BeforeCommentUpdatedEvent($comment),
-			'update' => new CommentUpdatedEvent($comment),
-			'delete' => new CommentDeletedEvent($comment),
-		};
-
-		$this->notificationManager->expects($this->never())
-			->method('createNotification');
-		$this->notificationManager->expects($this->never())
-			->method('notify');
-		$this->notificationManager->expects($this->never())
-			->method('markProcessed');
-
-		$this->userManager->expects($this->never())
-			->method('userExists');
-
-		$this->listener->evaluate($event);
-	}
-
-	public function testEvaluateUserDoesNotExist(): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getCreationDateTime')
-			->willReturn(new \DateTime());
-		$comment->expects($this->once())
-			->method('getMentions')
-			->willReturn([[ 'type' => 'user', 'id' => 'foobar']]);
-		$comment->expects($this->atLeastOnce())
-			->method('getId')
-			->willReturn('1234');
-
-		$event = new CommentAddedEvent($comment);
-
-		/** @var INotification|MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->any())
-			->method($this->anything())
-			->willReturn($notification);
-		$notification->expects($this->never())
-			->method('setUser');
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->never())
-			->method('notify');
-
-		$this->userManager->expects($this->once())
-			->method('userExists')
-			->with('foobar')
-			->willReturn(false);
-
-		$this->listener->evaluate($event);
-	}
+    protected IManager&MockObject $notificationManager;
+    protected IUserManager&MockObject $userManager;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected Listener $listener;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $this->listener = new Listener(
+            $this->notificationManager,
+            $this->userManager
+        );
+    }
+
+    public static function eventProvider(): array {
+        return [
+            ['add', 'notify'],
+            ['update', 'notify'],
+            ['pre_update', 'markProcessed'],
+            ['delete', 'markProcessed']
+        ];
+    }
+
+    /**
+     * @param string $eventType
+     * @param string $notificationMethod
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
+    public function testEvaluate(string $eventType, $notificationMethod): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getCreationDateTime')
+            ->willReturn(new \DateTime());
+        $comment->expects($this->once())
+            ->method('getMentions')
+            ->willReturn([
+                [ 'type' => 'user', 'id' => 'foobar'],
+                [ 'type' => 'user', 'id' => 'barfoo'],
+                [ 'type' => 'user', 'id' => 'foo@bar.com'],
+                [ 'type' => 'user', 'id' => 'bar@foo.org@foobar.io'],
+                [ 'type' => 'user', 'id' => '23452-4333-54353-2342'],
+                [ 'type' => 'user', 'id' => 'yolo'],
+            ]);
+        $comment->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn('1234');
+
+        $event = match ($eventType) {
+            'add' => new CommentAddedEvent($comment),
+            'pre_update' => new BeforeCommentUpdatedEvent($comment),
+            'update' => new CommentUpdatedEvent($comment),
+            'delete' => new CommentDeletedEvent($comment),
+        };
+
+        /** @var INotification|MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->any())
+            ->method($this->anything())
+            ->willReturn($notification);
+        $notification->expects($this->exactly(6))
+            ->method('setUser');
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->exactly(6))
+            ->method($notificationMethod)
+            ->with($this->isInstanceOf('\OCP\Notification\INotification'));
+
+        $this->userManager->expects($this->exactly(6))
+            ->method('userExists')
+            ->willReturnMap([
+                ['foobar', true],
+                ['barfoo', true],
+                ['foo@bar.com', true],
+                ['bar@foo.org@foobar.io', true],
+                ['23452-4333-54353-2342', true],
+                ['yolo', true]
+            ]);
+
+        $this->listener->evaluate($event);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
+    public function testEvaluateNoMentions(string $eventType): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getCreationDateTime')
+            ->willReturn(new \DateTime());
+        $comment->expects($this->once())
+            ->method('getMentions')
+            ->willReturn([]);
+
+        $event = match ($eventType) {
+            'add' => new CommentAddedEvent($comment),
+            'pre_update' => new BeforeCommentUpdatedEvent($comment),
+            'update' => new CommentUpdatedEvent($comment),
+            'delete' => new CommentDeletedEvent($comment),
+        };
+
+        $this->notificationManager->expects($this->never())
+            ->method('createNotification');
+        $this->notificationManager->expects($this->never())
+            ->method('notify');
+        $this->notificationManager->expects($this->never())
+            ->method('markProcessed');
+
+        $this->userManager->expects($this->never())
+            ->method('userExists');
+
+        $this->listener->evaluate($event);
+    }
+
+    public function testEvaluateUserDoesNotExist(): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getCreationDateTime')
+            ->willReturn(new \DateTime());
+        $comment->expects($this->once())
+            ->method('getMentions')
+            ->willReturn([[ 'type' => 'user', 'id' => 'foobar']]);
+        $comment->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn('1234');
+
+        $event = new CommentAddedEvent($comment);
+
+        /** @var INotification|MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->any())
+            ->method($this->anything())
+            ->willReturn($notification);
+        $notification->expects($this->never())
+            ->method('setUser');
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->never())
+            ->method('notify');
+
+        $this->userManager->expects($this->once())
+            ->method('userExists')
+            ->with('foobar')
+            ->willReturn(false);
+
+        $this->listener->evaluate($event);
+    }
 }

apps/comments/tests/Unit/EventHandlerTest.php

Indentation +65 added lines, -65 removed lines

@@ -21,69 +21,69 @@
 use Test\TestCase;
 
 class EventHandlerTest extends TestCase {
-	protected ActivityListener&MockObject $activityListener;
-	protected NotificationListener&MockObject $notificationListener;
-	protected CommentsEventListener $eventHandler;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->activityListener = $this->createMock(ActivityListener::class);
-		$this->notificationListener = $this->createMock(NotificationListener::class);
-
-		$this->eventHandler = new CommentsEventListener($this->activityListener, $this->notificationListener);
-	}
-
-	public function testNotFiles(): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->once())
-			->method('getObjectType')
-			->willReturn('smiles');
-
-		/** @var CommentsEvent|MockObject $event */
-		$event = $this->createMock(CommentsEvent::class);
-		$event->expects($this->once())
-			->method('getComment')
-			->willReturn($comment);
-		$event->expects($this->never())
-			->method('getEvent');
-
-		$this->eventHandler->handle($event);
-	}
-
-	public static function handledProvider(): array {
-		return [
-			['delete'],
-			['update'],
-			['pre_update'],
-			['add']
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('handledProvider')]
-	public function testHandled(string $eventType): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->once())
-			->method('getObjectType')
-			->willReturn('files');
-
-		$event = match ($eventType) {
-			'add' => new CommentAddedEvent($comment),
-			'pre_update' => new BeforeCommentUpdatedEvent($comment),
-			'update' => new CommentUpdatedEvent($comment),
-			'delete' => new CommentDeletedEvent($comment),
-		};
-
-		$this->notificationListener->expects($this->once())
-			->method('evaluate')
-			->with($event);
-
-		$this->activityListener->expects($this->any())
-			->method('commentEvent')
-			->with($event);
-
-		$this->eventHandler->handle($event);
-	}
+    protected ActivityListener&MockObject $activityListener;
+    protected NotificationListener&MockObject $notificationListener;
+    protected CommentsEventListener $eventHandler;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->activityListener = $this->createMock(ActivityListener::class);
+        $this->notificationListener = $this->createMock(NotificationListener::class);
+
+        $this->eventHandler = new CommentsEventListener($this->activityListener, $this->notificationListener);
+    }
+
+    public function testNotFiles(): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->once())
+            ->method('getObjectType')
+            ->willReturn('smiles');
+
+        /** @var CommentsEvent|MockObject $event */
+        $event = $this->createMock(CommentsEvent::class);
+        $event->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+        $event->expects($this->never())
+            ->method('getEvent');
+
+        $this->eventHandler->handle($event);
+    }
+
+    public static function handledProvider(): array {
+        return [
+            ['delete'],
+            ['update'],
+            ['pre_update'],
+            ['add']
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('handledProvider')]
+    public function testHandled(string $eventType): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->once())
+            ->method('getObjectType')
+            ->willReturn('files');
+
+        $event = match ($eventType) {
+            'add' => new CommentAddedEvent($comment),
+            'pre_update' => new BeforeCommentUpdatedEvent($comment),
+            'update' => new CommentUpdatedEvent($comment),
+            'delete' => new CommentDeletedEvent($comment),
+        };
+
+        $this->notificationListener->expects($this->once())
+            ->method('evaluate')
+            ->with($event);
+
+        $this->activityListener->expects($this->any())
+            ->method('commentEvent')
+            ->with($event);
+
+        $this->eventHandler->handle($event);
+    }
 }

apps/comments/tests/Unit/Activity/ListenerTest.php

Indentation +122 added lines, -122 removed lines

@@ -27,126 +27,126 @@
 use Test\TestCase;
 
 class ListenerTest extends TestCase {
-	protected IManager&MockObject $activityManager;
-	protected IUserSession&MockObject $session;
-	protected IAppManager&MockObject $appManager;
-	protected IMountProviderCollection&MockObject $mountProviderCollection;
-	protected IRootFolder&MockObject $rootFolder;
-	protected IShareHelper&MockObject $shareHelper;
-	protected Listener $listener;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->activityManager = $this->createMock(IManager::class);
-		$this->session = $this->createMock(IUserSession::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->mountProviderCollection = $this->createMock(IMountProviderCollection::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->shareHelper = $this->createMock(IShareHelper::class);
-
-		$this->listener = new Listener(
-			$this->activityManager,
-			$this->session,
-			$this->appManager,
-			$this->mountProviderCollection,
-			$this->rootFolder,
-			$this->shareHelper
-		);
-	}
-
-	public function testCommentEvent(): void {
-		$this->appManager->expects($this->any())
-			->method('isEnabledForAnyone')
-			->with('activity')
-			->willReturn(true);
-
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-
-		$event = new CommentAddedEvent($comment);
-
-		/** @var IUser|MockObject $ownerUser */
-		$ownerUser = $this->createMock(IUser::class);
-		$ownerUser->expects($this->any())
-			->method('getUID')
-			->willReturn('937393');
-
-		/** @var MockObject $mount */
-		$mount = $this->createMock(ICachedMountFileInfo::class);
-		$mount->expects($this->any())
-			->method('getUser')
-			->willReturn($ownerUser); // perhaps not the right user, but does not matter in this scenario
-
-		$mounts = [ $mount, $mount ]; // to make sure duplicates are dealt with
-
-		$userMountCache = $this->createMock(IUserMountCache::class);
-		$userMountCache->expects($this->any())
-			->method('getMountsForFileId')
-			->willReturn($mounts);
-
-		$this->mountProviderCollection->expects($this->any())
-			->method('getMountCache')
-			->willReturn($userMountCache);
-
-		$node = $this->createMock(Node::class);
-		$nodes = [ $node ];
-
-		$ownerFolder = $this->createMock(Folder::class);
-		$ownerFolder->expects($this->any())
-			->method('getById')
-			->willReturn($nodes);
-
-		$this->rootFolder->expects($this->any())
-			->method('getUserFolder')
-			->willReturn($ownerFolder);
-
-		$al = [ 'users' => [
-			'873304' => 'i/got/it/here',
-			'254342' => 'there/i/have/it',
-			'sandra' => 'and/here/i/placed/it'
-		]];
-		$this->shareHelper->expects($this->any())
-			->method('getPathsForAccessList')
-			->willReturn($al);
-
-		$this->session->expects($this->any())
-			->method('getUser')
-			->willReturn($ownerUser);
-
-		/** @var MockObject $activity */
-		$activity = $this->createMock(IEvent::class);
-		$activity->expects($this->exactly(count($al['users'])))
-			->method('setAffectedUser');
-		$activity->expects($this->once())
-			->method('setApp')
-			->with('comments')
-			->willReturnSelf();
-		$activity->expects($this->once())
-			->method('setType')
-			->with('comments')
-			->willReturnSelf();
-		$activity->expects($this->once())
-			->method('setAuthor')
-			->with($ownerUser->getUID())
-			->willReturnSelf();
-		$activity->expects($this->once())
-			->method('setObject')
-			->with('files', $this->anything())
-			->willReturnSelf();
-		$activity->expects($this->once())
-			->method('setMessage')
-			->with('add_comment_message', $this->anything())
-			->willReturnSelf();
-
-		$this->activityManager->expects($this->once())
-			->method('generateEvent')
-			->willReturn($activity);
-		$this->activityManager->expects($this->exactly(count($al['users'])))
-			->method('publish');
-
-		$this->listener->commentEvent($event);
-	}
+    protected IManager&MockObject $activityManager;
+    protected IUserSession&MockObject $session;
+    protected IAppManager&MockObject $appManager;
+    protected IMountProviderCollection&MockObject $mountProviderCollection;
+    protected IRootFolder&MockObject $rootFolder;
+    protected IShareHelper&MockObject $shareHelper;
+    protected Listener $listener;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->activityManager = $this->createMock(IManager::class);
+        $this->session = $this->createMock(IUserSession::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->mountProviderCollection = $this->createMock(IMountProviderCollection::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+        $this->shareHelper = $this->createMock(IShareHelper::class);
+
+        $this->listener = new Listener(
+            $this->activityManager,
+            $this->session,
+            $this->appManager,
+            $this->mountProviderCollection,
+            $this->rootFolder,
+            $this->shareHelper
+        );
+    }
+
+    public function testCommentEvent(): void {
+        $this->appManager->expects($this->any())
+            ->method('isEnabledForAnyone')
+            ->with('activity')
+            ->willReturn(true);
+
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+
+        $event = new CommentAddedEvent($comment);
+
+        /** @var IUser|MockObject $ownerUser */
+        $ownerUser = $this->createMock(IUser::class);
+        $ownerUser->expects($this->any())
+            ->method('getUID')
+            ->willReturn('937393');
+
+        /** @var MockObject $mount */
+        $mount = $this->createMock(ICachedMountFileInfo::class);
+        $mount->expects($this->any())
+            ->method('getUser')
+            ->willReturn($ownerUser); // perhaps not the right user, but does not matter in this scenario
+
+        $mounts = [ $mount, $mount ]; // to make sure duplicates are dealt with
+
+        $userMountCache = $this->createMock(IUserMountCache::class);
+        $userMountCache->expects($this->any())
+            ->method('getMountsForFileId')
+            ->willReturn($mounts);
+
+        $this->mountProviderCollection->expects($this->any())
+            ->method('getMountCache')
+            ->willReturn($userMountCache);
+
+        $node = $this->createMock(Node::class);
+        $nodes = [ $node ];
+
+        $ownerFolder = $this->createMock(Folder::class);
+        $ownerFolder->expects($this->any())
+            ->method('getById')
+            ->willReturn($nodes);
+
+        $this->rootFolder->expects($this->any())
+            ->method('getUserFolder')
+            ->willReturn($ownerFolder);
+
+        $al = [ 'users' => [
+            '873304' => 'i/got/it/here',
+            '254342' => 'there/i/have/it',
+            'sandra' => 'and/here/i/placed/it'
+        ]];
+        $this->shareHelper->expects($this->any())
+            ->method('getPathsForAccessList')
+            ->willReturn($al);
+
+        $this->session->expects($this->any())
+            ->method('getUser')
+            ->willReturn($ownerUser);
+
+        /** @var MockObject $activity */
+        $activity = $this->createMock(IEvent::class);
+        $activity->expects($this->exactly(count($al['users'])))
+            ->method('setAffectedUser');
+        $activity->expects($this->once())
+            ->method('setApp')
+            ->with('comments')
+            ->willReturnSelf();
+        $activity->expects($this->once())
+            ->method('setType')
+            ->with('comments')
+            ->willReturnSelf();
+        $activity->expects($this->once())
+            ->method('setAuthor')
+            ->with($ownerUser->getUID())
+            ->willReturnSelf();
+        $activity->expects($this->once())
+            ->method('setObject')
+            ->with('files', $this->anything())
+            ->willReturnSelf();
+        $activity->expects($this->once())
+            ->method('setMessage')
+            ->with('add_comment_message', $this->anything())
+            ->willReturnSelf();
+
+        $this->activityManager->expects($this->once())
+            ->method('generateEvent')
+            ->willReturn($activity);
+        $this->activityManager->expects($this->exactly(count($al['users'])))
+            ->method('publish');
+
+        $this->listener->commentEvent($event);
+    }
 }