From b92a3255394a727feb4a9aae1eef3c2048e2bea4 Mon Sep 17 00:00:00 2001 From: piuvas Date: Mon, 20 Jan 2025 17:18:56 -0300 Subject: [PATCH 1/3] use addOrderBy as not to override orderBy --- packages/backend/src/server/api/endpoints/emojis.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index 3cc7f89ab9..f8095dd00e 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -59,7 +59,7 @@ export default class extends Endpoint { // eslint- const emojis = await this.emojisRepository.createQueryBuilder() .where('host IS NULL') .orderBy('LOWER(category)', 'ASC') - .orderBy('LOWER(name)', 'ASC') + .addOrderBy('LOWER(name)', 'ASC') .getMany(); return { emojis: await this.emojiEntityService.packSimpleMany(emojis), From 62964c45f8bd2fce818b76faaba88f94c71db74d Mon Sep 17 00:00:00 2001 From: piuvas Date: Mon, 20 Jan 2025 17:26:39 -0300 Subject: [PATCH 2/3] cleanup for linter to be happy --- packages/backend/src/server/api/endpoints/emojis.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index f8095dd00e..84f2eebe88 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import type { EmojisRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -55,7 +54,7 @@ export default class extends Endpoint { // eslint- private emojiEntityService: EmojiEntityService, ) { - super(meta, paramDef, async (ps, me) => { + super(meta, paramDef, async () => { const emojis = await this.emojisRepository.createQueryBuilder() .where('host IS NULL') .orderBy('LOWER(category)', 'ASC') From 716f203171361d6279104b36b868a237f6abae56 Mon Sep 17 00:00:00 2001 From: piuvas Date: Thu, 23 Jan 2025 22:33:19 -0300 Subject: [PATCH 3/3] requested changes --- packages/backend/src/server/api/endpoints/emojis.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index 84f2eebe88..4909c948e3 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -54,7 +54,7 @@ export default class extends Endpoint { // eslint- private emojiEntityService: EmojiEntityService, ) { - super(meta, paramDef, async () => { + super(meta, paramDef, async (ps, me) => { const emojis = await this.emojisRepository.createQueryBuilder() .where('host IS NULL') .orderBy('LOWER(category)', 'ASC')