Merge pull request #66 from owncloud/backport-65

[9.0] Make sure that the notification API can deliver the full message

lib/notificationsnotifier.php

@@ -75,9 +75,9 @@ public function prepare(INotification $notification, $languageCode) {
 				}
 
 				$announcement = $this->manager->getAnnouncement($notification->getObjectId(), false);
-				$params[] = $this->prepareMessage($announcement['subject']);
+				$params[] = str_replace("\n", ' ', $announcement['subject']);
 
-				$notification->setParsedMessage($this->prepareMessage($announcement['message']))
+				$notification->setParsedMessage($announcement['message'])
 					->setParsedSubject(
 						(string) $l->t('%1$s announced “%2$s”', $params)
 					);
@@ -88,27 +88,4 @@ public function prepare(INotification $notification, $languageCode) {
 				throw new \InvalidArgumentException();
 		}
 	}
-
-	/**
-	 * Prepare message for notification usage
-	 *
-	 * + Replace line breaks with spaces
-	 * + Trim on word end after 100 chars or hard 120 chars
-	 *
-	 * @param string $message
-	 * @return string
-	 */
-	protected function prepareMessage($message) {
-		$message = str_replace("\n", ' ', $message);
-
-		if (isset($message[120])) {
-			$findSpace = strpos($message, ' ', 100);
-			if ($findSpace !== false && $findSpace < 120) {
-				return substr($message, 0, $findSpace) . '…';
-			}
-			return substr($message, 0, 120) . '…';
-		}
-
-		return $message;
-	}
 }

tests/lib/NotificationsNotifierTest.php

@@ -121,14 +121,11 @@ protected function getUserMock() {
 	}
 
 	public function dataPrepare() {
-		$subject = "subject\nsubject subject subject subject subject subject subject subject subject subject subject subject subject subject subject subject subject subject";
-		$subjectTrim = 'subject subject subject subject subject subject subject subject subject subject subject subject subject…';
 		$message = "message\nmessage message message message message message message message message message message messagemessagemessagemessagemessagemessagemessage";
-		$messageTrim = 'message message message message message message message message message message message message messagemessagemessagemes…';
 		return [
 			['author', 'subject', 'message', 42, null, 'author announced “subject”', 'message'],
 			['author1', 'subject', 'message', 42, $this->getUserMock(), 'Author announced “subject”', 'message'],
-			['author2', $subject, $message, 21, null, 'author2 announced “' . $subjectTrim . '”', $messageTrim],
+			['author2', "subject\nsubject", $message, 21, null, 'author2 announced “subject subject”', $message],
 		];
 	}