From 89e0cfd8741b6763ca04e90558bccf4c3c380cfa Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:25:10 +0200 Subject: [feature] Admin accounts endpoints; approve/reject sign-ups (#2826) * update settings panels, add pending overview + approve/deny functions * add admin accounts get, approve, reject * send approved/rejected emails * use signup URL * docs! * email * swagger * web linting * fix email tests * wee lil fixerinos * use new paging logic for GetAccounts() series of admin endpoints, small changes to query building * shuffle useAccountIDIn check *before* adding to query * fix parse from toot react error * use `netip.Addr` * put valid slices in globals * optimistic updates for account state --------- Co-authored-by: kim --- web/source/settings/admin/emoji/local/detail.js | 36 ++-- web/source/settings/admin/emoji/local/index.js | 35 --- web/source/settings/admin/emoji/local/index.tsx | 35 +++ web/source/settings/admin/emoji/local/new-emoji.js | 112 ---------- .../settings/admin/emoji/local/new-emoji.tsx | 116 ++++++++++ web/source/settings/admin/emoji/local/overview.js | 2 +- web/source/settings/admin/emoji/remote/index.js | 54 ----- web/source/settings/admin/emoji/remote/index.tsx | 54 +++++ .../settings/admin/emoji/remote/parse-from-toot.js | 226 -------------------- .../admin/emoji/remote/parse-from-toot.tsx | 235 +++++++++++++++++++++ 10 files changed, 457 insertions(+), 448 deletions(-) delete mode 100644 web/source/settings/admin/emoji/local/index.js create mode 100644 web/source/settings/admin/emoji/local/index.tsx delete mode 100644 web/source/settings/admin/emoji/local/new-emoji.js create mode 100644 web/source/settings/admin/emoji/local/new-emoji.tsx delete mode 100644 web/source/settings/admin/emoji/remote/index.js create mode 100644 web/source/settings/admin/emoji/remote/index.tsx delete mode 100644 web/source/settings/admin/emoji/remote/parse-from-toot.js create mode 100644 web/source/settings/admin/emoji/remote/parse-from-toot.tsx (limited to 'web/source/settings/admin/emoji') diff --git a/web/source/settings/admin/emoji/local/detail.js b/web/source/settings/admin/emoji/local/detail.js index 18a681b6e..a78e3e499 100644 --- a/web/source/settings/admin/emoji/local/detail.js +++ b/web/source/settings/admin/emoji/local/detail.js @@ -17,29 +17,25 @@ along with this program. If not, see . */ -const React = require("react"); -const { useRoute, Link, Redirect } = require("wouter"); +import React, { useEffect } from "react"; +import { useRoute, Link, Redirect } from "wouter"; -const { useComboBoxInput, useFileInput, useValue } = require("../../../lib/form"); -const { CategorySelect } = require("../category-select"); +import { useComboBoxInput, useFileInput, useValue } from "../../../lib/form"; +import { CategorySelect } from "../category-select"; -const useFormSubmit = require("../../../lib/form/submit").default; -const { useBaseUrl } = require("../../../lib/navigation/util"); +import useFormSubmit from "../../../lib/form/submit"; +import { useBaseUrl } from "../../../lib/navigation/util"; -const FakeToot = require("../../../components/fake-toot"); -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"); +import FakeToot from "../../../components/fake-toot"; +import FormWithData from "../../../lib/form/form-with-data"; +import Loading from "../../../components/loading"; +import { FileInput } from "../../../components/form/inputs"; +import MutationButton from "../../../components/form/mutation-button"; +import { Error } from "../../../components/error"; -const { - useGetEmojiQuery, - useEditEmojiMutation, - useDeleteEmojiMutation, -} = require("../../../lib/query/admin/custom-emoji"); +import { useGetEmojiQuery, useEditEmojiMutation, useDeleteEmojiMutation } from "../../../lib/query/admin/custom-emoji"; -module.exports = function EmojiDetailRoute({ }) { +export default function EmojiDetailRoute({ }) { const baseUrl = useBaseUrl(); let [_match, params] = useRoute(`${baseUrl}/:emojiId`); if (params?.emojiId == undefined) { @@ -52,7 +48,7 @@ module.exports = function EmojiDetailRoute({ }) { ); } -}; +} function EmojiDetailForm({ data: emoji }) { const baseUrl = useBaseUrl(); @@ -68,7 +64,7 @@ function EmojiDetailForm({ data: emoji }) { const [modifyEmoji, result] = useFormSubmit(form, useEditEmojiMutation()); // Automatic submitting of category change - React.useEffect(() => { + useEffect(() => { if ( form.category.hasChanged() && !form.category.state.open && diff --git a/web/source/settings/admin/emoji/local/index.js b/web/source/settings/admin/emoji/local/index.js deleted file mode 100644 index 008bd7a61..000000000 --- a/web/source/settings/admin/emoji/local/index.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - GoToSocial - Copyright (C) GoToSocial Authors admin@gotosocial.org - SPDX-License-Identifier: AGPL-3.0-or-later - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -const React = require("react"); -const { Switch, Route } = require("wouter"); - -const EmojiOverview = require("./overview"); -const EmojiDetail = require("./detail"); - -module.exports = function CustomEmoji({ baseUrl }) { - return ( - - - - - - - ); -}; diff --git a/web/source/settings/admin/emoji/local/index.tsx b/web/source/settings/admin/emoji/local/index.tsx new file mode 100644 index 000000000..74a891f3e --- /dev/null +++ b/web/source/settings/admin/emoji/local/index.tsx @@ -0,0 +1,35 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import React from "react"; +import { Switch, Route } from "wouter"; + +import EmojiOverview from "./overview"; +import EmojiDetail from "./detail"; + +export default function CustomEmoji({ baseUrl }) { + return ( + + + + + + + ); +} diff --git a/web/source/settings/admin/emoji/local/new-emoji.js b/web/source/settings/admin/emoji/local/new-emoji.js deleted file mode 100644 index 6c0d0f2f4..000000000 --- a/web/source/settings/admin/emoji/local/new-emoji.js +++ /dev/null @@ -1,112 +0,0 @@ -/* - GoToSocial - Copyright (C) GoToSocial Authors admin@gotosocial.org - SPDX-License-Identifier: AGPL-3.0-or-later - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -const React = require("react"); - -const { - useFileInput, - useComboBoxInput -} = require("../../../lib/form"); -const useShortcode = require("./use-shortcode"); - -const useFormSubmit = require("../../../lib/form/submit").default; - -const { - TextInput, FileInput -} = require("../../../components/form/inputs"); - -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 } = useInstanceV1Query(); - const emojiMaxSize = React.useMemo(() => { - return instance?.configuration?.emojis?.emoji_size_limit ?? 50 * 1024; - }, [instance]); - - const image = useFileInput("image", { - withPreview: true, - maxSize: emojiMaxSize - }); - - const category = useComboBoxInput("category"); - - const [submitForm, result] = useFormSubmit({ - shortcode, image, category - }, useAddEmojiMutation()); - - React.useEffect(() => { - if (shortcode.value.length == 0) { - if (image.value != undefined) { - let [name, _ext] = image.value.name.split("."); - shortcode.setter(name); - } - } - - /* We explicitly don't want to have 'shortcode' as a dependency here - because we only want to change the shortcode to the filename if the field is empty - at the moment the file is selected, not some time after when the field is emptied - */ - /* eslint-disable-next-line react-hooks/exhaustive-deps */ - }, [image.value]); - - let emojiOrShortcode = `:${shortcode.value}:`; - - if (image.previewValue != undefined) { - emojiOrShortcode = {shortcode.value}; - } - - return ( -
-

Add new custom emoji

- - - Look at this new custom emoji {emojiOrShortcode} isn't it cool? - - -
- - - - - - - - -
- ); -}; \ No newline at end of file diff --git a/web/source/settings/admin/emoji/local/new-emoji.tsx b/web/source/settings/admin/emoji/local/new-emoji.tsx new file mode 100644 index 000000000..c6a203765 --- /dev/null +++ b/web/source/settings/admin/emoji/local/new-emoji.tsx @@ -0,0 +1,116 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import React, { useMemo, useEffect } from "react"; + +import { useFileInput, useComboBoxInput } from "../../../lib/form"; +import useShortcode from "./use-shortcode"; + +import useFormSubmit from "../../../lib/form/submit"; + +import { TextInput, FileInput } from "../../../components/form/inputs"; + +import { CategorySelect } from '../category-select'; +import FakeToot from "../../../components/fake-toot"; +import MutationButton from "../../../components/form/mutation-button"; +import { useAddEmojiMutation } from "../../../lib/query/admin/custom-emoji"; +import { useInstanceV1Query } from "../../../lib/query"; + +export default function NewEmojiForm() { + const shortcode = useShortcode(); + + const { data: instance } = useInstanceV1Query(); + const emojiMaxSize = useMemo(() => { + return instance?.configuration?.emojis?.emoji_size_limit ?? 50 * 1024; + }, [instance]); + + const image = useFileInput("image", { + withPreview: true, + maxSize: emojiMaxSize + }); + + const category = useComboBoxInput("category"); + + const [submitForm, result] = useFormSubmit({ + shortcode, image, category + }, useAddEmojiMutation()); + + useEffect(() => { + if (shortcode.value === undefined || shortcode.value.length == 0) { + if (image.value != undefined) { + let [name, _ext] = image.value.name.split("."); + shortcode.setter(name); + } + } + + /* We explicitly don't want to have 'shortcode' as a dependency here + because we only want to change the shortcode to the filename if the field is empty + at the moment the file is selected, not some time after when the field is emptied + */ + /* eslint-disable-next-line react-hooks/exhaustive-deps */ + }, [image.value]); + + let emojiOrShortcode; + + if (image.previewValue != undefined) { + emojiOrShortcode = {shortcode.value}; + } else if (shortcode.value !== undefined && shortcode.value.length > 0) { + emojiOrShortcode = `:${shortcode.value}:`; + } else { + emojiOrShortcode = `:your_emoji_here:`; + } + + return ( +
+

Add new custom emoji

+ + + Look at this new custom emoji {emojiOrShortcode} isn't it cool? + + +
+ + + + + + + + +
+ ); +} \ No newline at end of file diff --git a/web/source/settings/admin/emoji/local/overview.js b/web/source/settings/admin/emoji/local/overview.js index 44b11f584..45bfd614d 100644 --- a/web/source/settings/admin/emoji/local/overview.js +++ b/web/source/settings/admin/emoji/local/overview.js @@ -22,7 +22,7 @@ const { Link } = require("wouter"); const syncpipe = require("syncpipe"); const { matchSorter } = require("match-sorter"); -const NewEmojiForm = require("./new-emoji"); +const NewEmojiForm = require("./new-emoji").default; const { useTextInput } = require("../../../lib/form"); const { useEmojiByCategory } = require("../category-select"); diff --git a/web/source/settings/admin/emoji/remote/index.js b/web/source/settings/admin/emoji/remote/index.js deleted file mode 100644 index 1a8c719dd..000000000 --- a/web/source/settings/admin/emoji/remote/index.js +++ /dev/null @@ -1,54 +0,0 @@ -/* - GoToSocial - Copyright (C) GoToSocial Authors admin@gotosocial.org - SPDX-License-Identifier: AGPL-3.0-or-later - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -const React = require("react"); - -const ParseFromToot = require("./parse-from-toot"); - -const Loading = require("../../../components/loading"); -const { Error } = require("../../../components/error"); -const { useListEmojiQuery } = require("../../../lib/query/admin/custom-emoji"); - -module.exports = function RemoteEmoji() { - // local emoji are queried for shortcode collision detection - const { - data: emoji = [], - isLoading, - error - } = useListEmojiQuery({ filter: "domain:local" }); - - const emojiCodes = React.useMemo(() => { - return new Set(emoji.map((e) => e.shortcode)); - }, [emoji]); - - return ( - <> -

Custom Emoji (remote)

- {error && - - } - {isLoading - ? - : <> - - - } - - ); -}; \ No newline at end of file diff --git a/web/source/settings/admin/emoji/remote/index.tsx b/web/source/settings/admin/emoji/remote/index.tsx new file mode 100644 index 000000000..d9c786be2 --- /dev/null +++ b/web/source/settings/admin/emoji/remote/index.tsx @@ -0,0 +1,54 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import React, { useMemo } from "react"; + +import ParseFromToot from "./parse-from-toot"; + +import Loading from "../../../components/loading"; +import { Error } from "../../../components/error"; +import { useListEmojiQuery } from "../../../lib/query/admin/custom-emoji"; + +export default function RemoteEmoji() { + // local emoji are queried for shortcode collision detection + const { + data: emoji = [], + isLoading, + error + } = useListEmojiQuery({ filter: "domain:local" }); + + const emojiCodes = useMemo(() => { + return new Set(emoji.map((e) => e.shortcode)); + }, [emoji]); + + return ( + <> +

Custom Emoji (remote)

+ {error && + + } + {isLoading + ? + : <> + + + } + + ); +} diff --git a/web/source/settings/admin/emoji/remote/parse-from-toot.js b/web/source/settings/admin/emoji/remote/parse-from-toot.js deleted file mode 100644 index 7c29cccfd..000000000 --- a/web/source/settings/admin/emoji/remote/parse-from-toot.js +++ /dev/null @@ -1,226 +0,0 @@ -/* - GoToSocial - Copyright (C) GoToSocial Authors admin@gotosocial.org - SPDX-License-Identifier: AGPL-3.0-or-later - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -const React = require("react"); - -const { - useTextInput, - useComboBoxInput, - useCheckListInput -} = require("../../../lib/form"); - -const useFormSubmit = require("../../../lib/form/submit").default; - -const CheckList = require("../../../components/check-list").default; -const { CategorySelect } = require('../category-select'); - -const { TextInput } = require("../../../components/form/inputs"); -const MutationButton = require("../../../components/form/mutation-button"); -const { Error } = require("../../../components/error"); -const { - useSearchItemForEmojiMutation, - usePatchRemoteEmojisMutation -} = require("../../../lib/query/admin/custom-emoji"); - -module.exports = function ParseFromToot({ emojiCodes }) { - const [searchStatus, result] = useSearchItemForEmojiMutation(); - - const [onURLChange, _resetURL, { url }] = useTextInput("url"); - - function submitSearch(e) { - e.preventDefault(); - if (url.trim().length != 0) { - searchStatus(url); - } - } - - return ( -
-

Steal this look

-
-
- -
- -