2 files changed, 36 insertions, 6 deletions

diff --git a/src/server/api/endpoints/admin/emoji/list-remote.ts b/src/server/api/endpoints/admin/emoji/list-remote.ts
index 7ced4623bb..cbdcaa681c 100644
--- a/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -16,6 +16,11 @@ export const meta = {
 	requireModerator: true,
 
 	params: {
+		query: {
+			validator: $.optional.nullable.str,
+			default: null as any
+		},
+
 		host: {
 			validator: $.optional.nullable.str,
 			default: null as any
@@ -45,9 +50,12 @@ export default define(meta, async (ps) => {
 		q.andWhere(`emoji.host = :host`, { host: toPuny(ps.host) });
 	}
 
+	if (ps.query) {
+		q.andWhere('emoji.name like :query', { query: '%' + ps.query + '%' });
+	}
+
 	const emojis = await q
-		.orderBy('emoji.category', 'ASC')
-		.orderBy('emoji.name', 'ASC')
+		.orderBy('emoji.id', 'DESC')
 		.take(ps.limit!)
 		.getMany();
 
diff --git a/src/server/api/endpoints/admin/emoji/list.ts b/src/server/api/endpoints/admin/emoji/list.ts
index e3aab4cf7c..bd3e294851 100644
--- a/src/server/api/endpoints/admin/emoji/list.ts
+++ b/src/server/api/endpoints/admin/emoji/list.ts
@@ -3,6 +3,7 @@ import define from '../../../define';
 import { Emojis } from '../../../../../models';
 import { makePaginationQuery } from '../../../common/make-pagination-query';
 import { ID } from '../../../../../misc/cafy-id';
+import { Emoji } from '../../../../../models/entities/emoji';
 
 export const meta = {
 	desc: {
@@ -15,6 +16,11 @@ export const meta = {
 	requireModerator: true,
 
 	params: {
+		query: {
+			validator: $.optional.nullable.str,
+			default: null as any
+		},
+
 		limit: {
 			validator: $.optional.num.range(1, 100),
 			default: 10
@@ -31,10 +37,26 @@ export const meta = {
 };
 
 export default define(meta, async (ps) => {
-	const emojis = await makePaginationQuery(Emojis.createQueryBuilder('emoji'), ps.sinceId, ps.untilId)
-		.andWhere(`emoji.host IS NULL`)
-		.take(ps.limit!)
-		.getMany();
+	const q = makePaginationQuery(Emojis.createQueryBuilder('emoji'), ps.sinceId, ps.untilId)
+		.andWhere(`emoji.host IS NULL`);
+
+	let emojis: Emoji[];
+
+	if (ps.query) {
+		//q.andWhere('emoji.name ILIKE :q', { q: `%${ps.query}%` });
+		//const emojis = await q.take(ps.limit!).getMany();
+
+		emojis = await q.getMany();
+
+		emojis = emojis.filter(emoji =>
+			emoji.name.includes(ps.query) ||
+			emoji.aliases.some(a => a.includes(ps.query)) ||
+			emoji.category?.includes(ps.query));
+
+		emojis.splice(ps.limit! + 1);
+	} else {
+		emojis = await q.take(ps.limit!).getMany();
+	}
 
 	return Emojis.packMany(emojis);
 });