From 5fae09f3aa124bc86afd180616230a2a7197d853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 6 Jun 2023 20:55:52 -0400
Subject: [PATCH] feat: add not validated/expired

---
 public/language/en-GB/admin/manage/users.json | 1 +
 src/controllers/admin/users.js                | 2 --
 src/views/admin/manage/users.tpl              | 5 ++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/language/en-GB/admin/manage/users.json b/public/language/en-GB/admin/manage/users.json
index 9486295bc3..96b024fec5 100644
--- a/public/language/en-GB/admin/manage/users.json
+++ b/public/language/en-GB/admin/manage/users.json
@@ -51,6 +51,7 @@
 	"users.email": "email",
 	"users.no-email": "(no email)",
 	"users.validated": "Validated",
+	"users.not-validated": "Not Validated",
 	"users.validation-pending": "Validation Pending",
 	"users.validation-expired": "Validation Expired",
 	"users.ip": "IP",
diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js
index 110fbadd40..cc88567996 100644
--- a/src/controllers/admin/users.js
+++ b/src/controllers/admin/users.js
@@ -191,8 +191,6 @@ async function loadUserInfo(callerUid, uids) {
 				const confirmObj = confirmObjs[index];
 				user['email:expired'] = !confirmObj.expires || Date.now() >= confirmObj.expires;
 				user['email:pending'] = confirmObj.expires && Date.now() < confirmObj.expires;
-			} else if (!user['email:confirmed']) {
-				user['email:expired'] = true;
 			}
 		}
 	});
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 8bdeb32c06..655b326c3a 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -114,7 +114,10 @@
 
 								<i class="pending fa fa-fw fa-clock-o text-warning{{{ if !users.email:pending }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-pending]]" data-bs-toggle="tooltip"></i>
 
-								<i class="notvalidated fa fa-fw fa-times text-danger{{{ if !users.email:expired }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-expired]]" data-bs-toggle="tooltip"></i>
+								<i class="expired fa fa-fw fa-times text-danger{{{ if !users.email:expired }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-expired]]" data-bs-toggle="tooltip"></i>
+
+								<i class="notvalidated fa fa-fw fa-times text-danger{{{ if (users.email:expired || (users.email.pending || users.email:confirmed)) }}} hidden{{{ end }}}" title="[[admin/manage/users:users.not-validated]]" data-bs-toggle="tooltip"></i>
+
 								{./email}
 								{{{ else }}}
 								<i class="noemail fa fa-fw fa-nbb-none text-muted""></i>