From 699cb3324202c1a0b7da5d5e81bf082f7003db03 Mon Sep 17 00:00:00 2001 From: SychO9 Date: Fri, 3 Jun 2022 10:16:35 +0100 Subject: [PATCH] fix(suspend): suspension modal shows after suspension is over --- extensions/suspend/js/src/forum/checkForSuspension.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/suspend/js/src/forum/checkForSuspension.js b/extensions/suspend/js/src/forum/checkForSuspension.js index ec91336613..25cad9c7ad 100644 --- a/extensions/suspend/js/src/forum/checkForSuspension.js +++ b/extensions/suspend/js/src/forum/checkForSuspension.js @@ -7,11 +7,12 @@ export default function () { if (app.session.user) { const message = app.session.user.suspendMessage(); const until = app.session.user.suspendedUntil(); + const isSuspended = message && until && new Date() < until; const alreadyDisplayed = localStorage.getItem(localStorageKey()) === until?.getTime().toString(); - if (message && !alreadyDisplayed) { + if (isSuspended && !alreadyDisplayed) { app.modal.show(SuspensionInfoModal, { message, until }); - } else if (!until && localStorage.getItem(localStorageKey())) { + } else if (localStorage.getItem(localStorageKey())) { localStorage.removeItem(localStorageKey()); } }