Merge pull request #38605 from fsamapoor/replace_strpos_calls_in_comm…

…ents_app Refactors "strpos" calls in /apps/comments
nextcloud · Jun 29, 2023 · fc3ac4d · fc3ac4d
2 parents f43c24b + 7e33e59
commit fc3ac4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/comments/lib/Activity/Provider.php b/apps/comments/lib/Activity/Provider.php
@@ -182,7 +182,7 @@ protected function parseMessage(IEvent $event): void {
 				}
 
 				$message = str_replace('@"' . $mention['id'] . '"', '{mention' . $mentionCount . '}', $message);
-				if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
+				if (!str_contains($mention['id'], ' ') && !str_starts_with($mention['id'], 'guest/')) {
 					$message = str_replace('@' . $mention['id'], '{mention' . $mentionCount . '}', $message);
 				}
 

diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php
@@ -118,7 +118,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 				$node = $nodes[0];
 
 				$path = rtrim($node->getPath(), '/');
-				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
+				if (str_starts_with($path, '/' . $notification->getUser() . '/files/')) {
 					// Remove /user/files/...
 					$fullPath = $path;
 					[,,, $path] = explode('/', $fullPath, 4);
@@ -182,7 +182,7 @@ public function commentToRichMessage(IComment $comment): array {
 			// index of the mentions of that type.
 			$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
 			$message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
-			if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
+			if (!str_contains($mention['id'], ' ') && !str_starts_with($mention['id'], 'guest/')) {
 				$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
 			}