nextcloud / server

apps/user_status/lib/Service/JSDataService.php

Indentation +45 added lines, -45 removed lines

@@ -31,55 +31,55 @@
 
 class JSDataService implements \JsonSerializable {
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var StatusService */
-	private $statusService;
+    /** @var StatusService */
+    private $statusService;
 
-	/**
-	 * JSDataService constructor.
-	 *
-	 * @param IUserSession $userSession
-	 * @param StatusService $statusService
-	 */
-	public function __construct(IUserSession $userSession,
-								StatusService $statusService) {
-		$this->userSession = $userSession;
-		$this->statusService = $statusService;
-	}
+    /**
+     * JSDataService constructor.
+     *
+     * @param IUserSession $userSession
+     * @param StatusService $statusService
+     */
+    public function __construct(IUserSession $userSession,
+                                StatusService $statusService) {
+        $this->userSession = $userSession;
+        $this->statusService = $statusService;
+    }
 
-	public function jsonSerialize() {
-		$user = $this->userSession->getUser();
+    public function jsonSerialize() {
+        $user = $this->userSession->getUser();
 
-		if ($user === null) {
-			return [];
-		}
+        if ($user === null) {
+            return [];
+        }
 
-		try {
-			$status = $this->statusService->findByUserId($user->getUID());
-		} catch (DoesNotExistException $ex) {
-			return [
-				'userId' => $user->getUID(),
-				'message' => null,
-				'messageId' => null,
-				'messageIsPredefined' => false,
-				'icon' => null,
-				'clearAt' => null,
-				'status' => IUserStatus::OFFLINE,
-				'statusIsUserDefined' => false,
-			];
-		}
+        try {
+            $status = $this->statusService->findByUserId($user->getUID());
+        } catch (DoesNotExistException $ex) {
+            return [
+                'userId' => $user->getUID(),
+                'message' => null,
+                'messageId' => null,
+                'messageIsPredefined' => false,
+                'icon' => null,
+                'clearAt' => null,
+                'status' => IUserStatus::OFFLINE,
+                'statusIsUserDefined' => false,
+            ];
+        }
 
-		return [
-			'userId' => $status->getUserId(),
-			'message' => $status->getCustomMessage(),
-			'messageId' => $status->getMessageId(),
-			'messageIsPredefined' => $status->getMessageId() !== null,
-			'icon' => $status->getCustomIcon(),
-			'clearAt' => $status->getClearAt(),
-			'status' => $status->getStatus(),
-			'statusIsUserDefined' => $status->getIsUserDefined(),
-		];
-	}
+        return [
+            'userId' => $status->getUserId(),
+            'message' => $status->getCustomMessage(),
+            'messageId' => $status->getMessageId(),
+            'messageIsPredefined' => $status->getMessageId() !== null,
+            'icon' => $status->getCustomIcon(),
+            'clearAt' => $status->getClearAt(),
+            'status' => $status->getStatus(),
+            'statusIsUserDefined' => $status->getIsUserDefined(),
+        ];
+    }
 }

apps/user_status/lib/Service/StatusService.php

Indentation +342 added lines, -342 removed lines

@@ -43,346 +43,346 @@
  */
 class StatusService {
 
-	/** @var UserStatusMapper */
-	private $mapper;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var PredefinedStatusService */
-	private $predefinedStatusService;
-
-	/** @var EmojiService */
-	private $emojiService;
-
-	/**
-	 * List of priorities ordered by their priority
-	 */
-	public const PRIORITY_ORDERED_STATUSES = [
-		IUserStatus::ONLINE,
-		IUserStatus::AWAY,
-		IUserStatus::DND,
-		IUserStatus::INVISIBLE,
-		IUserStatus::OFFLINE
-	];
-
-	/**
-	 * List of statuses that persist the clear-up
-	 * or UserLiveStatusEvents
-	 */
-	public const PERSISTENT_STATUSES = [
-		IUserStatus::AWAY,
-		IUserStatus::DND,
-		IUserStatus::INVISIBLE,
-	];
-
-	/** @var int */
-	public const INVALIDATE_STATUS_THRESHOLD = 5 /* minutes */ * 60 /* seconds */;
-
-	/** @var int */
-	public const MAXIMUM_MESSAGE_LENGTH = 80;
-
-	/**
-	 * StatusService constructor.
-	 *
-	 * @param UserStatusMapper $mapper
-	 * @param ITimeFactory $timeFactory
-	 * @param PredefinedStatusService $defaultStatusService,
-	 * @param EmojiService $emojiService
-	 */
-	public function __construct(UserStatusMapper $mapper,
-								ITimeFactory $timeFactory,
-								PredefinedStatusService $defaultStatusService,
-								EmojiService $emojiService) {
-		$this->mapper = $mapper;
-		$this->timeFactory = $timeFactory;
-		$this->predefinedStatusService = $defaultStatusService;
-		$this->emojiService = $emojiService;
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return UserStatus[]
-	 */
-	public function findAll(?int $limit = null, ?int $offset = null): array {
-		return array_map(function ($status) {
-			return $this->processStatus($status);
-		}, $this->mapper->findAll($limit, $offset));
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 */
-	public function findAllRecentStatusChanges(?int $limit = null, ?int $offset = null): array {
-		return array_map(function ($status) {
-			return $this->processStatus($status);
-		}, $this->mapper->findAllRecent($limit, $offset));
-	}
-
-	/**
-	 * @param string $userId
-	 * @return UserStatus
-	 * @throws DoesNotExistException
-	 */
-	public function findByUserId(string $userId):UserStatus {
-		return $this->processStatus($this->mapper->findByUserId($userId));
-	}
-
-	/**
-	 * @param array $userIds
-	 * @return UserStatus[]
-	 */
-	public function findByUserIds(array $userIds):array {
-		return array_map(function ($status) {
-			return $this->processStatus($status);
-		}, $this->mapper->findByUserIds($userIds));
-	}
-
-	/**
-	 * @param string $userId
-	 * @param string $status
-	 * @param int|null $statusTimestamp
-	 * @param bool $isUserDefined
-	 * @return UserStatus
-	 * @throws InvalidStatusTypeException
-	 */
-	public function setStatus(string $userId,
-							  string $status,
-							  ?int $statusTimestamp,
-							  bool $isUserDefined): UserStatus {
-		try {
-			$userStatus = $this->mapper->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			$userStatus = new UserStatus();
-			$userStatus->setUserId($userId);
-		}
-
-		// Check if status-type is valid
-		if (!\in_array($status, self::PRIORITY_ORDERED_STATUSES, true)) {
-			throw new InvalidStatusTypeException('Status-type "' . $status . '" is not supported');
-		}
-		if ($statusTimestamp === null) {
-			$statusTimestamp = $this->timeFactory->getTime();
-		}
-
-		$userStatus->setStatus($status);
-		$userStatus->setStatusTimestamp($statusTimestamp);
-		$userStatus->setIsUserDefined($isUserDefined);
-
-		if ($userStatus->getId() === null) {
-			return $this->mapper->insert($userStatus);
-		}
-
-		return $this->mapper->update($userStatus);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param string $messageId
-	 * @param int|null $clearAt
-	 * @return UserStatus
-	 * @throws InvalidMessageIdException
-	 * @throws InvalidClearAtException
-	 */
-	public function setPredefinedMessage(string $userId,
-										 string $messageId,
-										 ?int $clearAt): UserStatus {
-		try {
-			$userStatus = $this->mapper->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			$userStatus = new UserStatus();
-			$userStatus->setUserId($userId);
-			$userStatus->setStatus(IUserStatus::OFFLINE);
-			$userStatus->setStatusTimestamp(0);
-			$userStatus->setIsUserDefined(false);
-		}
-
-		if (!$this->predefinedStatusService->isValidId($messageId)) {
-			throw new InvalidMessageIdException('Message-Id "' . $messageId . '" is not supported');
-		}
-
-		// Check that clearAt is in the future
-		if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
-			throw new InvalidClearAtException('ClearAt is in the past');
-		}
-
-		$userStatus->setMessageId($messageId);
-		$userStatus->setCustomIcon(null);
-		$userStatus->setCustomMessage(null);
-		$userStatus->setClearAt($clearAt);
-
-		if ($userStatus->getId() === null) {
-			return $this->mapper->insert($userStatus);
-		}
-
-		return $this->mapper->update($userStatus);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param string|null $statusIcon
-	 * @param string|null $message
-	 * @param int|null $clearAt
-	 * @return UserStatus
-	 * @throws InvalidClearAtException
-	 * @throws InvalidStatusIconException
-	 * @throws StatusMessageTooLongException
-	 */
-	public function setCustomMessage(string $userId,
-									 ?string $statusIcon,
-									 string $message,
-									 ?int $clearAt): UserStatus {
-		try {
-			$userStatus = $this->mapper->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			$userStatus = new UserStatus();
-			$userStatus->setUserId($userId);
-			$userStatus->setStatus(IUserStatus::OFFLINE);
-			$userStatus->setStatusTimestamp(0);
-			$userStatus->setIsUserDefined(false);
-		}
-
-		// Check if statusIcon contains only one character
-		if ($statusIcon !== null && !$this->emojiService->isValidEmoji($statusIcon)) {
-			throw new InvalidStatusIconException('Status-Icon is longer than one character');
-		}
-		// Check for maximum length of custom message
-		if (\mb_strlen($message) > self::MAXIMUM_MESSAGE_LENGTH) {
-			throw new StatusMessageTooLongException('Message is longer than supported length of ' . self::MAXIMUM_MESSAGE_LENGTH . ' characters');
-		}
-		// Check that clearAt is in the future
-		if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
-			throw new InvalidClearAtException('ClearAt is in the past');
-		}
-
-		$userStatus->setMessageId(null);
-		$userStatus->setCustomIcon($statusIcon);
-		$userStatus->setCustomMessage($message);
-		$userStatus->setClearAt($clearAt);
-
-		if ($userStatus->getId() === null) {
-			return $this->mapper->insert($userStatus);
-		}
-
-		return $this->mapper->update($userStatus);
-	}
-
-	/**
-	 * @param string $userId
-	 * @return bool
-	 */
-	public function clearStatus(string $userId): bool {
-		try {
-			$userStatus = $this->mapper->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			// if there is no status to remove, just return
-			return false;
-		}
-
-		$userStatus->setStatus(IUserStatus::OFFLINE);
-		$userStatus->setStatusTimestamp(0);
-		$userStatus->setIsUserDefined(false);
-
-		$this->mapper->update($userStatus);
-		return true;
-	}
-
-	/**
-	 * @param string $userId
-	 * @return bool
-	 */
-	public function clearMessage(string $userId): bool {
-		try {
-			$userStatus = $this->mapper->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			// if there is no status to remove, just return
-			return false;
-		}
-
-		$userStatus->setMessageId(null);
-		$userStatus->setCustomMessage(null);
-		$userStatus->setCustomIcon(null);
-		$userStatus->setClearAt(null);
-
-		$this->mapper->update($userStatus);
-		return true;
-	}
-
-	/**
-	 * @param string $userId
-	 * @return bool
-	 */
-	public function removeUserStatus(string $userId): bool {
-		try {
-			$userStatus = $this->mapper->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			// if there is no status to remove, just return
-			return false;
-		}
-
-		$this->mapper->delete($userStatus);
-		return true;
-	}
-
-	/**
-	 * Processes a status to check if custom message is still
-	 * up to date and provides translated default status if needed
-	 *
-	 * @param UserStatus $status
-	 * @returns UserStatus
-	 */
-	private function processStatus(UserStatus $status): UserStatus {
-		$clearAt = $status->getClearAt();
-
-		if ($status->getStatusTimestamp() < $this->timeFactory->getTime() - self::INVALIDATE_STATUS_THRESHOLD
-			&& (!$status->getIsUserDefined() || $status->getStatus() === IUserStatus::ONLINE)) {
-			$this->cleanStatus($status);
-		}
-		if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
-			$this->cleanStatusMessage($status);
-		}
-		if ($status->getMessageId() !== null) {
-			$this->addDefaultMessage($status);
-		}
-
-		return $status;
-	}
-
-	/**
-	 * @param UserStatus $status
-	 */
-	private function cleanStatus(UserStatus $status): void {
-		$status->setStatus(IUserStatus::OFFLINE);
-		$status->setStatusTimestamp($this->timeFactory->getTime());
-		$status->setIsUserDefined(false);
-
-		$this->mapper->update($status);
-	}
-
-	/**
-	 * @param UserStatus $status
-	 */
-	private function cleanStatusMessage(UserStatus $status): void {
-		$status->setMessageId(null);
-		$status->setCustomIcon(null);
-		$status->setCustomMessage(null);
-		$status->setClearAt(null);
-
-		$this->mapper->update($status);
-	}
-
-	/**
-	 * @param UserStatus $status
-	 */
-	private function addDefaultMessage(UserStatus $status): void {
-		// If the message is predefined, insert the translated message and icon
-		$predefinedMessage = $this->predefinedStatusService->getDefaultStatusById($status->getMessageId());
-		if ($predefinedMessage !== null) {
-			$status->setCustomMessage($predefinedMessage['message']);
-			$status->setCustomIcon($predefinedMessage['icon']);
-		}
-	}
+    /** @var UserStatusMapper */
+    private $mapper;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var PredefinedStatusService */
+    private $predefinedStatusService;
+
+    /** @var EmojiService */
+    private $emojiService;
+
+    /**
+     * List of priorities ordered by their priority
+     */
+    public const PRIORITY_ORDERED_STATUSES = [
+        IUserStatus::ONLINE,
+        IUserStatus::AWAY,
+        IUserStatus::DND,
+        IUserStatus::INVISIBLE,
+        IUserStatus::OFFLINE
+    ];
+
+    /**
+     * List of statuses that persist the clear-up
+     * or UserLiveStatusEvents
+     */
+    public const PERSISTENT_STATUSES = [
+        IUserStatus::AWAY,
+        IUserStatus::DND,
+        IUserStatus::INVISIBLE,
+    ];
+
+    /** @var int */
+    public const INVALIDATE_STATUS_THRESHOLD = 5 /* minutes */ * 60 /* seconds */;
+
+    /** @var int */
+    public const MAXIMUM_MESSAGE_LENGTH = 80;
+
+    /**
+     * StatusService constructor.
+     *
+     * @param UserStatusMapper $mapper
+     * @param ITimeFactory $timeFactory
+     * @param PredefinedStatusService $defaultStatusService,
+     * @param EmojiService $emojiService
+     */
+    public function __construct(UserStatusMapper $mapper,
+                                ITimeFactory $timeFactory,
+                                PredefinedStatusService $defaultStatusService,
+                                EmojiService $emojiService) {
+        $this->mapper = $mapper;
+        $this->timeFactory = $timeFactory;
+        $this->predefinedStatusService = $defaultStatusService;
+        $this->emojiService = $emojiService;
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return UserStatus[]
+     */
+    public function findAll(?int $limit = null, ?int $offset = null): array {
+        return array_map(function ($status) {
+            return $this->processStatus($status);
+        }, $this->mapper->findAll($limit, $offset));
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     */
+    public function findAllRecentStatusChanges(?int $limit = null, ?int $offset = null): array {
+        return array_map(function ($status) {
+            return $this->processStatus($status);
+        }, $this->mapper->findAllRecent($limit, $offset));
+    }
+
+    /**
+     * @param string $userId
+     * @return UserStatus
+     * @throws DoesNotExistException
+     */
+    public function findByUserId(string $userId):UserStatus {
+        return $this->processStatus($this->mapper->findByUserId($userId));
+    }
+
+    /**
+     * @param array $userIds
+     * @return UserStatus[]
+     */
+    public function findByUserIds(array $userIds):array {
+        return array_map(function ($status) {
+            return $this->processStatus($status);
+        }, $this->mapper->findByUserIds($userIds));
+    }
+
+    /**
+     * @param string $userId
+     * @param string $status
+     * @param int|null $statusTimestamp
+     * @param bool $isUserDefined
+     * @return UserStatus
+     * @throws InvalidStatusTypeException
+     */
+    public function setStatus(string $userId,
+                                string $status,
+                              ?int $statusTimestamp,
+                                bool $isUserDefined): UserStatus {
+        try {
+            $userStatus = $this->mapper->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            $userStatus = new UserStatus();
+            $userStatus->setUserId($userId);
+        }
+
+        // Check if status-type is valid
+        if (!\in_array($status, self::PRIORITY_ORDERED_STATUSES, true)) {
+            throw new InvalidStatusTypeException('Status-type "' . $status . '" is not supported');
+        }
+        if ($statusTimestamp === null) {
+            $statusTimestamp = $this->timeFactory->getTime();
+        }
+
+        $userStatus->setStatus($status);
+        $userStatus->setStatusTimestamp($statusTimestamp);
+        $userStatus->setIsUserDefined($isUserDefined);
+
+        if ($userStatus->getId() === null) {
+            return $this->mapper->insert($userStatus);
+        }
+
+        return $this->mapper->update($userStatus);
+    }
+
+    /**
+     * @param string $userId
+     * @param string $messageId
+     * @param int|null $clearAt
+     * @return UserStatus
+     * @throws InvalidMessageIdException
+     * @throws InvalidClearAtException
+     */
+    public function setPredefinedMessage(string $userId,
+                                            string $messageId,
+                                         ?int $clearAt): UserStatus {
+        try {
+            $userStatus = $this->mapper->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            $userStatus = new UserStatus();
+            $userStatus->setUserId($userId);
+            $userStatus->setStatus(IUserStatus::OFFLINE);
+            $userStatus->setStatusTimestamp(0);
+            $userStatus->setIsUserDefined(false);
+        }
+
+        if (!$this->predefinedStatusService->isValidId($messageId)) {
+            throw new InvalidMessageIdException('Message-Id "' . $messageId . '" is not supported');
+        }
+
+        // Check that clearAt is in the future
+        if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
+            throw new InvalidClearAtException('ClearAt is in the past');
+        }
+
+        $userStatus->setMessageId($messageId);
+        $userStatus->setCustomIcon(null);
+        $userStatus->setCustomMessage(null);
+        $userStatus->setClearAt($clearAt);
+
+        if ($userStatus->getId() === null) {
+            return $this->mapper->insert($userStatus);
+        }
+
+        return $this->mapper->update($userStatus);
+    }
+
+    /**
+     * @param string $userId
+     * @param string|null $statusIcon
+     * @param string|null $message
+     * @param int|null $clearAt
+     * @return UserStatus
+     * @throws InvalidClearAtException
+     * @throws InvalidStatusIconException
+     * @throws StatusMessageTooLongException
+     */
+    public function setCustomMessage(string $userId,
+                                     ?string $statusIcon,
+                                        string $message,
+                                     ?int $clearAt): UserStatus {
+        try {
+            $userStatus = $this->mapper->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            $userStatus = new UserStatus();
+            $userStatus->setUserId($userId);
+            $userStatus->setStatus(IUserStatus::OFFLINE);
+            $userStatus->setStatusTimestamp(0);
+            $userStatus->setIsUserDefined(false);
+        }
+
+        // Check if statusIcon contains only one character
+        if ($statusIcon !== null && !$this->emojiService->isValidEmoji($statusIcon)) {
+            throw new InvalidStatusIconException('Status-Icon is longer than one character');
+        }
+        // Check for maximum length of custom message
+        if (\mb_strlen($message) > self::MAXIMUM_MESSAGE_LENGTH) {
+            throw new StatusMessageTooLongException('Message is longer than supported length of ' . self::MAXIMUM_MESSAGE_LENGTH . ' characters');
+        }
+        // Check that clearAt is in the future
+        if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
+            throw new InvalidClearAtException('ClearAt is in the past');
+        }
+
+        $userStatus->setMessageId(null);
+        $userStatus->setCustomIcon($statusIcon);
+        $userStatus->setCustomMessage($message);
+        $userStatus->setClearAt($clearAt);
+
+        if ($userStatus->getId() === null) {
+            return $this->mapper->insert($userStatus);
+        }
+
+        return $this->mapper->update($userStatus);
+    }
+
+    /**
+     * @param string $userId
+     * @return bool
+     */
+    public function clearStatus(string $userId): bool {
+        try {
+            $userStatus = $this->mapper->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            // if there is no status to remove, just return
+            return false;
+        }
+
+        $userStatus->setStatus(IUserStatus::OFFLINE);
+        $userStatus->setStatusTimestamp(0);
+        $userStatus->setIsUserDefined(false);
+
+        $this->mapper->update($userStatus);
+        return true;
+    }
+
+    /**
+     * @param string $userId
+     * @return bool
+     */
+    public function clearMessage(string $userId): bool {
+        try {
+            $userStatus = $this->mapper->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            // if there is no status to remove, just return
+            return false;
+        }
+
+        $userStatus->setMessageId(null);
+        $userStatus->setCustomMessage(null);
+        $userStatus->setCustomIcon(null);
+        $userStatus->setClearAt(null);
+
+        $this->mapper->update($userStatus);
+        return true;
+    }
+
+    /**
+     * @param string $userId
+     * @return bool
+     */
+    public function removeUserStatus(string $userId): bool {
+        try {
+            $userStatus = $this->mapper->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            // if there is no status to remove, just return
+            return false;
+        }
+
+        $this->mapper->delete($userStatus);
+        return true;
+    }
+
+    /**
+     * Processes a status to check if custom message is still
+     * up to date and provides translated default status if needed
+     *
+     * @param UserStatus $status
+     * @returns UserStatus
+     */
+    private function processStatus(UserStatus $status): UserStatus {
+        $clearAt = $status->getClearAt();
+
+        if ($status->getStatusTimestamp() < $this->timeFactory->getTime() - self::INVALIDATE_STATUS_THRESHOLD
+            && (!$status->getIsUserDefined() || $status->getStatus() === IUserStatus::ONLINE)) {
+            $this->cleanStatus($status);
+        }
+        if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
+            $this->cleanStatusMessage($status);
+        }
+        if ($status->getMessageId() !== null) {
+            $this->addDefaultMessage($status);
+        }
+
+        return $status;
+    }
+
+    /**
+     * @param UserStatus $status
+     */
+    private function cleanStatus(UserStatus $status): void {
+        $status->setStatus(IUserStatus::OFFLINE);
+        $status->setStatusTimestamp($this->timeFactory->getTime());
+        $status->setIsUserDefined(false);
+
+        $this->mapper->update($status);
+    }
+
+    /**
+     * @param UserStatus $status
+     */
+    private function cleanStatusMessage(UserStatus $status): void {
+        $status->setMessageId(null);
+        $status->setCustomIcon(null);
+        $status->setCustomMessage(null);
+        $status->setClearAt(null);
+
+        $this->mapper->update($status);
+    }
+
+    /**
+     * @param UserStatus $status
+     */
+    private function addDefaultMessage(UserStatus $status): void {
+        // If the message is predefined, insert the translated message and icon
+        $predefinedMessage = $this->predefinedStatusService->getDefaultStatusById($status->getMessageId());
+        if ($predefinedMessage !== null) {
+            $status->setCustomMessage($predefinedMessage['message']);
+            $status->setCustomIcon($predefinedMessage['icon']);
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -106,7 +106,7 @@ 
 	 * @return UserStatus[]
 	 */
 	public function findAll(?int $limit = null, ?int $offset = null): array {
-		return array_map(function ($status) {
+		return array_map(function($status) {
 			return $this->processStatus($status);
 		}, $this->mapper->findAll($limit, $offset));
 	}
@@ -117,7 +117,7 @@ 
 	 * @return array
 	 */
 	public function findAllRecentStatusChanges(?int $limit = null, ?int $offset = null): array {
-		return array_map(function ($status) {
+		return array_map(function($status) {
 			return $this->processStatus($status);
 		}, $this->mapper->findAllRecent($limit, $offset));
 	}
@@ -136,7 +136,7 @@ 
 	 * @return UserStatus[]
 	 */
 	public function findByUserIds(array $userIds):array {
-		return array_map(function ($status) {
+		return array_map(function($status) {
 			return $this->processStatus($status);
 		}, $this->mapper->findByUserIds($userIds));
 	}
@@ -162,7 +162,7 @@ 
 
 		// Check if status-type is valid
 		if (!\in_array($status, self::PRIORITY_ORDERED_STATUSES, true)) {
-			throw new InvalidStatusTypeException('Status-type "' . $status . '" is not supported');
+			throw new InvalidStatusTypeException('Status-type "'.$status.'" is not supported');
 		}
 		if ($statusTimestamp === null) {
 			$statusTimestamp = $this->timeFactory->getTime();
@@ -201,7 +201,7 @@ 
 		}
 
 		if (!$this->predefinedStatusService->isValidId($messageId)) {
-			throw new InvalidMessageIdException('Message-Id "' . $messageId . '" is not supported');
+			throw new InvalidMessageIdException('Message-Id "'.$messageId.'" is not supported');
 		}
 
 		// Check that clearAt is in the future
@@ -251,7 +251,7 @@ 
 		}
 		// Check for maximum length of custom message
 		if (\mb_strlen($message) > self::MAXIMUM_MESSAGE_LENGTH) {
-			throw new StatusMessageTooLongException('Message is longer than supported length of ' . self::MAXIMUM_MESSAGE_LENGTH . ' characters');
+			throw new StatusMessageTooLongException('Message is longer than supported length of '.self::MAXIMUM_MESSAGE_LENGTH.' characters');
 		}
 		// Check that clearAt is in the future
 		if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {

apps/user_status/lib/BackgroundJob/ClearOldStatusesBackgroundJob.php

Indentation +23 added lines, -23 removed lines

@@ -37,31 +37,31 @@
  */
 class ClearOldStatusesBackgroundJob extends TimedJob {
 
-	/** @var UserStatusMapper */
-	private $mapper;
+    /** @var UserStatusMapper */
+    private $mapper;
 
-	/**
-	 * ClearOldStatusesBackgroundJob constructor.
-	 *
-	 * @param ITimeFactory $time
-	 * @param UserStatusMapper $mapper
-	 */
-	public function __construct(ITimeFactory $time,
-								UserStatusMapper $mapper) {
-		parent::__construct($time);
-		$this->mapper = $mapper;
+    /**
+     * ClearOldStatusesBackgroundJob constructor.
+     *
+     * @param ITimeFactory $time
+     * @param UserStatusMapper $mapper
+     */
+    public function __construct(ITimeFactory $time,
+                                UserStatusMapper $mapper) {
+        parent::__construct($time);
+        $this->mapper = $mapper;
 
-		// Run every time the cron is run
-		$this->setInterval(60);
-	}
+        // Run every time the cron is run
+        $this->setInterval(60);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function run($argument) {
-		$now = $this->time->getTime();
+    /**
+     * @inheritDoc
+     */
+    protected function run($argument) {
+        $now = $this->time->getTime();
 
-		$this->mapper->clearMessagesOlderThan($now);
-		$this->mapper->clearStatusesOlderThan($now - StatusService::INVALIDATE_STATUS_THRESHOLD, $now);
-	}
+        $this->mapper->clearMessagesOlderThan($now);
+        $this->mapper->clearStatusesOlderThan($now - StatusService::INVALIDATE_STATUS_THRESHOLD, $now);
+    }
 }

apps/user_status/lib/Connector/UserStatus.php

Indentation +68 added lines, -68 removed lines

@@ -30,72 +30,72 @@
 
 class UserStatus implements IUserStatus {
 
-	/** @var string */
-	private $userId;
-
-	/** @var string */
-	private $status;
-
-	/** @var string|null */
-	private $message;
-
-	/** @var string|null */
-	private $icon;
-
-	/** @var DateTimeImmutable|null */
-	private $clearAt;
-
-	/**
-	 * UserStatus constructor.
-	 *
-	 * @param Db\UserStatus $status
-	 */
-	public function __construct(Db\UserStatus $status) {
-		$this->userId = $status->getUserId();
-		$this->status = $status->getStatus();
-		$this->message = $status->getCustomMessage();
-		$this->icon = $status->getCustomIcon();
-
-		if ($status->getStatus() === IUserStatus::INVISIBLE) {
-			$this->status = IUserStatus::OFFLINE;
-		}
-		if ($status->getClearAt() !== null) {
-			$this->clearAt = DateTimeImmutable::createFromFormat('U', (string)$status->getClearAt());
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getUserId(): string {
-		return $this->userId;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getStatus(): string {
-		return $this->status;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMessage(): ?string {
-		return $this->message;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getIcon(): ?string {
-		return $this->icon;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getClearAt(): ?DateTimeImmutable {
-		return $this->clearAt;
-	}
+    /** @var string */
+    private $userId;
+
+    /** @var string */
+    private $status;
+
+    /** @var string|null */
+    private $message;
+
+    /** @var string|null */
+    private $icon;
+
+    /** @var DateTimeImmutable|null */
+    private $clearAt;
+
+    /**
+     * UserStatus constructor.
+     *
+     * @param Db\UserStatus $status
+     */
+    public function __construct(Db\UserStatus $status) {
+        $this->userId = $status->getUserId();
+        $this->status = $status->getStatus();
+        $this->message = $status->getCustomMessage();
+        $this->icon = $status->getCustomIcon();
+
+        if ($status->getStatus() === IUserStatus::INVISIBLE) {
+            $this->status = IUserStatus::OFFLINE;
+        }
+        if ($status->getClearAt() !== null) {
+            $this->clearAt = DateTimeImmutable::createFromFormat('U', (string)$status->getClearAt());
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserId(): string {
+        return $this->userId;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStatus(): string {
+        return $this->status;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMessage(): ?string {
+        return $this->message;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIcon(): ?string {
+        return $this->icon;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getClearAt(): ?DateTimeImmutable {
+        return $this->clearAt;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 			$this->status = IUserStatus::OFFLINE;
 		}
 		if ($status->getClearAt() !== null) {
-			$this->clearAt = DateTimeImmutable::createFromFormat('U', (string)$status->getClearAt());
+			$this->clearAt = DateTimeImmutable::createFromFormat('U', (string) $status->getClearAt());
 		}
 	}
 

apps/user_status/lib/Migration/Version0002Date20200902144824.php

Indentation +18 added lines, -18 removed lines

@@ -36,22 +36,22 @@
  */
 class Version0002Date20200902144824 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 20.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$statusTable = $schema->getTable('user_status');
-
-		$statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix');
-		$statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix');
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 20.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $statusTable = $schema->getTable('user_status');
+
+        $statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix');
+        $statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix');
+
+        return $schema;
+    }
 }

apps/user_status/lib/Db/UserStatusMapper.php

Indentation +120 added lines, -120 removed lines

@@ -42,124 +42,124 @@
  */
 class UserStatusMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'user_status');
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return UserStatus[]
-	 */
-	public function findAll(?int $limit = null, ?int $offset = null):array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName);
-
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 */
-	public function findAllRecent(?int $limit = null, ?int $offset = null): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->orderBy('status_timestamp', 'DESC')
-			->where($qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)))
-			->orWhere($qb->expr()->isNotNull('message_id'))
-			->orWhere($qb->expr()->isNotNull('custom_icon'))
-			->orWhere($qb->expr()->isNotNull('custom_message'));
-
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param string $userId
-	 * @return UserStatus
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 */
-	public function findByUserId(string $userId):UserStatus {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
-
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @param array $userIds
-	 * @return array
-	 */
-	public function findByUserIds(array $userIds):array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param int $olderThan
-	 * @param int $now
-	 */
-	public function clearStatusesOlderThan(int $olderThan, int $now): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE))
-			->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
-			->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
-				$qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE))
-			));
-
-		$qb->execute();
-	}
-
-	/**
-	 * Clear all statuses older than a given timestamp
-	 *
-	 * @param int $timestamp
-	 */
-	public function clearMessagesOlderThan(int $timestamp): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('message_id', $qb->createNamedParameter(null))
-			->set('custom_icon', $qb->createNamedParameter(null))
-			->set('custom_message', $qb->createNamedParameter(null))
-			->set('clear_at', $qb->createNamedParameter(null))
-			->where($qb->expr()->isNotNull('clear_at'))
-			->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
-
-		$qb->execute();
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'user_status');
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return UserStatus[]
+     */
+    public function findAll(?int $limit = null, ?int $offset = null):array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName);
+
+        if ($limit !== null) {
+            $qb->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     */
+    public function findAllRecent(?int $limit = null, ?int $offset = null): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->orderBy('status_timestamp', 'DESC')
+            ->where($qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)))
+            ->orWhere($qb->expr()->isNotNull('message_id'))
+            ->orWhere($qb->expr()->isNotNull('custom_icon'))
+            ->orWhere($qb->expr()->isNotNull('custom_message'));
+
+        if ($limit !== null) {
+            $qb->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param string $userId
+     * @return UserStatus
+     * @throws \OCP\AppFramework\Db\DoesNotExistException
+     */
+    public function findByUserId(string $userId):UserStatus {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @param array $userIds
+     * @return array
+     */
+    public function findByUserIds(array $userIds):array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param int $olderThan
+     * @param int $now
+     */
+    public function clearStatusesOlderThan(int $olderThan, int $now): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE))
+            ->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
+            ->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
+                $qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE))
+            ));
+
+        $qb->execute();
+    }
+
+    /**
+     * Clear all statuses older than a given timestamp
+     *
+     * @param int $timestamp
+     */
+    public function clearMessagesOlderThan(int $timestamp): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('message_id', $qb->createNamedParameter(null))
+            ->set('custom_icon', $qb->createNamedParameter(null))
+            ->set('custom_message', $qb->createNamedParameter(null))
+            ->set('clear_at', $qb->createNamedParameter(null))
+            ->where($qb->expr()->isNotNull('clear_at'))
+            ->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
+
+        $qb->execute();
+    }
 }

apps/user_status/lib/Controller/StatusesController.php

Indentation +62 added lines, -62 removed lines

@@ -36,73 +36,73 @@
 
 class StatusesController extends OCSController {
 
-	/** @var StatusService */
-	private $service;
+    /** @var StatusService */
+    private $service;
 
-	/**
-	 * StatusesController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param StatusService $service
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								StatusService $service) {
-		parent::__construct($appName, $request);
-		$this->service = $service;
-	}
+    /**
+     * StatusesController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param StatusService $service
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                StatusService $service) {
+        parent::__construct($appName, $request);
+        $this->service = $service;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return DataResponse
-	 */
-	public function findAll(?int $limit=null, ?int $offset=null): DataResponse {
-		$allStatuses = $this->service->findAll($limit, $offset);
+    /**
+     * @NoAdminRequired
+     *
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return DataResponse
+     */
+    public function findAll(?int $limit=null, ?int $offset=null): DataResponse {
+        $allStatuses = $this->service->findAll($limit, $offset);
 
-		return new DataResponse(array_map(function ($userStatus) {
-			return $this->formatStatus($userStatus);
-		}, $allStatuses));
-	}
+        return new DataResponse(array_map(function ($userStatus) {
+            return $this->formatStatus($userStatus);
+        }, $allStatuses));
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function find(string $userId): DataResponse {
-		try {
-			$userStatus = $this->service->findByUserId($userId);
-		} catch (DoesNotExistException $ex) {
-			throw new OCSNotFoundException('No status for the requested userId');
-		}
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function find(string $userId): DataResponse {
+        try {
+            $userStatus = $this->service->findByUserId($userId);
+        } catch (DoesNotExistException $ex) {
+            throw new OCSNotFoundException('No status for the requested userId');
+        }
 
-		return new DataResponse($this->formatStatus($userStatus));
-	}
+        return new DataResponse($this->formatStatus($userStatus));
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param UserStatus $status
-	 * @return array
-	 */
-	private function formatStatus(UserStatus $status): array {
-		$visibleStatus = $status->getStatus();
-		if ($visibleStatus === IUserStatus::INVISIBLE) {
-			$visibleStatus = IUserStatus::OFFLINE;
-		}
+    /**
+     * @NoAdminRequired
+     *
+     * @param UserStatus $status
+     * @return array
+     */
+    private function formatStatus(UserStatus $status): array {
+        $visibleStatus = $status->getStatus();
+        if ($visibleStatus === IUserStatus::INVISIBLE) {
+            $visibleStatus = IUserStatus::OFFLINE;
+        }
 
-		return [
-			'userId' => $status->getUserId(),
-			'message' => $status->getCustomMessage(),
-			'icon' => $status->getCustomIcon(),
-			'clearAt' => $status->getClearAt(),
-			'status' => $visibleStatus,
-		];
-	}
+        return [
+            'userId' => $status->getUserId(),
+            'message' => $status->getCustomMessage(),
+            'icon' => $status->getCustomIcon(),
+            'clearAt' => $status->getClearAt(),
+            'status' => $visibleStatus,
+        ];
+    }
 }

apps/user_status/lib/Controller/HeartbeatController.php

Indentation +48 added lines, -48 removed lines

@@ -37,59 +37,59 @@
 
 class HeartbeatController extends Controller {
 
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * HeartbeatController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IEventDispatcher $eventDispatcher
-	 * @param IUserSession $userSession
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IEventDispatcher $eventDispatcher,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory) {
-		parent::__construct($appName, $request);
-		$this->eventDispatcher = $eventDispatcher;
-		$this->userSession = $userSession;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * HeartbeatController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IEventDispatcher $eventDispatcher
+     * @param IUserSession $userSession
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IEventDispatcher $eventDispatcher,
+                                IUserSession $userSession,
+                                ITimeFactory $timeFactory) {
+        parent::__construct($appName, $request);
+        $this->eventDispatcher = $eventDispatcher;
+        $this->userSession = $userSession;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $status
-	 * @return JSONResponse
-	 */
-	public function heartbeat(string $status): JSONResponse {
-		if (!\in_array($status, [IUserStatus::ONLINE, IUserStatus::AWAY], true)) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $status
+     * @return JSONResponse
+     */
+    public function heartbeat(string $status): JSONResponse {
+        if (!\in_array($status, [IUserStatus::ONLINE, IUserStatus::AWAY], true)) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
 
-		$this->eventDispatcher->dispatchTyped(
-			new UserLiveStatusEvent(
-				$user,
-				$status,
-				$this->timeFactory->getTime()
-			)
-		);
+        $this->eventDispatcher->dispatchTyped(
+            new UserLiveStatusEvent(
+                $user,
+                $status,
+                $this->timeFactory->getTime()
+            )
+        );
 
-		return new JSONResponse([], Http::STATUS_NO_CONTENT);
-	}
+        return new JSONResponse([], Http::STATUS_NO_CONTENT);
+    }
 }

apps/user_status/lib/Listener/UserLiveStatusListener.php

Indentation +71 added lines, -71 removed lines

@@ -42,75 +42,75 @@
  */
 class UserLiveStatusListener implements IEventListener {
 
-	/** @var UserStatusMapper */
-	private $mapper;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * UserLiveStatusListener constructor.
-	 *
-	 * @param UserStatusMapper $mapper
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(UserStatusMapper $mapper,
-								ITimeFactory $timeFactory) {
-		$this->mapper = $mapper;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function handle(Event $event): void {
-		if (!($event instanceof UserLiveStatusEvent)) {
-			// Unrelated
-			return;
-		}
-
-		$user = $event->getUser();
-		try {
-			$userStatus = $this->mapper->findByUserId($user->getUID());
-		} catch (DoesNotExistException $ex) {
-			$userStatus = new UserStatus();
-			$userStatus->setUserId($user->getUID());
-			$userStatus->setStatus(IUserStatus::OFFLINE);
-			$userStatus->setStatusTimestamp(0);
-			$userStatus->setIsUserDefined(false);
-		}
-
-		// If the status is user-defined and one of the persistent statuses, we
-		// will not override it.
-		if ($userStatus->getIsUserDefined() &&
-			\in_array($userStatus->getStatus(), StatusService::PERSISTENT_STATUSES, true)) {
-			return;
-		}
-
-		$needsUpdate = false;
-
-		// If the current status is older than 5 minutes,
-		// treat it as outdated and update
-		if ($userStatus->getStatusTimestamp() < ($this->timeFactory->getTime() - StatusService::INVALIDATE_STATUS_THRESHOLD)) {
-			$needsUpdate = true;
-		}
-
-		// If the emitted status is more important than the current status
-		// treat it as outdated and update
-		if (array_search($event->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES) < array_search($userStatus->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES)) {
-			$needsUpdate = true;
-		}
-
-		if ($needsUpdate) {
-			$userStatus->setStatus($event->getStatus());
-			$userStatus->setStatusTimestamp($event->getTimestamp());
-			$userStatus->setIsUserDefined(false);
-
-			if ($userStatus->getId() === null) {
-				$this->mapper->insert($userStatus);
-			} else {
-				$this->mapper->update($userStatus);
-			}
-		}
-	}
+    /** @var UserStatusMapper */
+    private $mapper;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * UserLiveStatusListener constructor.
+     *
+     * @param UserStatusMapper $mapper
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(UserStatusMapper $mapper,
+                                ITimeFactory $timeFactory) {
+        $this->mapper = $mapper;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function handle(Event $event): void {
+        if (!($event instanceof UserLiveStatusEvent)) {
+            // Unrelated
+            return;
+        }
+
+        $user = $event->getUser();
+        try {
+            $userStatus = $this->mapper->findByUserId($user->getUID());
+        } catch (DoesNotExistException $ex) {
+            $userStatus = new UserStatus();
+            $userStatus->setUserId($user->getUID());
+            $userStatus->setStatus(IUserStatus::OFFLINE);
+            $userStatus->setStatusTimestamp(0);
+            $userStatus->setIsUserDefined(false);
+        }
+
+        // If the status is user-defined and one of the persistent statuses, we
+        // will not override it.
+        if ($userStatus->getIsUserDefined() &&
+            \in_array($userStatus->getStatus(), StatusService::PERSISTENT_STATUSES, true)) {
+            return;
+        }
+
+        $needsUpdate = false;
+
+        // If the current status is older than 5 minutes,
+        // treat it as outdated and update
+        if ($userStatus->getStatusTimestamp() < ($this->timeFactory->getTime() - StatusService::INVALIDATE_STATUS_THRESHOLD)) {
+            $needsUpdate = true;
+        }
+
+        // If the emitted status is more important than the current status
+        // treat it as outdated and update
+        if (array_search($event->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES) < array_search($userStatus->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES)) {
+            $needsUpdate = true;
+        }
+
+        if ($needsUpdate) {
+            $userStatus->setStatus($event->getStatus());
+            $userStatus->setStatusTimestamp($event->getTimestamp());
+            $userStatus->setIsUserDefined(false);
+
+            if ($userStatus->getId() === null) {
+                $this->mapper->insert($userStatus);
+            } else {
+                $this->mapper->update($userStatus);
+            }
+        }
+    }
 }