upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Don't update statuses to offline again and again

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-06-04 12:03:16 +02:00 committed by backportbot[bot]
parent 4136993f44
commit d06f3cc51a
4 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/user_status/lib/Db/UserStatusMapper.php
View file

@ -137,6 +137,7 @@ class UserStatusMapper extends QBMapper {
->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()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE)))
->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))

4
apps/user_status/lib/Service/StatusService.php
View file

@ -355,6 +355,10 @@ class StatusService {
* @param UserStatus $status
*/
private function cleanStatus(UserStatus $status): void {
if ($status->getStatus() === IUserStatus::OFFLINE && !$status->getIsUserDefined()) {
return;
}
$status->setStatus(IUserStatus::OFFLINE);
$status->setStatusTimestamp($this->timeFactory->getTime());
$status->setIsUserDefined(false);

1
apps/user_status/tests/Unit/Db/UserStatusMapperTest.php
View file

@ -187,6 +187,7 @@ class UserStatusMapperTest extends TestCase {
public function clearStatusesOlderThanDataProvider(): array {
return [
['offline', false, 6000, false],
['online', true, 6000, false],
['online', true, 4000, true],
['online', false, 6000, false],

41
apps/user_status/tests/Unit/Service/StatusServiceTest.php
View file

@ -37,6 +37,7 @@ use OCA\UserStatus\Service\PredefinedStatusService;
use OCA\UserStatus\Service\StatusService;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\UserStatus\IUserStatus;
use Test\TestCase;
class StatusServiceTest extends TestCase {
@ -623,4 +624,44 @@ class StatusServiceTest extends TestCase {
$actual = $this->service->removeUserStatus('john.doe');
$this->assertFalse($actual);
}
public function testCleanStatusAutomaticOnline(): void {
$status = new UserStatus();
$status->setStatus(IUserStatus::ONLINE);
$status->setStatusTimestamp(1337);
$status->setIsUserDefined(false);
$this->mapper->expects(self::once())
->method('update')
->with($status);
parent::invokePrivate($this->service, 'cleanStatus', [$status]);
}
public function testCleanStatusCustomOffline(): void {
$status = new UserStatus();
$status->setStatus(IUserStatus::OFFLINE);
$status->setStatusTimestamp(1337);
$status->setIsUserDefined(true);
$this->mapper->expects(self::once())
->method('update')
->with($status);
parent::invokePrivate($this->service, 'cleanStatus', [$status]);
}
public function testCleanStatusCleanedAlready(): void {
$status = new UserStatus();
$status->setStatus(IUserStatus::OFFLINE);
$status->setStatusTimestamp(1337);
$status->setIsUserDefined(false);
// Don't update the status again and again when no value changed
$this->mapper->expects(self::never())
->method('update')
->with($status);
parent::invokePrivate($this->service, 'cleanStatus', [$status]);
}
}