Skip to content

fix(user_status): Also delete backup status when reverting a hard-cod… #38180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nickvergessen wants to merge 1 commit into from
Closed

fix(user_status): Also delete backup status when reverting a hard-cod… #38180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions apps/user_status/lib/Service/StatusService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,14 +500,19 @@ public function revertUserStatus(string $userId, string $messageId, bool $revert
try {
/** @var UserStatus $userStatus */
$backupUserStatus = $this->mapper->findByUserId($userId, true);
} catch (DoesNotExistException $ex) {
// No user status to revert, do nothing
} catch (DoesNotExistException) {
// No user status to revert, so we only delete
$this->mapper->deleteCurrentStatusToRestoreBackup($userId, $messageId);
return null;
}

$deleted = $this->mapper->deleteCurrentStatusToRestoreBackup($userId, $messageId);
if (!$deleted) {
// Another status is set automatically or no status, do nothing
// Check if the backup status is what we are looking for
if ($backupUserStatus->getMessageId() === $messageId) {
$this->mapper->delete($backupUserStatus);
}
return null;
}

Expand All @@ -534,8 +539,7 @@ public function revertMultipleUserStatus(array $userIds, string $messageId): voi

$backups = $restoreIds = $statuesToDelete = [];
foreach ($userStatuses as $userStatus) {
if (!$userStatus->getIsBackup()
&& $userStatus->getMessageId() === $messageId) {
if ($userStatus->getMessageId() === $messageId) {
$statuesToDelete[$userStatus->getUserId()] = $userStatus->getId();
} else if ($userStatus->getIsBackup()) {
$backups[$userStatus->getUserId()] = $userStatus->getId();
Expand Down