feat: add not validated/expired

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",

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;
 			}
 		}
 	});

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>