From b6f2f0e5d03db32e2dcbb0e55c681cbcb475c718 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Fri, 25 Sep 2020 14:47:22 -0400
Subject: [PATCH] fix: #8681 change owner modal's search should check if user
 is banned

---
 public/src/client/topic/change-owner.js | 2 +-
 src/socket.io/user/search.js            | 1 +
 src/user/search.js                      | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/src/client/topic/change-owner.js b/public/src/client/topic/change-owner.js
index 9778ec232e..771b3b6345 100644
--- a/public/src/client/topic/change-owner.js
+++ b/public/src/client/topic/change-owner.js
@@ -37,7 +37,7 @@ define('forum/topic/change-owner', [
 				changeOwner();
 			});
 
-			autocomplete.user(modal.find('#username'), function (ev, ui) {
+			autocomplete.user(modal.find('#username'), { notBanned: true }, function (ev, ui) {
 				toUid = ui.item.user.uid;
 				checkButtonEnable();
 			});
diff --git a/src/socket.io/user/search.js b/src/socket.io/user/search.js
index 0844800f26..b1fc2e1e3e 100644
--- a/src/socket.io/user/search.js
+++ b/src/socket.io/user/search.js
@@ -24,6 +24,7 @@ module.exports = function (SocketUser) {
 			sortBy: data.sortBy,
 			onlineOnly: data.onlineOnly,
 			bannedOnly: data.bannedOnly,
+			notBanned: data.notBanned,
 			flaggedOnly: data.flaggedOnly,
 			paginate: data.paginate,
 			uid: socket.uid,
diff --git a/src/user/search.js b/src/user/search.js
index b7bc57e83a..e2e94b19f6 100644
--- a/src/user/search.js
+++ b/src/user/search.js
@@ -78,7 +78,7 @@ module.exports = function (User) {
 		if (data.onlineOnly) {
 			fields.push('status', 'lastonline');
 		}
-		if (data.bannedOnly) {
+		if (data.bannedOnly || data.notBanned) {
 			fields.push('banned');
 		}
 		if (data.flaggedOnly) {
@@ -104,6 +104,10 @@ module.exports = function (User) {
 			userData = userData.filter(user => user.banned);
 		}
 
+		if (data.notBanned) {
+			userData = userData.filter(user => !user.banned);
+		}
+
 		if (data.flaggedOnly) {
 			userData = userData.filter(user => parseInt(user.flags, 10) > 0);
 		}