Use absolute icon url (fix #280)

R0Wi-DEV · Dec 1, 2024 · b6c1770 · b6c1770
1 parent 89dde04
commit b6c1770
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -111,7 +111,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 		$message = $notification->getSubjectParameters()['message'];
 		$notification
 			->setParsedMessage($message)
-			->setIcon($this->urlGenerator->imagePath(Application::APP_NAME, 'app-dark.svg'));
+			->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath(Application::APP_NAME, 'app-dark.svg')));
 
 		return $notification;
 	}

diff --git a/tests/Unit/Notification/NotifierTest.php b/tests/Unit/Notification/NotifierTest.php
@@ -160,6 +160,10 @@ public function testPrepareConstructsOcrErrorCorrectlyWithFileId() {
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->urlGenerator->expects($this->once())
 			->method('linkToRouteAbsolute')
@@ -204,6 +208,10 @@ public function testPrepareConstructsOcrErrorCorrectlyWithoutFile() {
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->urlGenerator->expects($this->never())
 			->method('linkToRouteAbsolute');
@@ -251,6 +259,10 @@ public function testSendsFallbackNotificationWithoutFileInfoIfFileNotFoundWasThr
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->logger->expects($this->once())
 			->method('error')
@@ -297,6 +309,10 @@ public function testSendsFallbackNotificationWithoutFileInfoIfReturnedFileArrayW
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->logger->expects($this->once())
 			->method('warning')