From 5adc418fef179f517761d07f1b0b84f9c07c4181 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 16:58:39 -0400
Subject: [PATCH] manage ip address dropdown

---
 public/src/admin/admin.js        | 10 +++++-----
 public/src/admin/settings.js     |  2 +-
 public/src/modules/settings.js   |  2 +-
 src/controllers/admin/users.js   |  2 +-
 src/views/admin/manage/users.tpl | 20 +++++++++++++++++---
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index d39046d543..e59e34ee3f 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -41,7 +41,7 @@ app.onDomReady();
 		}, 3600000);
 	}
 
-	require(['hooks'], (hooks) => {
+	require(['hooks', 'admin/settings'], (hooks, Settings) => {
 		hooks.on('action:ajaxify.end', (data) => {
 			updatePageTitle(data.url);
 			setupRestartLinks();
@@ -54,10 +54,10 @@ app.onDomReady();
 			});
 
 			if ($('.settings').length) {
-				require(['admin/settings'], function (Settings) {
-					Settings.prepare();
-					Settings.populateTOC();
-				});
+				Settings.prepare();
+			}
+			if ($('[component="settings/toc"]').length) {
+				Settings.populateTOC();
 			}
 		});
 		hooks.on('action:ajaxify.start', function () {
diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index adfec55339..591ad5d22b 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -143,7 +143,7 @@ define('admin/settings', [
 			saveBtnEl.classList.toggle('saved', true);
 			setTimeout(() => {
 				saveBtnEl.classList.toggle('saved', false);
-			}, 2500);
+			}, 1500);
 		}
 	};
 
diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js
index 4f90161bc3..5edeb37e51 100644
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@@ -557,7 +557,7 @@ define('settings', ['hooks', 'alerts'], function (hooks, alerts) {
 						saveBtn.classList.toggle('saved', true);
 						setTimeout(() => {
 							saveBtn.classList.toggle('saved', false);
-						}, 5000);
+						}, 1500);
 					}
 				});
 			}
diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js
index 2bf0c3a9e8..110fbadd40 100644
--- a/src/controllers/admin/users.js
+++ b/src/controllers/admin/users.js
@@ -162,7 +162,7 @@ usersController.search = async function (req, res) {
 
 async function loadUserInfo(callerUid, uids) {
 	async function getIPs() {
-		return await Promise.all(uids.map(uid => db.getSortedSetRevRange(`uid:${uid}:ip`, 0, -1)));
+		return await Promise.all(uids.map(uid => db.getSortedSetRevRange(`uid:${uid}:ip`, 0, 4)));
 	}
 	async function getConfirmObjs() {
 		const keys = uids.map(uid => `confirm:byUid:${uid}`);
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index de75251e13..8f556b19d3 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -108,7 +108,7 @@
 								<i class="administrator fa fa-shield text-success{{{ if !users.administrator }}} hidden{{{ end }}}"></i>
 								<a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a>
 							</td>
-							<td>
+							<td class="text-nowrap">
 								{{{ if ./email }}}
 								<i class="validated fa fa-fw fa-check text-success{{{ if !users.email:confirmed }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validated]]" data-bs-toggle="tooltip"></i>
 
@@ -117,11 +117,25 @@
 								<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>
 								{./email}
 								{{{ else }}}
-								<i class="noemail fa fa-fw fa-ban text-muted""></i>
+								<i class="noemail fa fa-fw fa-nbb-none text-muted""></i>
 								<em class="text-muted">[[admin/manage/users:users.no-email]]</em>
 								{{{ end }}}
 							</td>
-							<td>{users.ip}</td>
+							<td>
+								{{{ if ./ips.length }}}
+								<div class="dropdown">
+									<button class="btn btn-light btn-sm" data-bs-toggle="dropdown"><i class="fa fa-fw fa-list text-muted"></i></button>
+									<ul class="dropdown-menu p-1">
+										{{{ each ./ips }}}
+										<li class="d-flex gap-1 {{{ if !@last }}}mb-1{{{ end }}}">
+											<a class="dropdown-item rounded-1">{@value}</a>
+											<button data-ip="{@value}" onclick="navigator.clipboard.writeText(this.getAttribute('data-ip'))" class="btn btn-light btn-sm"><i class="fa fa-copy"></i></button>
+										</li>
+										{{{ end }}}
+									</ul>
+								</div>
+								{{{ end }}}
+							</td>
 							<td class="text-end">{users.postcount}</td>
 							<td class="text-end">{users.reputation}</td>
 							<td class="text-end">{{{ if users.flags }}}{users.flags}{{{ else }}}0{{{ end }}}</td>