From 7999f2d34b4f05fa4e0930b4215f8d9f47a647e2 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 15 Jun 2026 20:25:28 +0300 Subject: [PATCH] fix emoji tab --- .../settings_modal/helpers/emoji_editing_popover.vue | 2 +- src/stores/admin_settings.js | 10 +++++++--- src/stores/emoji.js | 8 +++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/settings_modal/helpers/emoji_editing_popover.vue b/src/components/settings_modal/helpers/emoji_editing_popover.vue index 2c7b151be..102d231ba 100644 --- a/src/components/settings_modal/helpers/emoji_editing_popover.vue +++ b/src/components/settings_modal/helpers/emoji_editing_popover.vue @@ -159,7 +159,7 @@ import { addNewEmojiFile, deleteEmojiFile, updateEmojiFile, -} from 'src/services/api/api.service.js' +} from 'src/services/api/admin.js' export default { components: { diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js index d76c5f6d5..1ced1a1c1 100644 --- a/src/stores/admin_settings.js +++ b/src/stores/admin_settings.js @@ -548,11 +548,15 @@ export const useAdminSettingsStore = defineStore('adminSettings', { importEmojiFromFS() { return importEmojiFromFS({ credentials: useCredentialsStore().current }) }, - listEmojiPacks() { - return listEmojiPacks({ credentials: useCredentialsStore().current }) + listEmojiPacks(params) { + return listEmojiPacks({ + ...params, + credentials: useCredentialsStore().current + }) }, - listRemoteEmojiPacks() { + listRemoteEmojiPacks(params) { return listRemoteEmojiPacks({ + ...params, credentials: useCredentialsStore().current, }) }, diff --git a/src/stores/emoji.js b/src/stores/emoji.js index 83b897593..2a30d651b 100644 --- a/src/stores/emoji.js +++ b/src/stores/emoji.js @@ -188,8 +188,8 @@ export const useEmojiStore = defineStore('emoji', { this.adminPacksLocalLoading = true this.adminPacksLocal = await this.getAdminPacks( useInstanceStore().server, - () => - listEmojiPacks({ + (params) => listEmojiPacks({ + ...params, credentials: useCredentialsStore().current, }), ) @@ -208,7 +208,6 @@ export const useEmojiStore = defineStore('emoji', { page: 1, pageSize: 0, }) - .then((data) => data.json()) .then((data) => { if (data.error !== undefined) { return Promise.reject(data.error) @@ -223,7 +222,6 @@ export const useEmojiStore = defineStore('emoji', { page: i, pageSize, }) - .then((data) => data.json()) .then((pageData) => { if (pageData.error !== undefined) { return Promise.reject(pageData.error) @@ -249,7 +247,7 @@ export const useEmojiStore = defineStore('emoji', { }, {}) }) .catch((data) => { - this.displayError(data) + console.error(data) }) },