From 886e6633826013e22205e4d7b6bbfe518729a36d Mon Sep 17 00:00:00 2001 From: f0x Date: Mon, 7 Nov 2022 15:52:51 +0000 Subject: [PATCH] clean up old redux api+reducers for custom emoji --- web/source/settings/lib/api/admin.js | 27 ------------- web/source/settings/redux/reducers/admin.js | 42 +-------------------- 2 files changed, 2 insertions(+), 67 deletions(-) diff --git a/web/source/settings/lib/api/admin.js b/web/source/settings/lib/api/admin.js index 56513b900..5f4fa1d1f 100644 --- a/web/source/settings/lib/api/admin.js +++ b/web/source/settings/lib/api/admin.js @@ -160,33 +160,6 @@ module.exports = function ({ apiCall, getChanges }) { }); }; }, - - fetchCustomEmoji: function fetchCustomEmoji() { - return function (dispatch, _getState) { - return Promise.try(() => { - return dispatch(apiCall("GET", "/api/v1/admin/custom_emojis?filter=domain:local&limit=0")); - }).then((emoji) => { - return dispatch(admin.setEmoji(emoji)); - }); - }; - }, - - newEmoji: function newEmoji() { - return function (dispatch, getState) { - return Promise.try(() => { - const state = getState().admin.newEmoji; - - const update = getChanges(state, { - formKeys: ["shortcode"], - fileKeys: ["image"] - }); - - return dispatch(apiCall("POST", "/api/v1/admin/custom_emojis", update, "form")); - }).then((emoji) => { - return dispatch(admin.addEmoji(emoji)); - }); - }; - } }; return adminAPI; }; \ No newline at end of file diff --git a/web/source/settings/redux/reducers/admin.js b/web/source/settings/redux/reducers/admin.js index 666286178..c31828db7 100644 --- a/web/source/settings/redux/reducers/admin.js +++ b/web/source/settings/redux/reducers/admin.js @@ -35,13 +35,6 @@ function emptyBlock() { }; } -function emptyEmojiForm() { - return { - id: Date.now(), - shortcode: "" - }; -} - module.exports = createSlice({ name: "admin", initialState: { @@ -52,10 +45,7 @@ module.exports = createSlice({ exportType: "plain", ...emptyBlock() }, - newInstanceBlocks: {}, - emoji: {}, - emojiById: {}, - newEmoji: emptyEmojiForm() + newInstanceBlocks: {} }, reducers: { setBlockedInstances: (state, { payload }) => { @@ -105,34 +95,6 @@ module.exports = createSlice({ state.bulkBlock.list = Object.values(state.blockedInstances).map((entry) => { return entry.domain; }).join("\n"); - }, - - setEmoji: (state, {payload}) => { - state.emoji = {}; - payload.forEach((emoji) => { - if (emoji.category == undefined) { - emoji.category = "Unsorted"; - } - state.emoji[emoji.category] = defaultValue(state.emoji[emoji.category], []); - state.emoji[emoji.category].push(emoji); - state.emojiById[emoji.id] = emoji; - }); - }, - - updateNewEmojiVal: (state, { payload: [key, val] }) => { - state.newEmoji[key] = val; - }, - - addEmoji: (state, {payload: emoji}) => { - if (emoji.category == undefined) { - emoji.category = "Unsorted"; - } - if (emoji.id == undefined) { - emoji.id = Date.now(); - } - state.emoji[emoji.category] = defaultValue(state.emoji[emoji.category], []); - state.emoji[emoji.category].push(emoji); - state.emojiById[emoji.id] = emoji; - }, + } } }); \ No newline at end of file