nextcloud / server

apps/user_status/lib/Controller/StatusesController.php

Indentation +62 added lines, -62 removed lines

@@ -35,73 +35,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 === 'invisible') {
-			$visibleStatus = 'offline';
-		}
+    /**
+     * @NoAdminRequired
+     *
+     * @param UserStatus $status
+     * @return array
+     */
+    private function formatStatus(UserStatus $status): array {
+        $visibleStatus = $status->getStatus();
+        if ($visibleStatus === 'invisible') {
+            $visibleStatus = '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/PredefinedStatusController.php

Indentation +23 added lines, -23 removed lines

@@ -37,29 +37,29 @@
  */
 class PredefinedStatusController extends OCSController {
 
-	/** @var PredefinedStatusService */
-	private $predefinedStatusService;
+    /** @var PredefinedStatusService */
+    private $predefinedStatusService;
 
-	/**
-	 * AStatusController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param PredefinedStatusService $predefinedStatusService
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								PredefinedStatusService $predefinedStatusService) {
-		parent::__construct($appName, $request);
-		$this->predefinedStatusService = $predefinedStatusService;
-	}
+    /**
+     * AStatusController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param PredefinedStatusService $predefinedStatusService
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                PredefinedStatusService $predefinedStatusService) {
+        parent::__construct($appName, $request);
+        $this->predefinedStatusService = $predefinedStatusService;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function findAll():DataResponse {
-		return new DataResponse($this->predefinedStatusService->getDefaultStatuses());
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function findAll():DataResponse {
+        return new DataResponse($this->predefinedStatusService->getDefaultStatuses());
+    }
 }

apps/user_status/lib/Controller/HeartbeatController.php

Indentation +46 added lines, -46 removed lines

@@ -36,57 +36,57 @@
 
 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
-	 */
-	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
+     */
+    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, ['online', 'away'])) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $status
+     * @return JSONResponse
+     */
+    public function heartbeat(string $status): JSONResponse {
+        if (!\in_array($status, ['online', 'away'])) {
+            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/Controller/UserStatusController.php

Indentation +147 added lines, -147 removed lines

@@ -41,151 +41,151 @@
 
 class UserStatusController extends OCSController {
 
-	/** @var string */
-	private $userId;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var StatusService */
-	private $service;
-
-	/**
-	 * StatusesController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param string $userId
-	 * @param ILogger $logger;
-	 * @param StatusService $service
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								string $userId,
-								ILogger $logger,
-								StatusService $service) {
-		parent::__construct($appName, $request);
-		$this->userId = $userId;
-		$this->logger = $logger;
-		$this->service = $service;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getStatus(): DataResponse {
-		try {
-			$userStatus = $this->service->findByUserId($this->userId);
-		} catch (DoesNotExistException $ex) {
-			throw new OCSNotFoundException('No status for the current user');
-		}
-
-		return new DataResponse($this->formatStatus($userStatus));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $statusType
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function setStatus(string $statusType): DataResponse {
-		try {
-			$status = $this->service->setStatus($this->userId, $statusType, null, true);
-			return new DataResponse($this->formatStatus($status));
-		} catch (InvalidStatusTypeException $ex) {
-			$this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid status type "' . $statusType . '"');
-			throw new OCSBadRequestException($ex->getMessage(), $ex);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $messageId
-	 * @param int|null $clearAt
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function setPredefinedMessage(string $messageId,
-										 ?int $clearAt): DataResponse {
-		try {
-			$status = $this->service->setPredefinedMessage($this->userId, $messageId, $clearAt);
-			return new DataResponse($this->formatStatus($status));
-		} catch (InvalidClearAtException $ex) {
-			$this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid clearAt value "' . $clearAt . '"');
-			throw new OCSBadRequestException($ex->getMessage(), $ex);
-		} catch (InvalidMessageIdException $ex) {
-			$this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid message-id "' . $messageId . '"');
-			throw new OCSBadRequestException($ex->getMessage(), $ex);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string|null $statusIcon
-	 * @param string $message
-	 * @param int|null $clearAt
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function setCustomMessage(?string $statusIcon,
-									 string $message,
-									 ?int $clearAt): DataResponse {
-		try {
-			$status = $this->service->setCustomMessage($this->userId, $statusIcon, $message, $clearAt);
-			return new DataResponse($this->formatStatus($status));
-		} catch (InvalidClearAtException $ex) {
-			$this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid clearAt value "' . $clearAt . '"');
-			throw new OCSBadRequestException($ex->getMessage(), $ex);
-		} catch (InvalidStatusIconException $ex) {
-			$this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid icon value "' . $statusIcon . '"');
-			throw new OCSBadRequestException($ex->getMessage(), $ex);
-		} catch (StatusMessageTooLongException $ex) {
-			$this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to a too long status message.');
-			throw new OCSBadRequestException($ex->getMessage(), $ex);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function clearStatus(): DataResponse {
-		$this->service->clearStatus($this->userId);
-		return new DataResponse([]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function clearMessage(): DataResponse {
-		$this->service->clearMessage($this->userId);
-		return new DataResponse([]);
-	}
-
-	/**
-	 * @param UserStatus $status
-	 * @return array
-	 */
-	private function formatStatus(UserStatus $status): array {
-		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(),
-		];
-	}
+    /** @var string */
+    private $userId;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var StatusService */
+    private $service;
+
+    /**
+     * StatusesController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param string $userId
+     * @param ILogger $logger;
+     * @param StatusService $service
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                string $userId,
+                                ILogger $logger,
+                                StatusService $service) {
+        parent::__construct($appName, $request);
+        $this->userId = $userId;
+        $this->logger = $logger;
+        $this->service = $service;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getStatus(): DataResponse {
+        try {
+            $userStatus = $this->service->findByUserId($this->userId);
+        } catch (DoesNotExistException $ex) {
+            throw new OCSNotFoundException('No status for the current user');
+        }
+
+        return new DataResponse($this->formatStatus($userStatus));
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $statusType
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function setStatus(string $statusType): DataResponse {
+        try {
+            $status = $this->service->setStatus($this->userId, $statusType, null, true);
+            return new DataResponse($this->formatStatus($status));
+        } catch (InvalidStatusTypeException $ex) {
+            $this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid status type "' . $statusType . '"');
+            throw new OCSBadRequestException($ex->getMessage(), $ex);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $messageId
+     * @param int|null $clearAt
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function setPredefinedMessage(string $messageId,
+                                         ?int $clearAt): DataResponse {
+        try {
+            $status = $this->service->setPredefinedMessage($this->userId, $messageId, $clearAt);
+            return new DataResponse($this->formatStatus($status));
+        } catch (InvalidClearAtException $ex) {
+            $this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid clearAt value "' . $clearAt . '"');
+            throw new OCSBadRequestException($ex->getMessage(), $ex);
+        } catch (InvalidMessageIdException $ex) {
+            $this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid message-id "' . $messageId . '"');
+            throw new OCSBadRequestException($ex->getMessage(), $ex);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string|null $statusIcon
+     * @param string $message
+     * @param int|null $clearAt
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function setCustomMessage(?string $statusIcon,
+                                        string $message,
+                                     ?int $clearAt): DataResponse {
+        try {
+            $status = $this->service->setCustomMessage($this->userId, $statusIcon, $message, $clearAt);
+            return new DataResponse($this->formatStatus($status));
+        } catch (InvalidClearAtException $ex) {
+            $this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid clearAt value "' . $clearAt . '"');
+            throw new OCSBadRequestException($ex->getMessage(), $ex);
+        } catch (InvalidStatusIconException $ex) {
+            $this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to an invalid icon value "' . $statusIcon . '"');
+            throw new OCSBadRequestException($ex->getMessage(), $ex);
+        } catch (StatusMessageTooLongException $ex) {
+            $this->logger->debug('New user-status for "' . $this->userId . '" was rejected due to a too long status message.');
+            throw new OCSBadRequestException($ex->getMessage(), $ex);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function clearStatus(): DataResponse {
+        $this->service->clearStatus($this->userId);
+        return new DataResponse([]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function clearMessage(): DataResponse {
+        $this->service->clearMessage($this->userId);
+        return new DataResponse([]);
+    }
+
+    /**
+     * @param UserStatus $status
+     * @return array
+     */
+    private function formatStatus(UserStatus $status): array {
+        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/Listener/BeforeTemplateRenderedListener.php

Indentation +32 added lines, -32 removed lines

@@ -34,42 +34,42 @@
 
 class BeforeTemplateRenderedListener implements IEventListener {
 
-	/** @var IInitialStateService */
-	private $initialState;
+    /** @var IInitialStateService */
+    private $initialState;
 
-	/** @var JSDataService */
-	private $jsDataService;
+    /** @var JSDataService */
+    private $jsDataService;
 
-	/**
-	 * BeforeTemplateRenderedListener constructor.
-	 *
-	 * @param IInitialStateService $initialState
-	 * @param JSDataService $jsDataService
-	 */
-	public function __construct(IInitialStateService $initialState,
-								JSDataService $jsDataService) {
-		$this->initialState = $initialState;
-		$this->jsDataService = $jsDataService;
-	}
+    /**
+     * BeforeTemplateRenderedListener constructor.
+     *
+     * @param IInitialStateService $initialState
+     * @param JSDataService $jsDataService
+     */
+    public function __construct(IInitialStateService $initialState,
+                                JSDataService $jsDataService) {
+        $this->initialState = $initialState;
+        $this->jsDataService = $jsDataService;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function handle(Event $event): void {
-		if (!($event instanceof BeforeTemplateRenderedEvent)) {
-			// Unrelated
-			return;
-		}
+    /**
+     * @inheritDoc
+     */
+    public function handle(Event $event): void {
+        if (!($event instanceof BeforeTemplateRenderedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		if (!$event->isLoggedIn()) {
-			return;
-		}
+        if (!$event->isLoggedIn()) {
+            return;
+        }
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
-			return $this->jsDataService;
-		});
+        $this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
+            return $this->jsDataService;
+        });
 
-		\OCP\Util::addScript('user_status', 'user-status-menu');
-		\OCP\Util::addStyle('user_status', 'user-status-menu');
-	}
+        \OCP\Util::addScript('user_status', 'user-status-menu');
+        \OCP\Util::addStyle('user_status', 'user-status-menu');
+    }
 }

apps/user_status/lib/Listener/UserLiveStatusListener.php

Indentation +90 added lines, -90 removed lines

@@ -40,94 +40,94 @@
  */
 class UserLiveStatusListener implements IEventListener {
 
-	/** @var UserStatusMapper */
-	private $mapper;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var string[] */
-	private $priorityOrderedStatuses = [
-		'online',
-		'away',
-		'dnd',
-		'invisible',
-		'offline'
-	];
-
-	/** @var string[] */
-	private $persistentUserStatuses = [
-		'away',
-		'dnd',
-		'invisible',
-	];
-
-	/** @var int */
-	private $offlineThreshold = 300;
-
-	/**
-	 * 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('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(), $this->persistentUserStatuses, 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() - $this->offlineThreshold)) {
-			$needsUpdate = true;
-		}
-
-		// If the emitted status is more important than the current status
-		// treat it as outdated and update
-		if (array_search($event->getStatus(), $this->priorityOrderedStatuses) < array_search($userStatus->getStatus(), $this->priorityOrderedStatuses)) {
-			$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;
+
+    /** @var string[] */
+    private $priorityOrderedStatuses = [
+        'online',
+        'away',
+        'dnd',
+        'invisible',
+        'offline'
+    ];
+
+    /** @var string[] */
+    private $persistentUserStatuses = [
+        'away',
+        'dnd',
+        'invisible',
+    ];
+
+    /** @var int */
+    private $offlineThreshold = 300;
+
+    /**
+     * 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('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(), $this->persistentUserStatuses, 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() - $this->offlineThreshold)) {
+            $needsUpdate = true;
+        }
+
+        // If the emitted status is more important than the current status
+        // treat it as outdated and update
+        if (array_search($event->getStatus(), $this->priorityOrderedStatuses) < array_search($userStatus->getStatus(), $this->priorityOrderedStatuses)) {
+            $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);
+            }
+        }
+    }
 }

apps/user_status/lib/Listener/UserDeletedListener.php

Indentation +21 added lines, -21 removed lines

@@ -37,29 +37,29 @@
  */
 class UserDeletedListener implements IEventListener {
 
-	/** @var StatusService */
-	private $service;
+    /** @var StatusService */
+    private $service;
 
-	/**
-	 * UserDeletedListener constructor.
-	 *
-	 * @param StatusService $service
-	 */
-	public function __construct(StatusService $service) {
-		$this->service = $service;
-	}
+    /**
+     * UserDeletedListener constructor.
+     *
+     * @param StatusService $service
+     */
+    public function __construct(StatusService $service) {
+        $this->service = $service;
+    }
 
 
-	/**
-	 * @inheritDoc
-	 */
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			// Unrelated
-			return;
-		}
+    /**
+     * @inheritDoc
+     */
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		$user = $event->getUser();
-		$this->service->removeUserStatus($user->getUID());
-	}
+        $user = $event->getUser();
+        $this->service->removeUserStatus($user->getUID());
+    }
 }

apps/user_status/appinfo/routes.php

Indentation +16 added lines, -16 removed lines

@@ -24,20 +24,20 @@
  */
 
 return [
-	'ocs' => [
-		// Routes for querying statuses
-		['name' => 'Statuses#findAll', 'url' => '/api/v1/statuses', 'verb' => 'GET'],
-		['name' => 'Statuses#find', 'url' => '/api/v1/statuses/{userId}', 'verb' => 'GET'],
-		// Routes for manipulating your own status
-		['name' => 'UserStatus#getStatus', 'url' => '/api/v1/user_status', 'verb' => 'GET'],
-		['name' => 'UserStatus#setStatus', 'url' => '/api/v1/user_status/status', 'verb' => 'PUT'],
-		['name' => 'UserStatus#setPredefinedMessage', 'url' => '/api/v1/user_status/message/predefined', 'verb' => 'PUT'],
-		['name' => 'UserStatus#setCustomMessage', 'url' => '/api/v1/user_status/message/custom', 'verb' => 'PUT'],
-		['name' => 'UserStatus#clearMessage', 'url' => '/api/v1/user_status/message', 'verb' => 'DELETE'],
-		// Routes for listing default routes
-		['name' => 'PredefinedStatus#findAll', 'url' => '/api/v1/predefined_statuses/', 'verb' => 'GET']
-	],
-	'routes' => [
-		['name' => 'Heartbeat#heartbeat', 'url' => '/heartbeat', 'verb' => 'PUT'],
-	],
+    'ocs' => [
+        // Routes for querying statuses
+        ['name' => 'Statuses#findAll', 'url' => '/api/v1/statuses', 'verb' => 'GET'],
+        ['name' => 'Statuses#find', 'url' => '/api/v1/statuses/{userId}', 'verb' => 'GET'],
+        // Routes for manipulating your own status
+        ['name' => 'UserStatus#getStatus', 'url' => '/api/v1/user_status', 'verb' => 'GET'],
+        ['name' => 'UserStatus#setStatus', 'url' => '/api/v1/user_status/status', 'verb' => 'PUT'],
+        ['name' => 'UserStatus#setPredefinedMessage', 'url' => '/api/v1/user_status/message/predefined', 'verb' => 'PUT'],
+        ['name' => 'UserStatus#setCustomMessage', 'url' => '/api/v1/user_status/message/custom', 'verb' => 'PUT'],
+        ['name' => 'UserStatus#clearMessage', 'url' => '/api/v1/user_status/message', 'verb' => 'DELETE'],
+        // Routes for listing default routes
+        ['name' => 'PredefinedStatus#findAll', 'url' => '/api/v1/predefined_statuses/', 'verb' => 'GET']
+    ],
+    'routes' => [
+        ['name' => 'Heartbeat#heartbeat', 'url' => '/heartbeat', 'verb' => 'PUT'],
+    ],
 ];

lib/private/NavigationManager.php

Indentation +260 added lines, -260 removed lines

@@ -46,290 +46,290 @@
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
-	protected $activeEntry;
-	/** @var bool */
-	protected $init = false;
-	/** @var IAppManager|AppManager */
-	protected $appManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFac;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager|Manager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
+    protected $entries = [];
+    protected $closureEntries = [];
+    protected $activeEntry;
+    /** @var bool */
+    protected $init = false;
+    /** @var IAppManager|AppManager */
+    protected $appManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFac;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager|Manager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IAppManager $appManager,
-						 IURLGenerator $urlGenerator,
-						 IFactory $l10nFac,
-						 IUserSession $userSession,
-						 IGroupManager $groupManager,
-						 IConfig $config) {
-		$this->appManager = $appManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFac = $l10nFac;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-	}
+    public function __construct(IAppManager $appManager,
+                            IURLGenerator $urlGenerator,
+                            IFactory $l10nFac,
+                            IUserSession $userSession,
+                            IGroupManager $groupManager,
+                            IConfig $config) {
+        $this->appManager = $appManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFac = $l10nFac;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+    }
 
-	/**
-	 * Creates a new navigation entry
-	 *
-	 * @param array|\Closure $entry Array containing: id, name, order, icon and href key
-	 *					The use of a closure is preferred, because it will avoid
-	 * 					loading the routing of your app, unless required.
-	 * @return void
-	 */
-	public function add($entry) {
-		if ($entry instanceof \Closure) {
-			$this->closureEntries[] = $entry;
-			return;
-		}
+    /**
+     * Creates a new navigation entry
+     *
+     * @param array|\Closure $entry Array containing: id, name, order, icon and href key
+     *					The use of a closure is preferred, because it will avoid
+     * 					loading the routing of your app, unless required.
+     * @return void
+     */
+    public function add($entry) {
+        if ($entry instanceof \Closure) {
+            $this->closureEntries[] = $entry;
+            return;
+        }
 
-		$entry['active'] = false;
-		if (!isset($entry['icon'])) {
-			$entry['icon'] = '';
-		}
-		if (!isset($entry['classes'])) {
-			$entry['classes'] = '';
-		}
-		if (!isset($entry['type'])) {
-			$entry['type'] = 'link';
-		}
-		$this->entries[$entry['id']] = $entry;
-	}
+        $entry['active'] = false;
+        if (!isset($entry['icon'])) {
+            $entry['icon'] = '';
+        }
+        if (!isset($entry['classes'])) {
+            $entry['classes'] = '';
+        }
+        if (!isset($entry['type'])) {
+            $entry['type'] = 'link';
+        }
+        $this->entries[$entry['id']] = $entry;
+    }
 
-	/**
-	 * Get a list of navigation entries
-	 *
-	 * @param string $type type of the navigation entries
-	 * @return array
-	 */
-	public function getAll(string $type = 'link'): array {
-		$this->init();
-		foreach ($this->closureEntries as $c) {
-			$this->add($c());
-		}
-		$this->closureEntries = [];
+    /**
+     * Get a list of navigation entries
+     *
+     * @param string $type type of the navigation entries
+     * @return array
+     */
+    public function getAll(string $type = 'link'): array {
+        $this->init();
+        foreach ($this->closureEntries as $c) {
+            $this->add($c());
+        }
+        $this->closureEntries = [];
 
-		$result = $this->entries;
-		if ($type !== 'all') {
-			$result = array_filter($this->entries, function ($entry) use ($type) {
-				return $entry['type'] === $type;
-			});
-		}
+        $result = $this->entries;
+        if ($type !== 'all') {
+            $result = array_filter($this->entries, function ($entry) use ($type) {
+                return $entry['type'] === $type;
+            });
+        }
 
-		return $this->proceedNavigation($result);
-	}
+        return $this->proceedNavigation($result);
+    }
 
-	/**
-	 * Sort navigation entries by order, name and set active flag
-	 *
-	 * @param array $list
-	 * @return array
-	 */
-	private function proceedNavigation(array $list): array {
-		uasort($list, function ($a, $b) {
-			if (isset($a['order']) && isset($b['order'])) {
-				return ($a['order'] < $b['order']) ? -1 : 1;
-			} elseif (isset($a['order']) || isset($b['order'])) {
-				return isset($a['order']) ? -1 : 1;
-			} else {
-				return ($a['name'] < $b['name']) ? -1 : 1;
-			}
-		});
+    /**
+     * Sort navigation entries by order, name and set active flag
+     *
+     * @param array $list
+     * @return array
+     */
+    private function proceedNavigation(array $list): array {
+        uasort($list, function ($a, $b) {
+            if (isset($a['order']) && isset($b['order'])) {
+                return ($a['order'] < $b['order']) ? -1 : 1;
+            } elseif (isset($a['order']) || isset($b['order'])) {
+                return isset($a['order']) ? -1 : 1;
+            } else {
+                return ($a['name'] < $b['name']) ? -1 : 1;
+            }
+        });
 
-		$activeApp = $this->getActiveEntry();
-		if ($activeApp !== null) {
-			foreach ($list as $index => &$navEntry) {
-				if ($navEntry['id'] == $activeApp) {
-					$navEntry['active'] = true;
-				} else {
-					$navEntry['active'] = false;
-				}
-			}
-			unset($navEntry);
-		}
+        $activeApp = $this->getActiveEntry();
+        if ($activeApp !== null) {
+            foreach ($list as $index => &$navEntry) {
+                if ($navEntry['id'] == $activeApp) {
+                    $navEntry['active'] = true;
+                } else {
+                    $navEntry['active'] = false;
+                }
+            }
+            unset($navEntry);
+        }
 
-		return $list;
-	}
+        return $list;
+    }
 
 
-	/**
-	 * removes all the entries
-	 */
-	public function clear($loadDefaultLinks = true) {
-		$this->entries = [];
-		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
-	}
+    /**
+     * removes all the entries
+     */
+    public function clear($loadDefaultLinks = true) {
+        $this->entries = [];
+        $this->closureEntries = [];
+        $this->init = !$loadDefaultLinks;
+    }
 
-	/**
-	 * Sets the current navigation entry of the currently running app
-	 * @param string $id of the app entry to activate (from added $entry)
-	 */
-	public function setActiveEntry($id) {
-		$this->activeEntry = $id;
-	}
+    /**
+     * Sets the current navigation entry of the currently running app
+     * @param string $id of the app entry to activate (from added $entry)
+     */
+    public function setActiveEntry($id) {
+        $this->activeEntry = $id;
+    }
 
-	/**
-	 * gets the active Menu entry
-	 * @return string id or empty string
-	 *
-	 * This function returns the id of the active navigation entry (set by
-	 * setActiveEntry
-	 */
-	public function getActiveEntry() {
-		return $this->activeEntry;
-	}
+    /**
+     * gets the active Menu entry
+     * @return string id or empty string
+     *
+     * This function returns the id of the active navigation entry (set by
+     * setActiveEntry
+     */
+    public function getActiveEntry() {
+        return $this->activeEntry;
+    }
 
-	private function init() {
-		if ($this->init) {
-			return;
-		}
-		$this->init = true;
+    private function init() {
+        if ($this->init) {
+            return;
+        }
+        $this->init = true;
 
-		$l = $this->l10nFac->get('lib');
-		if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
-			$this->add([
-				'type' => 'settings',
-				'id' => 'help',
-				'order' => 6,
-				'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
-				'name' => $l->t('Help'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
-			]);
-		}
+        $l = $this->l10nFac->get('lib');
+        if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
+            $this->add([
+                'type' => 'settings',
+                'id' => 'help',
+                'order' => 6,
+                'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
+                'name' => $l->t('Help'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
+            ]);
+        }
 
-		if ($this->userSession->isLoggedIn()) {
-			if ($this->isAdmin()) {
-				// App management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_apps',
-					'order' => 4,
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
-					'name' => $l->t('Apps'),
-				]);
-			}
+        if ($this->userSession->isLoggedIn()) {
+            if ($this->isAdmin()) {
+                // App management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_apps',
+                    'order' => 4,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+                    'name' => $l->t('Apps'),
+                ]);
+            }
 
-			// Personal and (if applicable) admin settings
-			$this->add([
-				'type' => 'settings',
-				'id' => 'settings',
-				'order' => 2,
-				'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-				'name' => $l->t('Settings'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-			]);
+            // Personal and (if applicable) admin settings
+            $this->add([
+                'type' => 'settings',
+                'id' => 'settings',
+                'order' => 2,
+                'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                'name' => $l->t('Settings'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+            ]);
 
-			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if ($logoutUrl !== '') {
-				// Logout
-				$this->add([
-					'type' => 'settings',
-					'id' => 'logout',
-					'order' => 99999,
-					'href' => $logoutUrl,
-					'name' => $l->t('Log out'),
-					'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
-				]);
-			}
+            $logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
+            if ($logoutUrl !== '') {
+                // Logout
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'logout',
+                    'order' => 99999,
+                    'href' => $logoutUrl,
+                    'name' => $l->t('Log out'),
+                    'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
+                ]);
+            }
 
-			if ($this->isSubadmin()) {
-				// User management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_users',
-					'order' => 5,
-					'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
-					'name' => $l->t('Users'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
-				]);
-			}
-		}
+            if ($this->isSubadmin()) {
+                // User management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_users',
+                    'order' => 5,
+                    'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
+                    'name' => $l->t('Users'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
+                ]);
+            }
+        }
 
-		if ($this->appManager === 'null') {
-			return;
-		}
+        if ($this->appManager === 'null') {
+            return;
+        }
 
-		if ($this->userSession->isLoggedIn()) {
-			$apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
-		} else {
-			$apps = $this->appManager->getInstalledApps();
-		}
+        if ($this->userSession->isLoggedIn()) {
+            $apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
+        } else {
+            $apps = $this->appManager->getInstalledApps();
+        }
 
-		foreach ($apps as $app) {
-			if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
-				continue;
-			}
+        foreach ($apps as $app) {
+            if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
+                continue;
+            }
 
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['navigations']['navigation'])) {
-				continue;
-			}
-			foreach ($info['navigations']['navigation'] as $key => $nav) {
-				if (!isset($nav['name'])) {
-					continue;
-				}
-				if (!isset($nav['route'])) {
-					continue;
-				}
-				$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
-				if ($role === 'admin' && !$this->isAdmin()) {
-					continue;
-				}
-				$l = $this->l10nFac->get($app);
-				$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
-				$order = isset($nav['order']) ? $nav['order'] : 100;
-				$type = isset($nav['type']) ? $nav['type'] : 'link';
-				$route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
-				$icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
-				foreach ([$icon, "$app.svg"] as $i) {
-					try {
-						$icon = $this->urlGenerator->imagePath($app, $i);
-						break;
-					} catch (\RuntimeException $ex) {
-						// no icon? - ignore it then
-					}
-				}
-				if ($icon === null) {
-					$icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
-				}
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['navigations']['navigation'])) {
+                continue;
+            }
+            foreach ($info['navigations']['navigation'] as $key => $nav) {
+                if (!isset($nav['name'])) {
+                    continue;
+                }
+                if (!isset($nav['route'])) {
+                    continue;
+                }
+                $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
+                if ($role === 'admin' && !$this->isAdmin()) {
+                    continue;
+                }
+                $l = $this->l10nFac->get($app);
+                $id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
+                $order = isset($nav['order']) ? $nav['order'] : 100;
+                $type = isset($nav['type']) ? $nav['type'] : 'link';
+                $route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
+                $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
+                foreach ([$icon, "$app.svg"] as $i) {
+                    try {
+                        $icon = $this->urlGenerator->imagePath($app, $i);
+                        break;
+                    } catch (\RuntimeException $ex) {
+                        // no icon? - ignore it then
+                    }
+                }
+                if ($icon === null) {
+                    $icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
+                }
 
-				$this->add([
-					'id' => $id,
-					'order' => $order,
-					'href' => $route,
-					'icon' => $icon,
-					'type' => $type,
-					'name' => $l->t($nav['name']),
-				]);
-			}
-		}
-	}
+                $this->add([
+                    'id' => $id,
+                    'order' => $order,
+                    'href' => $route,
+                    'icon' => $icon,
+                    'type' => $type,
+                    'name' => $l->t($nav['name']),
+                ]);
+            }
+        }
+    }
 
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
 
-	private function isSubadmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->getSubAdmin()->isSubAdmin($user);
-		}
-		return false;
-	}
+    private function isSubadmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->getSubAdmin()->isSubAdmin($user);
+        }
+        return false;
+    }
 }