nextcloud / server

apps/user_status/lib/Service/JSDataService.php

Indentation +45 added lines, -45 removed lines

@@ -30,55 +30,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' => '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' => '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/EmojiService.php

Indentation +63 added lines, -63 removed lines

@@ -34,67 +34,67 @@
  */
 class EmojiService {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/**
-	 * EmojiService constructor.
-	 *
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function doesPlatformSupportEmoji(): bool {
-		return $this->db->supports4ByteText() &&
-			\class_exists(\IntlBreakIterator::class);
-	}
-
-	/**
-	 * @param string $emoji
-	 * @return bool
-	 */
-	public function isValidEmoji(string $emoji): bool {
-		$intlBreakIterator = \IntlBreakIterator::createCharacterInstance();
-		$intlBreakIterator->setText($emoji);
-
-		$characterCount = 0;
-		while ($intlBreakIterator->next() !== \IntlBreakIterator::DONE) {
-			$characterCount++;
-		}
-
-		if ($characterCount !== 1) {
-			return false;
-		}
-
-		$codePointIterator = \IntlBreakIterator::createCodePointInstance();
-		$codePointIterator->setText($emoji);
-
-		foreach ($codePointIterator->getPartsIterator() as $codePoint) {
-			$codePointType = \IntlChar::charType($codePoint);
-
-			// If the current code-point is an emoji or a modifier (like a skin-tone)
-			// just continue and check the next character
-			if ($codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_SYMBOL ||
-				$codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_LETTER ||
-				$codePointType === \IntlChar::CHAR_CATEGORY_OTHER_SYMBOL) {
-				continue;
-			}
-
-			// If it's neither a modifier nor an emoji, we only allow
-			// a zero-width-joiner or a variation selector 16
-			$codePointValue = \IntlChar::ord($codePoint);
-			if ($codePointValue === 8205 || $codePointValue === 65039) {
-				continue;
-			}
-
-			return false;
-		}
-
-		return true;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /**
+     * EmojiService constructor.
+     *
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
+
+    /**
+     * @return bool
+     */
+    public function doesPlatformSupportEmoji(): bool {
+        return $this->db->supports4ByteText() &&
+            \class_exists(\IntlBreakIterator::class);
+    }
+
+    /**
+     * @param string $emoji
+     * @return bool
+     */
+    public function isValidEmoji(string $emoji): bool {
+        $intlBreakIterator = \IntlBreakIterator::createCharacterInstance();
+        $intlBreakIterator->setText($emoji);
+
+        $characterCount = 0;
+        while ($intlBreakIterator->next() !== \IntlBreakIterator::DONE) {
+            $characterCount++;
+        }
+
+        if ($characterCount !== 1) {
+            return false;
+        }
+
+        $codePointIterator = \IntlBreakIterator::createCodePointInstance();
+        $codePointIterator->setText($emoji);
+
+        foreach ($codePointIterator->getPartsIterator() as $codePoint) {
+            $codePointType = \IntlChar::charType($codePoint);
+
+            // If the current code-point is an emoji or a modifier (like a skin-tone)
+            // just continue and check the next character
+            if ($codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_SYMBOL ||
+                $codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_LETTER ||
+                $codePointType === \IntlChar::CHAR_CATEGORY_OTHER_SYMBOL) {
+                continue;
+            }
+
+            // If it's neither a modifier nor an emoji, we only allow
+            // a zero-width-joiner or a variation selector 16
+            $codePointValue = \IntlChar::ord($codePoint);
+            if ($codePointValue === 8205 || $codePointValue === 65039) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }

apps/user_status/lib/Service/PredefinedStatusService.php

Indentation +148 added lines, -148 removed lines

@@ -36,152 +36,152 @@
  * @package OCA\UserStatus\Service
  */
 class PredefinedStatusService {
-	private const MEETING = 'meeting';
-	private const COMMUTING = 'commuting';
-	private const SICK_LEAVE = 'sick-leave';
-	private const VACATIONING = 'vacationing';
-	private const REMOTE_WORK = 'remote-work';
-
-	/** @var IL10N */
-	private $l10n;
-
-	/**
-	 * DefaultStatusService constructor.
-	 *
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getDefaultStatuses(): array {
-		return [
-			[
-				'id' => self::MEETING,
-				'icon' => '

apps/user_status/lib/Service/StatusService.php

Indentation +290 added lines, -290 removed lines

@@ -42,294 +42,294 @@
  */
 class StatusService {
 
-	/** @var UserStatusMapper */
-	private $mapper;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var PredefinedStatusService */
-	private $predefinedStatusService;
-
-	/** @var EmojiService */
-	private $emojiService;
-
-	/** @var string[] */
-	private $allowedStatusTypes = [
-		'online',
-		'away',
-		'dnd',
-		'invisible',
-		'offline'
-	];
-
-	/** @var int */
-	private $maximumMessageLength = 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 string $userId
-	 * @return UserStatus
-	 * @throws DoesNotExistException
-	 */
-	public function findByUserId(string $userId):UserStatus {
-		return $this->processStatus($this->mapper->findByUserId($userId));
-	}
-
-	/**
-	 * @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, $this->allowedStatusTypes, 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('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('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) > $this->maximumMessageLength) {
-			throw new StatusMessageTooLongException('Message is longer than supported length of ' . $this->maximumMessageLength . ' 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('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 ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
-			$this->cleanStatus($status);
-		}
-		if ($status->getMessageId() !== null) {
-			$this->addDefaultMessage($status);
-		}
-
-		return $status;
-	}
-
-	/**
-	 * @param UserStatus $status
-	 */
-	private function cleanStatus(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;
+
+    /** @var string[] */
+    private $allowedStatusTypes = [
+        'online',
+        'away',
+        'dnd',
+        'invisible',
+        'offline'
+    ];
+
+    /** @var int */
+    private $maximumMessageLength = 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 string $userId
+     * @return UserStatus
+     * @throws DoesNotExistException
+     */
+    public function findByUserId(string $userId):UserStatus {
+        return $this->processStatus($this->mapper->findByUserId($userId));
+    }
+
+    /**
+     * @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, $this->allowedStatusTypes, 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('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('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) > $this->maximumMessageLength) {
+            throw new StatusMessageTooLongException('Message is longer than supported length of ' . $this->maximumMessageLength . ' 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('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 ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {
+            $this->cleanStatus($status);
+        }
+        if ($status->getMessageId() !== null) {
+            $this->addDefaultMessage($status);
+        }
+
+        return $status;
+    }
+
+    /**
+     * @param UserStatus $status
+     */
+    private function cleanStatus(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 +4 added lines, -4 removed lines

@@ -90,7 +90,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));
 	}
@@ -125,7 +125,7 @@ 
 
 		// Check if status-type is valid
 		if (!\in_array($status, $this->allowedStatusTypes, 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();
@@ -164,7 +164,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
@@ -214,7 +214,7 @@ 
 		}
 		// Check for maximum length of custom message
 		if (\mb_strlen($message) > $this->maximumMessageLength) {
-			throw new StatusMessageTooLongException('Message is longer than supported length of ' . $this->maximumMessageLength . ' characters');
+			throw new StatusMessageTooLongException('Message is longer than supported length of '.$this->maximumMessageLength.' characters');
 		}
 		// Check that clearAt is in the future
 		if ($clearAt !== null && $clearAt < $this->timeFactory->getTime()) {

apps/user_status/lib/BackgroundJob/ClearOldStatusesBackgroundJob.php

Indentation +24 added lines, -24 removed lines

@@ -36,28 +36,28 @@
  */
 class ClearOldStatusesBackgroundJob extends TimedJob {
 
-	/** @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;
-
-		// Run every time the cron is run
-		$this->setInterval(60);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	protected function run($argument) {
-		$this->mapper->clearOlderThan($this->time->getTime());
-	}
+    /** @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;
+
+        // Run every time the cron is run
+        $this->setInterval(60);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function run($argument) {
+        $this->mapper->clearOlderThan($this->time->getTime());
+    }
 }

apps/user_status/lib/AppInfo/Application.php

Indentation +23 added lines, -23 removed lines

@@ -44,31 +44,31 @@
  */
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'user_status';
+    /** @var string */
+    public const APP_ID = 'user_status';
 
-	/**
-	 * Application constructor.
-	 *
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
+    /**
+     * Application constructor.
+     *
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register(IRegistrationContext $context): void {
-		// Register OCS Capabilities
-		$context->registerCapability(Capabilities::class);
+    /**
+     * @inheritDoc
+     */
+    public function register(IRegistrationContext $context): void {
+        // Register OCS Capabilities
+        $context->registerCapability(Capabilities::class);
 
-		// Register Event Listeners
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
-		$context->registerEventListener(UserLiveStatusEvent::class, UserLiveStatusListener::class);
-		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
-	}
+        // Register Event Listeners
+        $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+        $context->registerEventListener(UserLiveStatusEvent::class, UserLiveStatusListener::class);
+        $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/user_status/lib/Migration/Version0001Date20200602134824.php

Indentation +54 added lines, -54 removed lines

@@ -37,61 +37,61 @@
  */
 class Version0001Date20200602134824 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();
+    /**
+     * @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->createTable('user_status');
-		$statusTable->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$statusTable->addColumn('user_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('status', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('status_timestamp', Types::INTEGER, [
-			'notnull' => true,
-			'length' => 11,
-			'unsigned' => true,
-		]);
-		$statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
-			'notnull' => true,
-		]);
-		$statusTable->addColumn('message_id', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('custom_icon', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('custom_message', Types::TEXT, [
-			'notnull' => false,
-		]);
-		$statusTable->addColumn('clear_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 11,
-			'unsigned' => true,
-		]);
+        $statusTable = $schema->createTable('user_status');
+        $statusTable->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $statusTable->addColumn('user_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('status', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('status_timestamp', Types::INTEGER, [
+            'notnull' => true,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
+        $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
+            'notnull' => true,
+        ]);
+        $statusTable->addColumn('message_id', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('custom_icon', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('custom_message', Types::TEXT, [
+            'notnull' => false,
+        ]);
+        $statusTable->addColumn('clear_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
 
-		$statusTable->setPrimaryKey(['id']);
-		$statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix');
-		$statusTable->addIndex(['clear_at'], 'user_status_clr_ix');
+        $statusTable->setPrimaryKey(['id']);
+        $statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix');
+        $statusTable->addIndex(['clear_at'], 'user_status_clr_ix');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/user_status/lib/Capabilities.php

Indentation +21 added lines, -21 removed lines

@@ -34,27 +34,27 @@
  */
 class Capabilities implements ICapability {
 
-	/** @var EmojiService */
-	private $emojiService;
+    /** @var EmojiService */
+    private $emojiService;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param EmojiService $emojiService
-	 */
-	public function __construct(EmojiService $emojiService) {
-		$this->emojiService = $emojiService;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param EmojiService $emojiService
+     */
+    public function __construct(EmojiService $emojiService) {
+        $this->emojiService = $emojiService;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getCapabilities() {
-		return [
-			'user_status' => [
-				'enabled' => true,
-				'supports_emoji' => $this->emojiService->doesPlatformSupportEmoji(),
-			],
-		];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getCapabilities() {
+        return [
+            'user_status' => [
+                'enabled' => true,
+                'supports_emoji' => $this->emojiService->doesPlatformSupportEmoji(),
+            ],
+        ];
+    }
 }

apps/user_status/lib/Db/UserStatus.php

Indentation +26 added lines, -26 removed lines

@@ -53,38 +53,38 @@
  */
 class UserStatus extends Entity {
 
-	/** @var string */
-	public $userId;
+    /** @var string */
+    public $userId;
 
-	/** @var string */
-	public $status;
+    /** @var string */
+    public $status;
 
-	/** @var int */
-	public $statusTimestamp;
+    /** @var int */
+    public $statusTimestamp;
 
-	/** @var boolean */
-	public $isUserDefined;
+    /** @var boolean */
+    public $isUserDefined;
 
-	/** @var string|null */
-	public $messageId;
+    /** @var string|null */
+    public $messageId;
 
-	/** @var string|null */
-	public $customIcon;
+    /** @var string|null */
+    public $customIcon;
 
-	/** @var string|null */
-	public $customMessage;
+    /** @var string|null */
+    public $customMessage;
 
-	/** @var int|null */
-	public $clearAt;
+    /** @var int|null */
+    public $clearAt;
 
-	public function __construct() {
-		$this->addType('userId', 'string');
-		$this->addType('status', 'string');
-		$this->addType('statusTimestamp', 'int');
-		$this->addType('isUserDefined', 'boolean');
-		$this->addType('messageId', 'string');
-		$this->addType('customIcon', 'string');
-		$this->addType('customMessage', 'string');
-		$this->addType('clearAt', 'int');
-	}
+    public function __construct() {
+        $this->addType('userId', 'string');
+        $this->addType('status', 'string');
+        $this->addType('statusTimestamp', 'int');
+        $this->addType('isUserDefined', 'boolean');
+        $this->addType('messageId', 'string');
+        $this->addType('customIcon', 'string');
+        $this->addType('customMessage', 'string');
+        $this->addType('clearAt', 'int');
+    }
 }