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

Author: miaulalala

apps/dav/lib/Service/AbsenceService.php

@@ -27,20 +27,33 @@
 namespace OCA\DAV\Service;
 
 use InvalidArgumentException;
+use OC\AppFramework\Utility\TimeFactory;
+use OCA\DAV\CalDAV\CalDavBackend;
+use OCA\DAV\CalDAV\Calendar;
+use OCA\DAV\CalDAV\CalendarImpl;
 use OCA\DAV\Db\Absence;
 use OCA\DAV\Db\AbsenceMapper;
+use OCA\DAV\ServerFactory;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\User\Events\OutOfOfficeChangedEvent;
 use OCP\User\Events\OutOfOfficeClearedEvent;
 use OCP\User\Events\OutOfOfficeScheduledEvent;
+use Sabre\DAV\Exception\NotFound;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VTimeZone;
 
 class AbsenceService {
 	public function __construct(
 		private AbsenceMapper $absenceMapper,
 		private IEventDispatcher $eventDispatcher,
 		private IUserManager $userManager,
+		private ITimeFactory $timeFactory,
+		private ServerFactory $serverFactory,
+		private IConfig $appConfig,
 	) {
 	}
 
@@ -117,5 +130,50 @@ public function getAbsence(string $userId): ?Absence {
 			return null;
 		}
 	}
+
+	public function isInEffect(Absence $absence): bool {
+		$principal = "principals/users/" . $absence->getUserId();
+		$invitationServer = $this->serverFactory->createInviationResponseServer(false);
+		$server = $invitationServer->getServer();
+
+		/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+		$caldavPlugin = $server->getPlugin('caldav');
+		$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principal);
+		try {
+			$calendarHome = $server->tree->getNodeForPath($calendarHomePath);
+			$uri = $this->appConfig->getUserValue($absence->getUserId(), 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
+			$calendarNode = $calendarHome->getChild($uri);
+		} catch (NotFound $e) {
+			return false;
+		}
+
+		if (!($calendarNode instanceof Calendar)) {
+			$this->logger->warning('Personal calendar node is not a calendar');
+			return false;
+		}
+		if ($calendarNode->isDeleted()) {
+			$this->logger->warning('Personal calendar has been deleted');
+			return false;
+		}
+
+		$tz = $calendarNode->getProperties([])['{urn:ietf:params:xml:ns:caldav}calendar-timezone'] ?? null;
+		if($tz === null) {
+			// Do the comparison without a tz
+			$absenceStart = new \DateTime($absence->getFirstDay());
+			$absenceEnd = new \DateTime($absence->getLastDay());
+			$now = $this->timeFactory->getTime();
+			return $absenceStart->getTimestamp() <= $now && $absenceEnd->getTimestamp() >= $now;
+		}
+
+		/** @var VCalendar $vtimezoneObj */
+		$vtimezoneObj = Reader::read($tz);
+		/** @var VTimeZone $vtimezone */
+		$vtimezone = $vtimezoneObj->VTIMEZONE;
+		$calendarTimeZone = $vtimezone->getTimeZone();
+		$absenceStart = new \DateTime($absence->getFirstDay(), $calendarTimeZone);
+		$absenceEnd = new \DateTime($absence->getLastDay(), $calendarTimeZone);
+		$now = $this->timeFactory->getTime();
+		return $absenceStart->getTimestamp() <= $now && $absenceEnd->getTimestamp() >= $now;
+	}
 }
 

apps/user_status/lib/Service/StatusService.php

@@ -151,7 +151,7 @@ public function findByUserId(string $userId): UserStatus {
 		// It doesn't matter if we have calendar events if an absence is registered
 		// A user can be OOO while not having declined a calendar event during that time
 		$absenceStatus = $this->absenceService->getAbsence($userId);
-		if(!empty($absenceStatus)) {
+		if(!empty($absenceStatus) && $this->absenceService->isInEffect($absenceStatus)) {
 			$status = $this->setUserStatus($userId, IUserStatus::DND, IUserStatus::MESSAGE_AVAILABILITY, true, $absenceStatus->getStatus());
 			return $this->processStatus($status);
 		}

apps/user_status/tests/Unit/Service/StatusServiceTest.php

@@ -1005,7 +1005,7 @@ public function testFindByUserIdUserDefinedAndPersistent(): void {
 		$this->assertEquals($status, $this->service->findByUserId('admin'));
 	}
 
-	public function testFindByUserIdAbsence(): void {
+	public function testFindByUserIdAbsenceInEffect(): void {
 		$oldStatus = new UserStatus();
 		$oldStatus->setIsUserDefined(true);
 		$oldStatus->setStatus(IUserStatus::ONLINE);
@@ -1025,6 +1025,10 @@ public function testFindByUserIdAbsence(): void {
 		$this->absenceStatusService->expects(self::once())
 			->method('getAbsence')
 			->willReturn($absence);
+		$this->absenceStatusService->expects(self::once())
+			->method('isInEffect')
+			->with($absence)
+			->willReturn(true);
 		$this->predefinedStatusService->expects(self::once())
 			->method('isValidId')
 			->with($newStatus->getMessageId())

lib/private/User/AvailabilityCoordinator.php

@@ -28,6 +28,7 @@
 
 use JsonException;
 use OCA\DAV\Db\AbsenceMapper;
+use OCA\DAV\Service\AbsenceService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\ICache;
 use OCP\ICacheFactory;
@@ -41,7 +42,7 @@ class AvailabilityCoordinator implements IAvailabilityCoordinator {
 
 	public function __construct(
 		ICacheFactory $cacheFactory,
-		private AbsenceMapper $absenceMapper,
+		private AbsenceService $absenceService,
 		private LoggerInterface $logger,
 	) {
 		$this->cache = $cacheFactory->createLocal('OutOfOfficeData');
@@ -99,13 +100,19 @@ public function getCurrentOutOfOfficeData(IUser $user): ?IOutOfOfficeData {
 		}
 
 		try {
-			$absenceData = $this->absenceMapper->findByUserId($user->getUID());
+			$absenceData = $this->absenceService->getAbsence($user->getUID());
 		} catch (DoesNotExistException $e) {
 			return null;
 		}
 
+		// no matter if it's in effect or not, let's cache it
 		$data = $absenceData->toOutOufOfficeData($user);
 		$this->setCachedOutOfOfficeData($data);
+
+		if(!$this->absenceService->isInEffect($absenceData)) {
+			return null;
+		}
+
 		return $data;
 	}
 }