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 <grufwub@gmail.com>
---
 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 +++++++++++++++++++++
 4 files changed, 289 insertions(+), 280 deletions(-)
 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/remote')

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 <http://www.gnu.org/licenses/>.
-*/
-
-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 (
-		<>
-			<h1>Custom Emoji (remote)</h1>
-			{error &&
-				<Error error={error} />
-			}
-			{isLoading
-				? <Loading />
-				: <>
-					<ParseFromToot emoji={emoji} emojiCodes={emojiCodes} />
-				</>
-			}
-		</>
-	);
-};
\ 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 <http://www.gnu.org/licenses/>.
+*/
+
+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 (
+		<>
+			<h1>Custom Emoji (remote)</h1>
+			{error &&
+				<Error error={error} />
+			}
+			{isLoading
+				? <Loading />
+				: <>
+					<ParseFromToot emojiCodes={emojiCodes} />
+				</>
+			}
+		</>
+	);
+}
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 <http://www.gnu.org/licenses/>.
-*/
-
-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 (
-		<div className="parse-emoji">
-			<h2>Steal this look</h2>
-			<form onSubmit={submitSearch}>
-				<div className="form-field text">
-					<label htmlFor="url">
-						Link to a toot:
-					</label>
-					<div className="row">
-						<input
-							type="text"
-							id="url"
-							name="url"
-							onChange={onURLChange}
-							value={url}
-						/>
-						<button disabled={result.isLoading}>
-							<i className={[
-								"fa fa-fw",
-								(result.isLoading
-									? "fa-refresh fa-spin"
-									: "fa-search")
-							].join(" ")} aria-hidden="true" title="Search" />
-							<span className="sr-only">Search</span>
-						</button>
-					</div>
-				</div>
-			</form>
-			<SearchResult result={result} localEmojiCodes={emojiCodes} />
-		</div>
-	);
-};
-
-function SearchResult({ result, localEmojiCodes }) {
-	const { error, data, isSuccess, isError } = result;
-
-	if (!(isSuccess || isError)) {
-		return null;
-	}
-
-	if (error == "NONE_FOUND") {
-		return "No results found";
-	} else if (error == "LOCAL_INSTANCE") {
-		return <b>This is a local user/toot, all referenced emoji are already on your instance</b>;
-	} else if (error != undefined) {
-		return <Error error={result.error} />;
-	}
-
-	if (data.list.length == 0) {
-		return <b>This {data.type == "statuses" ? "toot" : "account"} doesn't use any custom emoji</b>;
-	}
-
-	return (
-		<CopyEmojiForm
-			localEmojiCodes={localEmojiCodes}
-			type={data.type}
-			domain={data.domain}
-			emojiList={data.list}
-		/>
-	);
-}
-
-function CopyEmojiForm({ localEmojiCodes, type, emojiList }) {
-	const form = {
-		selectedEmoji: useCheckListInput("selectedEmoji", {
-			entries: emojiList,
-			uniqueKey: "id"
-		}),
-		category: useComboBoxInput("category")
-	};
-
-	const [formSubmit, result] = useFormSubmit(
-		form,
-		usePatchRemoteEmojisMutation(),
-		{
-			changedOnly: false,
-			onFinish: ({ data }) => {
-				if (data) {
-					// uncheck all successfully processed emoji
-					const processed = data.map((emoji) => {
-						return [emoji.id, { checked: false }];
-					});
-					form.selectedEmoji.updateMultiple(processed);
-				}
-			}
-		}
-	);
-
-	const buttonsInactive = form.selectedEmoji.someSelected
-		? {}
-		: {
-			disabled: true,
-			title: "No emoji selected, cannot perform any actions"
-		};
-
-	const checkListExtraProps = React.useCallback(() => ({ localEmojiCodes }), [localEmojiCodes]);
-
-	return (
-		<div className="parsed">
-			<span>This {type == "statuses" ? "toot" : "account"} uses the following custom emoji, select the ones you want to copy/disable:</span>
-			<form onSubmit={formSubmit}>
-				<CheckList
-					field={form.selectedEmoji}
-					EntryComponent={EmojiEntry}
-					getExtraProps={checkListExtraProps}
-				/>
-
-				<CategorySelect
-					field={form.category}
-				/>
-
-				<div className="action-buttons row">
-					<MutationButton name="copy" label="Copy to local emoji" result={result} showError={false} {...buttonsInactive} />
-					<MutationButton name="disable" label="Disable" result={result} className="button danger" showError={false} {...buttonsInactive} />
-				</div>
-				{result.error && (
-					Array.isArray(result.error)
-						? <ErrorList errors={result.error} />
-						: <Error error={result.error} />
-				)}
-			</form>
-		</div>
-	);
-}
-
-function ErrorList({ errors }) {
-	return (
-		<div className="error">
-			One or multiple emoji failed to process:
-			{errors.map(([shortcode, err]) => (
-				<div key={shortcode}>
-					<b>{shortcode}:</b> {err}
-				</div>
-			))}
-		</div>
-	);
-}
-
-function EmojiEntry({ entry: emoji, onChange, extraProps: { localEmojiCodes } }) {
-	const shortcodeField = useTextInput("shortcode", {
-		defaultValue: emoji.shortcode,
-		validator: function validateShortcode(code) {
-			return (emoji.checked && localEmojiCodes.has(code))
-				? "Shortcode already in use"
-				: "";
-		}
-	});
-
-	React.useEffect(() => {
-		if (emoji.valid != shortcodeField.valid) {
-			onChange({ valid: shortcodeField.valid });
-		}
-	}, [onChange, emoji.valid, shortcodeField.valid]);
-
-	React.useEffect(() => {
-		shortcodeField.validate();
-		// only need this update if it's the emoji.checked that updated, not shortcodeField
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [emoji.checked]);
-
-	return (
-		<>
-			<img className="emoji" src={emoji.url} title={emoji.shortcode} />
-
-			<TextInput
-				field={shortcodeField}
-				onChange={(e) => {
-					shortcodeField.onChange(e);
-					onChange({ shortcode: e.target.value, checked: true });
-				}}
-			/>
-		</>
-	);
-}
\ No newline at end of file
diff --git a/web/source/settings/admin/emoji/remote/parse-from-toot.tsx b/web/source/settings/admin/emoji/remote/parse-from-toot.tsx
new file mode 100644
index 000000000..df1c221ba
--- /dev/null
+++ b/web/source/settings/admin/emoji/remote/parse-from-toot.tsx
@@ -0,0 +1,235 @@
+/*
+	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 <http://www.gnu.org/licenses/>.
+*/
+
+import React, { useCallback, useEffect } from "react";
+
+import { useTextInput, useComboBoxInput, useCheckListInput } from "../../../lib/form";
+
+import useFormSubmit from "../../../lib/form/submit";
+
+import CheckList from "../../../components/check-list";
+import { CategorySelect } from '../category-select';
+
+import { TextInput } from "../../../components/form/inputs";
+import MutationButton from "../../../components/form/mutation-button";
+import { Error } from "../../../components/error";
+import { useSearchItemForEmojiMutation, usePatchRemoteEmojisMutation } from "../../../lib/query/admin/custom-emoji";
+
+export default function ParseFromToot({ emojiCodes }) {
+	const [searchStatus, result] = useSearchItemForEmojiMutation();
+	const urlField = useTextInput("url");
+
+	function submitSearch(e) {
+		e.preventDefault();
+		if (urlField.value !== undefined && urlField.value.trim().length != 0) {
+			searchStatus(urlField.value);
+		}
+	}
+
+	return (
+		<div className="parse-emoji">
+			<h2>Steal this look</h2>
+			<form onSubmit={submitSearch}>
+				<div className="form-field text">
+					<label htmlFor="url">
+						Link to a toot:
+					</label>
+					<div className="row">
+						<input
+							type="text"
+							id="url"
+							name="url"
+							onChange={urlField.onChange}
+							value={urlField.value}
+						/>
+						<button disabled={result.isLoading}>
+							<i className={[
+								"fa fa-fw",
+								(result.isLoading
+									? "fa-refresh fa-spin"
+									: "fa-search")
+							].join(" ")} aria-hidden="true" title="Search" />
+							<span className="sr-only">Search</span>
+						</button>
+					</div>
+				</div>
+			</form>
+			<SearchResult result={result} localEmojiCodes={emojiCodes} />
+		</div>
+	);
+}
+
+function SearchResult({ result, localEmojiCodes }) {
+	const { error, data, isSuccess, isError } = result;
+
+	if (!(isSuccess || isError)) {
+		return null;
+	}
+
+	if (error == "NONE_FOUND") {
+		return "No results found";
+	} else if (error == "LOCAL_INSTANCE") {
+		return <b>This is a local user/toot, all referenced emoji are already on your instance</b>;
+	} else if (error != undefined) {
+		return <Error error={result.error} />;
+	}
+
+	if (data.list.length == 0) {
+		return <b>This {data.type == "statuses" ? "toot" : "account"} doesn't use any custom emoji</b>;
+	}
+
+	return (
+		<CopyEmojiForm
+			localEmojiCodes={localEmojiCodes}
+			type={data.type}
+			emojiList={data.list}
+		/>
+	);
+}
+
+function CopyEmojiForm({ localEmojiCodes, type, emojiList }) {
+	const form = {
+		selectedEmoji: useCheckListInput("selectedEmoji", {
+			entries: emojiList,
+			uniqueKey: "id"
+		}),
+		category: useComboBoxInput("category")
+	};
+
+	const [formSubmit, result] = useFormSubmit(
+		form,
+		usePatchRemoteEmojisMutation(),
+		{
+			changedOnly: false,
+			onFinish: ({ data }) => {
+				if (data) {
+					// uncheck all successfully processed emoji
+					const processed = data.map((emoji) => {
+						return [emoji.id, { checked: false }];
+					});
+					form.selectedEmoji.updateMultiple(processed);
+				}
+			}
+		}
+	);
+
+	const buttonsInactive = form.selectedEmoji.someSelected
+		? {
+			disabled: false,
+			title: ""
+		}
+		: {
+			disabled: true,
+			title: "No emoji selected, cannot perform any actions"
+		};
+
+	const checkListExtraProps = useCallback(() => ({ localEmojiCodes }), [localEmojiCodes]);
+
+	return (
+		<div className="parsed">
+			<span>This {type == "statuses" ? "toot" : "account"} uses the following custom emoji, select the ones you want to copy/disable:</span>
+			<form onSubmit={formSubmit}>
+				<CheckList
+					field={form.selectedEmoji}
+					header={<></>}
+					EntryComponent={EmojiEntry}
+					getExtraProps={checkListExtraProps}
+				/>
+
+				<CategorySelect
+					field={form.category}
+					children={[]}
+				/>
+
+				<div className="action-buttons row">
+					<MutationButton
+						name="copy"
+						label="Copy to local emoji"
+						result={result}
+						showError={false}
+						{...buttonsInactive}
+					/>
+					<MutationButton
+						name="disable"
+						label="Disable"
+						result={result}
+						className="button danger"
+						showError={false}
+						{...buttonsInactive}
+					/>
+				</div>
+				{result.error && (
+					Array.isArray(result.error)
+						? <ErrorList errors={result.error} />
+						: <Error error={result.error} />
+				)}
+			</form>
+		</div>
+	);
+}
+
+function ErrorList({ errors }) {
+	return (
+		<div className="error">
+			One or multiple emoji failed to process:
+			{errors.map(([shortcode, err]) => (
+				<div key={shortcode}>
+					<b>{shortcode}:</b> {err}
+				</div>
+			))}
+		</div>
+	);
+}
+
+function EmojiEntry({ entry: emoji, onChange, extraProps: { localEmojiCodes } }) {
+	const shortcodeField = useTextInput("shortcode", {
+		defaultValue: emoji.shortcode,
+		validator: function validateShortcode(code) {
+			return (emoji.checked && localEmojiCodes.has(code))
+				? "Shortcode already in use"
+				: "";
+		}
+	});
+
+	useEffect(() => {
+		if (emoji.valid != shortcodeField.valid) {
+			onChange({ valid: shortcodeField.valid });
+		}
+	}, [onChange, emoji.valid, shortcodeField.valid]);
+
+	useEffect(() => {
+		shortcodeField.validate();
+		// only need this update if it's the emoji.checked that updated, not shortcodeField
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [emoji.checked]);
+
+	return (
+		<>
+			<img className="emoji" src={emoji.url} title={emoji.shortcode} />
+
+			<TextInput
+				field={shortcodeField}
+				onChange={(e) => {
+					shortcodeField.onChange(e);
+					onChange({ shortcode: e.target.value, checked: true });
+				}}
+			/>
+		</>
+	);
+}
\ No newline at end of file
-- 
cgit v1.3