Merge pull request #1519 from nextcloud/better-comments-in-activity-sidebar

Better comments in activity sidebar

1 files changed, 2 insertions, 12 deletions

diff --git a/apps/comments/lib/Activity/Extension.php b/apps/comments/lib/Activity/Extension.php
index 8abe42eb9df..6bf7bc9ac0b 100644
--- a/apps/comments/lib/Activity/Extension.php
+++ b/apps/comments/lib/Activity/Extension.php
@@ -159,7 +159,7 @@ class Extension implements IExtension {
 				}
 				return (string) $l->t('%1$s commented', $params);
 			case self::ADD_COMMENT_MESSAGE:
-				return $this->convertParameterToComment($params[0], 120);
+				return $this->convertParameterToComment($params[0]);
 		}
 
 		return false;
@@ -196,7 +196,6 @@ class Extension implements IExtension {
 		try {
 			return strip_tags($user) === $this->activityManager->getCurrentUserId();
 		} catch (\UnexpectedValueException $e) {
-			// FIXME this is awkward, but we have no access to the current user in emails
 			return false;
 		}
 	}
@@ -301,21 +300,12 @@ class Extension implements IExtension {
 	 * @param string $parameter
 	 * @return string
 	 */
-	protected function convertParameterToComment($parameter, $maxLength = 0) {
+	protected function convertParameterToComment($parameter) {
 		if (preg_match('/^\<parameter\>(\d*)\<\/parameter\>$/', $parameter, $matches)) {
 			try {
 				$comment = $this->commentsManager->get((int) $matches[1]);
 				$message = $comment->getMessage();
 				$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
-
-				if ($maxLength && isset($message[$maxLength + 20])) {
-					$findSpace = strpos($message, ' ', $maxLength);
-					if ($findSpace !== false && $findSpace < $maxLength + 20) {
-						return substr($message, 0, $findSpace) . '…';
-					}
-					return substr($message, 0, $maxLength + 20) . '…';
-				}
-
 				return $message;
 			} catch (NotFoundException $e) {
 				return '';