fixup! enh(user_status): set OoO status and message

nextcloud · Nov 15, 2023 · a7bed65 · a7bed65
1 parent 742add4
commit a7bed65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/dav/lib/Service/AbsenceService.php b/apps/dav/lib/Service/AbsenceService.php
@@ -169,7 +169,7 @@ public function getAbsenceTimezone(string $userId): ?string {
 
 		if(!empty($personal)) {
 			$personal = array_pop($personal);
-			$tz = $personal->getSchedulingTimezone();
+			$tz = $personal instanceof CalendarImpl ? $personal->getSchedulingTimezone() : null;
 		}
 
 		if($tz !== null) {

diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php
@@ -151,7 +151,7 @@ public function findByUserId(string $userId): UserStatus {
 		// A user can be OOO while not having declined a calendar event during that time
 		$absenceStatus = $this->coordinator->getCurrentOutOfOfficeData($user);
 		if(!empty($absenceStatus)) {
-			$status = $this->setStatus($userId, IUserStatus::DND, $this->timeFactory->getTime());
+			$status = $this->setStatus($userId, IUserStatus::DND, $this->timeFactory->getTime(), false);
 			return $this->processStatus($status);
 		}