diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index c4f539b03a..34206cb189 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -455,7 +455,7 @@ export class CustomEmojiService implements OnApplicationShutdown { builder.andWhere('emoji.name LIKE :name', { name: `%${q.name}%` }); } if (q.hostType === 'local') { - builder.andWhere('emoji.host LIKE :host', { host: `%${q.host}%` }); + builder.andWhere('emoji.host IS NULL'); } else { if (q.host) { // noIndexScan @@ -524,7 +524,7 @@ export class CustomEmojiService implements OnApplicationShutdown { return { emojis, - count: (count > limit ? emojis.length : count), + count: (count > limit ? emojis.length : count), allCount: count, allPages: Math.ceil(count / limit), }; diff --git a/packages/frontend/src/components/MkPagingButtons.vue b/packages/frontend/src/components/MkPagingButtons.vue new file mode 100644 index 0000000000..664fcf6ab2 --- /dev/null +++ b/packages/frontend/src/components/MkPagingButtons.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue b/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue index 628fc80d4c..1b4daf8e4a 100644 --- a/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue +++ b/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue @@ -1,6 +1,6 @@