Set the rich subject

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Nov 4, 2016 · fb570ac · fb570ac
1 parent 683a24f
commit fb570ac
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 16 deletions.
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -25,6 +25,7 @@
 
 
 use OCA\AnnouncementCenter\Manager;
+use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
@@ -42,15 +43,20 @@ class Notifier implements INotifier {
 	/** @var IUserManager */
 	protected $userManager;
 
+	/** @var IURLGenerator */
+	protected $urlGenerator;
+
 	/**
 	 * @param Manager $manager
 	 * @param IFactory $l10nFactory
 	 * @param IUserManager $userManager
+	 * @param IURLGenerator $urlGenerator
 	 */
-	public function __construct(Manager $manager, IFactory $l10nFactory, IUserManager $userManager) {
+	public function __construct(Manager $manager, IFactory $l10nFactory, IUserManager $userManager, IURLGenerator $urlGenerator) {
 		$this->manager = $manager;
-		$this->userManager = $userManager;
 		$this->l10nFactory = $l10nFactory;
+		$this->userManager = $userManager;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -74,15 +80,34 @@ public function prepare(INotification $notification, $languageCode) {
 				$params = $notification->getSubjectParameters();
 				$user = $this->userManager->get($params[0]);
 				if ($user instanceof IUser) {
-					$params[0] = $user->getDisplayName();
+					$displayName = $user->getDisplayName();
+				} else {
+					$displayName = $params[0];
 				}
 
 				$announcement = $this->manager->getAnnouncement((int) $notification->getObjectId(), false, false, false);
-				$params[] = str_replace("\n", ' ', $announcement['subject']);
+				$subject = str_replace("\n", ' ', $announcement['subject']);
+				$parsedParameters = [$displayName, $subject];
 
 				$notification->setParsedMessage($announcement['message'])
+					->setRichSubject(
+						$l->t('{user} announced “{announcement}”'),
+						[
+							'user' => [
+								'type' => 'user',
+								'id' => $params[0],
+								'name' => $displayName,
+							],
+							'announcement' => [
+								'type' => 'announcement',
+								'id' => $notification->getObjectId(),
+								'name' => $subject,
+								'link' => $this->urlGenerator->linkToRouteAbsolute('announcementcenter.page.index') . '#' . $notification->getObjectId(),
+							],
+						]
+					)
 					->setParsedSubject(
-						(string) $l->t('%1$s announced “%2$s”', $params)
+						(string) $l->t('%1$s announced “%2$s”', $parsedParameters)
 					);
 				return $notification;
 

diff --git a/tests/Notification/NotifierTest.php b/tests/Notification/NotifierTest.php
@@ -27,6 +27,7 @@
 use OCA\AnnouncementCenter\Manager;
 use OCA\AnnouncementCenter\Tests\TestCase;
 use OCP\IL10N;
+use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 
@@ -40,21 +41,18 @@ class NotifierTest extends TestCase {
 	protected $userManager;
 	/** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */
 	protected $factory;
+	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+	protected $urlGenerator;
 	/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
 	protected $l;
 
 	protected function setUp() {
 		parent::setUp();
 
-		$this->manager = $this->getMockBuilder('OCA\AnnouncementCenter\Manager')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->l = $this->getMockBuilder('OCP\IL10N')
-			->disableOriginalConstructor()
-			->getMock();
+		$this->manager = $this->createMock(Manager::class);
+		$this->userManager = $this->createMock(IUserManager::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->l = $this->createMock(IL10N::class);
 		$this->l->expects($this->any())
 			->method('t')
 			->willReturnCallback(function($string, $args) {
@@ -70,7 +68,8 @@ protected function setUp() {
 		$this->notifier = new Notifier(
 			$this->manager,
 			$this->factory,
-			$this->userManager
+			$this->userManager,
+			$this->urlGenerator
 		);
 	}
 
@@ -157,7 +156,7 @@ public function testPrepare($author, $subject, $message, $objectId, $userObject,
 		$notification->expects($this->once())
 			->method('getSubjectParameters')
 			->willReturn([$author]);
-		$notification->expects($this->once())
+		$notification->expects($this->exactly(3))
 			->method('getObjectId')
 			->willReturn($objectId);
 
@@ -177,6 +176,10 @@ public function testPrepare($author, $subject, $message, $objectId, $userObject,
 			->method('setParsedMessage')
 			->with($expectedMessage)
 			->willReturnSelf();
+		$notification->expects($this->once())
+			->method('setRichSubject')
+			->with('{user} announced “{announcement}”', $this->anything())
+			->willReturnSelf();
 		$notification->expects($this->once())
 			->method('setParsedSubject')
 			->with($expectedSubject)