diff options
Diffstat (limited to 'web/source/settings/admin/emoji/local')
4 files changed, 22 insertions, 18 deletions
diff --git a/web/source/settings/admin/emoji/local/detail.js b/web/source/settings/admin/emoji/local/detail.js index daf7a2dac..18a681b6e 100644 --- a/web/source/settings/admin/emoji/local/detail.js +++ b/web/source/settings/admin/emoji/local/detail.js @@ -20,21 +20,25 @@ const React = require("react"); const { useRoute, Link, Redirect } = require("wouter"); -const query = require("../../../lib/query"); - const { useComboBoxInput, useFileInput, useValue } = require("../../../lib/form"); const { CategorySelect } = require("../category-select"); -const useFormSubmit = require("../../../lib/form/submit"); +const useFormSubmit = require("../../../lib/form/submit").default; const { useBaseUrl } = require("../../../lib/navigation/util"); const FakeToot = require("../../../components/fake-toot"); -const FormWithData = require("../../../lib/form/form-with-data"); +const FormWithData = require("../../../lib/form/form-with-data").default; const Loading = require("../../../components/loading"); const { FileInput } = require("../../../components/form/inputs"); const MutationButton = require("../../../components/form/mutation-button"); const { Error } = require("../../../components/error"); +const { + useGetEmojiQuery, + useEditEmojiMutation, + useDeleteEmojiMutation, +} = require("../../../lib/query/admin/custom-emoji"); + module.exports = function EmojiDetailRoute({ }) { const baseUrl = useBaseUrl(); let [_match, params] = useRoute(`${baseUrl}/:emojiId`); @@ -44,7 +48,7 @@ module.exports = function EmojiDetailRoute({ }) { return ( <div className="emoji-detail"> <Link to={baseUrl}><a>< go back</a></Link> - <FormWithData dataQuery={query.useGetEmojiQuery} queryArg={params.emojiId} DataForm={EmojiDetailForm} /> + <FormWithData dataQuery={useGetEmojiQuery} queryArg={params.emojiId} DataForm={EmojiDetailForm} /> </div> ); } @@ -61,7 +65,7 @@ function EmojiDetailForm({ data: emoji }) { }) }; - const [modifyEmoji, result] = useFormSubmit(form, query.useEditEmojiMutation()); + const [modifyEmoji, result] = useFormSubmit(form, useEditEmojiMutation()); // Automatic submitting of category change React.useEffect(() => { @@ -74,7 +78,7 @@ function EmojiDetailForm({ data: emoji }) { /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [form.category.hasChanged(), form.category.isNew, form.category.state.open]); - const [deleteEmoji, deleteResult] = query.useDeleteEmojiMutation(); + const [deleteEmoji, deleteResult] = useDeleteEmojiMutation(); if (deleteResult.isSuccess) { return <Redirect to={baseUrl} />; diff --git a/web/source/settings/admin/emoji/local/new-emoji.js b/web/source/settings/admin/emoji/local/new-emoji.js index 439d09e62..ecb0465cb 100644 --- a/web/source/settings/admin/emoji/local/new-emoji.js +++ b/web/source/settings/admin/emoji/local/new-emoji.js @@ -19,15 +19,13 @@ const React = require("react"); -const query = require("../../../lib/query"); - const { useFileInput, useComboBoxInput } = require("../../../lib/form"); const useShortcode = require("./use-shortcode"); -const useFormSubmit = require("../../../lib/form/submit"); +const useFormSubmit = require("../../../lib/form/submit").default; const { TextInput, FileInput @@ -36,11 +34,13 @@ const { const { CategorySelect } = require('../category-select'); const FakeToot = require("../../../components/fake-toot"); const MutationButton = require("../../../components/form/mutation-button"); +const { useAddEmojiMutation } = require("../../../lib/query/admin/custom-emoji"); +const { useInstanceV1Query } = require("../../../lib/query"); module.exports = function NewEmojiForm() { const shortcode = useShortcode(); - const { data: instance } = query.useInstanceQuery(); + const { data: instance } = useInstanceV1Query(); const emojiMaxSize = React.useMemo(() => { return instance?.configuration?.emojis?.emoji_size_limit ?? 50 * 1024; }, [instance]); @@ -54,7 +54,7 @@ module.exports = function NewEmojiForm() { const [submitForm, result] = useFormSubmit({ shortcode, image, category - }, query.useAddEmojiMutation()); + }, useAddEmojiMutation()); React.useEffect(() => { if (shortcode.value.length == 0) { diff --git a/web/source/settings/admin/emoji/local/overview.js b/web/source/settings/admin/emoji/local/overview.js index 38dc1feba..757f07c43 100644 --- a/web/source/settings/admin/emoji/local/overview.js +++ b/web/source/settings/admin/emoji/local/overview.js @@ -25,13 +25,13 @@ const { matchSorter } = require("match-sorter"); const NewEmojiForm = require("./new-emoji"); const { useTextInput } = require("../../../lib/form"); -const query = require("../../../lib/query"); const { useEmojiByCategory } = require("../category-select"); const { useBaseUrl } = require("../../../lib/navigation/util"); const Loading = require("../../../components/loading"); const { Error } = require("../../../components/error"); const { TextInput } = require("../../../components/form/inputs"); +const { useListEmojiQuery } = require("../../../lib/query/admin/custom-emoji"); module.exports = function EmojiOverview({ }) { const { @@ -39,7 +39,7 @@ module.exports = function EmojiOverview({ }) { isLoading, isError, error - } = query.useListEmojiQuery({ filter: "domain:local" }); + } = useListEmojiQuery({ filter: "domain:local" }); let content = null; diff --git a/web/source/settings/admin/emoji/local/use-shortcode.js b/web/source/settings/admin/emoji/local/use-shortcode.js index 7e1bae0ad..67255860f 100644 --- a/web/source/settings/admin/emoji/local/use-shortcode.js +++ b/web/source/settings/admin/emoji/local/use-shortcode.js @@ -19,15 +19,15 @@ const React = require("react"); -const query = require("../../../lib/query"); const { useTextInput } = require("../../../lib/form"); +const { useListEmojiQuery } = require("../../../lib/query/admin/custom-emoji"); const shortcodeRegex = /^\w{2,30}$/; module.exports = function useShortcode() { - const { - data: emoji = [] - } = query.useListEmojiQuery({ filter: "domain:local" }); + const { data: emoji = [] } = useListEmojiQuery({ + filter: "domain:local" + }); const emojiCodes = React.useMemo(() => { return new Set(emoji.map((e) => e.shortcode)); |