fix: conflicts resolved

Signed-off-by: yemkareems <yemkareems@gmail.com>
nextcloud · Oct 29, 2024 · c16b5bb · c16b5bb
1 parent ffa158d
commit c16b5bb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/DigestSender.php b/lib/DigestSender.php
@@ -146,8 +146,8 @@ public function sendDigestForUser(IUser $user, int $now, string $timezone, strin
 		$this->activityManager->setCurrentUserId($uid);
 
 		['count' => $count, 'max' => $lastActivityId] = $this->data->getActivitySince($uid, $lastSend, true);
-		$count = (int) $count;
-		$lastActivityId = (int) $lastActivityId;
+		$count = (int)$count;
+		$lastActivityId = (int)$lastActivityId;
 		if ($count === 0) {
 			return;
 		}
@@ -202,7 +202,7 @@ public function sendDigestForUser(IUser $user, int $now, string $timezone, strin
 		$this->activityManager->setCurrentUserId(null);
 		try {
 			$this->mailer->send($message);
-			$this->config->setUserValue($user->getUID(), 'activity', 'activity_digest_last_send', (string) $lastActivityId);
+			$this->config->setUserValue($uid, 'activity', 'activity_digest_last_send', (string)$lastActivityId);
 		} catch (\Exception $e) {
 			$this->logger->error($e->getMessage());
 			return;
@@ -223,9 +223,9 @@ protected function getHTMLSubject(IEvent $event): string {
 			$placeholders[] = '{' . $placeholder . '}';
 
 			if ($parameter['type'] === 'file') {
-				$replacement = (string) $parameter['path'];
+				$replacement = (string)$parameter['path'];
 			} else {
-				$replacement = (string) $parameter['name'];
+				$replacement = (string)$parameter['name'];
 			}
 
 			if (isset($parameter['link'])) {