5 files changed, 205 insertions, 236 deletions

diff --git a/web/source/settings/admin/emoji/local/detail.js b/web/source/settings/admin/emoji/local/detail.js
index cc3ce6a70..cecd36869 100644
--- a/web/source/settings/admin/emoji/local/detail.js
+++ b/web/source/settings/admin/emoji/local/detail.js
@@ -19,155 +19,128 @@
 "use strict";
 
 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 { useComboBoxInput, useFileInput } = require("../../../components/form");
 
-const query = require("../../../lib/query");
+const useFormSubmit = require("../../../lib/form/submit");
+
 const FakeToot = require("../../../components/fake-toot");
+const FormWithData = require("../../../lib/form/form-with-data");
 const Loading = require("../../../components/loading");
+const { FileInput } = require("../../../components/form/inputs");
+const MutationButton = require("../../../components/form/mutation-button");
+const { Error } = require("../../../components/error");
 
 const base = "/settings/custom-emoji/local";
 
 module.exports = function EmojiDetailRoute() {
 	let [_match, params] = useRoute(`${base}/:emojiId`);
 	if (params?.emojiId == undefined) {
-		return <Redirect to={base}/>;
+		return <Redirect to={base} />;
 	} else {
 		return (
 			<div className="emoji-detail">
 				<Link to={base}><a>&lt; go back</a></Link>
-				<EmojiDetailData emojiId={params.emojiId}/>
+				<FormWithData dataQuery={query.useGetEmojiQuery} queryArg={params.emojiId} DataForm={EmojiDetailForm} />
 			</div>
 		);
 	}
 };
 
-function EmojiDetailData({emojiId}) {
-	const {currentData: emoji, isLoading, error} = query.useGetEmojiQuery(emojiId);
-
-	if (error) {
-		return (
-			<div className="error accent">
-				{error.status}: {error.data.error}
-			</div>
-		);
-	} else if (isLoading) {
-		return (
-			<div>
-				<Loading/>
-			</div>
-		);
-	} else {
-		return <EmojiDetail emoji={emoji}/>;
-	}
-}
-
-function EmojiDetail({emoji}) {
-	const [modifyEmoji, modifyResult] = query.useEditEmojiMutation();
+function EmojiDetailForm({ data: emoji }) {
+	const form = {
+		id: useValue("id", emoji.id),
+		category: useComboBoxInput("category", { defaultValue: emoji.category }),
+		image: useFileInput("image", {
+			withPreview: true,
+			maxSize: 50 * 1024 // TODO: get from instance api
+		})
+	};
 
-	const [isNewCategory, setIsNewCategory] = React.useState(false);
+	const [modifyEmoji, result] = useFormSubmit(form, query.useEditEmojiMutation());
 
-	const [categoryState, _resetCategory, { category }] = useComboBoxInput("category", {defaultValue: emoji.category});
-
-	const [onFileChange, _resetFile, { image, imageURL, imageInfo }] = useFileInput("image", {
-		withPreview: true,
-		maxSize: 50 * 1024
-	});
+	// Automatic submitting of category change
+	React.useEffect(() => {
+		if (
+			form.category.hasChanged() &&
+			!form.category.state.open &&
+			!form.category.isNew) {
+			modifyEmoji();
+		}
+		/* eslint-disable-next-line react-hooks/exhaustive-deps */
+	}, [form.category.hasChanged(), form.category.isNew, form.category.state.open]);
 
-	function modifyCategory() {
-		modifyEmoji({id: emoji.id, category: category.trim()});
-	}
+	const [deleteEmoji, deleteResult] = query.useDeleteEmojiMutation();
 
-	function modifyImage() {
-		modifyEmoji({id: emoji.id, image: image});
+	if (deleteResult.isSuccess) {
+		return <Redirect to={base} />;
 	}
 
-	React.useEffect(() => {
-		if (category != emoji.category && !categoryState.open && !isNewCategory && category.trim().length > 0) {
-			console.log("updating to", category);
-			modifyEmoji({id: emoji.id, category: category.trim()});
-		}
-	}, [isNewCategory, category, categoryState.open, emoji.category, emoji.id, modifyEmoji]);
-
 	return (
 		<>
 			<div className="emoji-header">
-				<img src={emoji.url} alt={emoji.shortcode} title={emoji.shortcode}/>
+				<img src={emoji.url} alt={emoji.shortcode} title={emoji.shortcode} />
 				<div>
 					<h2>{emoji.shortcode}</h2>
-					<DeleteButton id={emoji.id}/>
+					<MutationButton
+						label="Delete"
+						type="button"
+						onClick={() => deleteEmoji(emoji.id)}
+						className="danger"
+						showError={false}
+						result={deleteResult}
+					/>
 				</div>
 			</div>
 
-			<div className="left-border">
-				<h2>Modify this emoji {modifyResult.isLoading && "(processing..)"}</h2>
-
-				{modifyResult.error && <div className="error">
-					{modifyResult.error.status}: {modifyResult.error.data.error}
-				</div>}
+			<form onSubmit={modifyEmoji} className="left-border">
+				<h2>Modify this emoji {result.isLoading && <Loading />}</h2>
 
 				<div className="update-category">
 					<CategorySelect
-						value={category}
-						categoryState={categoryState}
-						setIsNew={setIsNewCategory}
+						field={form.category}
 					>
-						<button style={{visibility: (isNewCategory ? "initial" : "hidden")}} onClick={modifyCategory}>
-							Create
-						</button>
+						<MutationButton
+							name="create-category"
+							label="Create"
+							result={result}
+							showError={false}
+							style={{ visibility: (form.category.isNew ? "initial" : "hidden") }}
+						/>
 					</CategorySelect>
 				</div>
 
 				<div className="update-image">
-					<b>Image</b>
-					<div className="form-field file">
-						<label className="file-input button" htmlFor="image">
-							Browse
-						</label>
-						{imageInfo}
-						<input
-							className="hidden"
-							type="file"
-							id="image"
-							name="Image"
-							accept="image/png,image/gif"
-							onChange={onFileChange}
-						/>
-					</div>
-
-					<button onClick={modifyImage} disabled={image == undefined}>Replace image</button>
+					<FileInput
+						field={form.image}
+						label="Image"
+						accept="image/png,image/gif"
+					/>
+
+					<MutationButton
+						name="image"
+						label="Replace image"
+						showError={false}
+						result={result}
+					/>
 
 					<FakeToot>
 						Look at this new custom emoji <img
 							className="emoji"
-							src={imageURL ?? emoji.url}
+							src={form.image.previewURL ?? emoji.url}
 							title={`:${emoji.shortcode}:`}
 							alt={emoji.shortcode}
 						/> isn&apos;t it cool?
 					</FakeToot>
+
+					{result.error && <Error error={result.error} />}
+					{deleteResult.error && <Error error={deleteResult.error} />}
 				</div>
-			</div>
+			</form>
 		</>
 	);
-}
-
-function DeleteButton({id}) {
-	// TODO: confirmation dialog?
-	const [deleteEmoji, deleteResult] = query.useDeleteEmojiMutation();
-
-	let text = "Delete";
-	if (deleteResult.isLoading) {
-		text = "Deleting...";
-	}
-
-	if (deleteResult.isSuccess) {
-		return <Redirect to={base}/>;
-	}
-
-	return (
-		<button className="danger" onClick={() => deleteEmoji(id)} disabled={deleteResult.isLoading}>{text}</button>
-	);
 }
\ No newline at end of file
diff --git a/web/source/settings/admin/emoji/local/index.js b/web/source/settings/admin/emoji/local/index.js
index 4160fe41d..68cbbc47f 100644
--- a/web/source/settings/admin/emoji/local/index.js
+++ b/web/source/settings/admin/emoji/local/index.js
@@ -19,7 +19,7 @@
 "use strict";
 
 const React = require("react");
-const {Switch, Route} = require("wouter");
+const { Switch, Route } = require("wouter");
 
 const EmojiOverview = require("./overview");
 const EmojiDetail = require("./detail");
@@ -28,13 +28,11 @@ const base = "/settings/custom-emoji/local";
 
 module.exports = function CustomEmoji() {
 	return (
-		<>
-			<Switch>
-				<Route path={`${base}/:emojiId`}>
-					<EmojiDetail />
-				</Route>
-				<EmojiOverview />
-			</Switch>
-		</>
+		<Switch>
+			<Route path={`${base}/:emojiId`}>
+				<EmojiDetail baseUrl={base} />
+			</Route>
+			<EmojiOverview baseUrl={base} />
+		</Switch>
 	);
 };
diff --git a/web/source/settings/admin/emoji/local/new-emoji.js b/web/source/settings/admin/emoji/local/new-emoji.js
index 6701dbf5a..cf1b5f774 100644
--- a/web/source/settings/admin/emoji/local/new-emoji.js
+++ b/web/source/settings/admin/emoji/local/new-emoji.js
@@ -18,101 +18,61 @@
 
 "use strict";
 
-const Promise = require('bluebird');
 const React = require("react");
 
-const FakeToot = require("../../../components/fake-toot");
-const MutateButton = require("../../../components/mutation-button");
+const query = require("../../../lib/query");
 
 const {
-	useTextInput,
 	useFileInput,
 	useComboBoxInput
-} = require("../../../components/form");
+} = require("../../../lib/form");
+const useShortcode = require("./use-shortcode");
 
-const query = require("../../../lib/query");
-const { CategorySelect } = require('../category-select');
+const useFormSubmit = require("../../../lib/form/submit");
 
-const shortcodeRegex = /^[a-z0-9_]+$/;
+const {
+	TextInput, FileInput
+} = require("../../../components/form/inputs");
 
-module.exports = function NewEmojiForm({ emoji }) {
-	const emojiCodes = React.useMemo(() => {
-		return new Set(emoji.map((e) => e.shortcode));
-	}, [emoji]);
+const { CategorySelect } = require('../category-select');
+const FakeToot = require("../../../components/fake-toot");
+const MutationButton = require("../../../components/form/mutation-button");
 
-	const [addEmoji, result] = query.useAddEmojiMutation();
+module.exports = function NewEmojiForm() {
+	const shortcode = useShortcode();
 
-	const [onFileChange, resetFile, { image, imageURL, imageInfo }] = useFileInput("image", {
+	const image = useFileInput("image", {
 		withPreview: true,
-		maxSize: 50 * 1024
+		maxSize: 50 * 1024 // TODO: get from instance api?
 	});
 
-	const [onShortcodeChange, resetShortcode, { shortcode, setShortcode, shortcodeRef }] = useTextInput("shortcode", {
-		validator: function validateShortcode(code) {
-			// technically invalid, but hacky fix to prevent validation error on page load
-			if (shortcode == "") {return "";}
-
-			if (emojiCodes.has(code)) {
-				return "Shortcode already in use";
-			}
-
-			if (code.length < 2 || code.length > 30) {
-				return "Shortcode must be between 2 and 30 characters";
-			}
+	const category = useComboBoxInput("category");
 
-			if (code.toLowerCase() != code) {
-				return "Shortcode must be lowercase";
-			}
-
-			if (!shortcodeRegex.test(code)) {
-				return "Shortcode must only contain lowercase letters, numbers, and underscores";
-			}
-
-			return "";
-		}
-	});
-
-	const [categoryState, resetCategory, { category }] = useComboBoxInput("category");
+	const [submitForm, result] = useFormSubmit({
+		shortcode, image, category
+	}, query.useAddEmojiMutation());
 
 	React.useEffect(() => {
-		if (shortcode.length == 0) {
-			if (image != undefined) {
-				let [name, _ext] = image.name.split(".");
-				setShortcode(name);
+		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 add 'shortcode' as a dependency here
-		// because we only want this to update 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]);
-
-	function uploadEmoji(e) {
-		if (e) {
-			e.preventDefault();
-		}
 
-		Promise.try(() => {
-			return addEmoji({
-				image,
-				shortcode,
-				category
-			}).unwrap();
-		}).then(() => {
-			resetFile();
-			resetShortcode();
-			resetCategory();
-		}).catch((e) => {
-			console.error("Emoji upload error:", e);
-		});
-	}
+		/* 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}:`;
+	let emojiOrShortcode = `:${shortcode.value}:`;
 
-	if (imageURL != undefined) {
+	if (image.previewValue != undefined) {
 		emojiOrShortcode = <img
 			className="emoji"
-			src={imageURL}
+			src={image.previewValue}
 			title={`:${shortcode}:`}
 			alt={shortcode}
 		/>;
@@ -126,42 +86,22 @@ module.exports = function NewEmojiForm({ emoji }) {
 				Look at this new custom emoji {emojiOrShortcode} isn&apos;t it cool?
 			</FakeToot>
 
-			<form onSubmit={uploadEmoji} className="form-flex">
-				<div className="form-field file">
-					<label className="file-input button" htmlFor="image">
-						Browse
-					</label>
-					{imageInfo}
-					<input
-						className="hidden"
-						type="file"
-						id="image"
-						name="Image"
-						accept="image/png,image/gif"
-						onChange={onFileChange}
-					/>
-				</div>
-
-				<div className="form-field text">
-					<label htmlFor="shortcode">
-						Shortcode, must be unique among the instance's local emoji
-					</label>
-					<input
-						type="text"
-						id="shortcode"
-						name="Shortcode"
-						ref={shortcodeRef}
-						onChange={onShortcodeChange}
-						value={shortcode}
-					/>
-				</div>
+			<form onSubmit={submitForm} className="form-flex">
+				<FileInput
+					field={image}
+					accept="image/png,image/gif"
+				/>
+
+				<TextInput
+					field={shortcode}
+					label="Shortcode, must be unique among the instance's local emoji"
+				/>
 
 				<CategorySelect
-					value={category}
-					categoryState={categoryState}
+					field={category}
 				/>
 
-				<MutateButton text="Upload emoji" result={result} />
+				<MutationButton label="Upload emoji" result={result} />
 			</form>
 		</div>
 	);
diff --git a/web/source/settings/admin/emoji/local/overview.js b/web/source/settings/admin/emoji/local/overview.js
index ebfb89695..524cc928f 100644
--- a/web/source/settings/admin/emoji/local/overview.js
+++ b/web/source/settings/admin/emoji/local/overview.js
@@ -1,25 +1,25 @@
 /*
-	 GoToSocial
-	 Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+	GoToSocial
+	Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
 
-	 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 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.
+	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/>.
+	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/>.
 */
 
 "use strict";
 
 const React = require("react");
-const {Link} = require("wouter");
+const { Link } = require("wouter");
 
 const NewEmojiForm = require("./new-emoji");
 
@@ -27,33 +27,31 @@ const query = require("../../../lib/query");
 const { useEmojiByCategory } = require("../category-select");
 const Loading = require("../../../components/loading");
 
-const base = "/settings/custom-emoji/local";
-
-module.exports = function EmojiOverview() {
+module.exports = function EmojiOverview({ baseUrl }) {
 	const {
 		data: emoji = [],
 		isLoading,
 		error
-	} = query.useGetAllEmojiQuery({filter: "domain:local"});
+	} = query.useGetAllEmojiQuery({ filter: "domain:local" });
 
 	return (
 		<>
 			<h1>Custom Emoji (local)</h1>
-			{error && 
+			{error &&
 				<div className="error accent">{error}</div>
 			}
 			{isLoading
-				? <Loading/>
+				? <Loading />
 				: <>
-					<EmojiList emoji={emoji}/>
-					<NewEmojiForm emoji={emoji}/>
+					<EmojiList emoji={emoji} baseUrl={baseUrl} />
+					<NewEmojiForm emoji={emoji} />
 				</>
 			}
 		</>
 	);
 };
 
-function EmojiList({emoji}) {
+function EmojiList({ emoji, baseUrl }) {
 	const emojiByCategory = useEmojiByCategory(emoji);
 
 	return (
@@ -62,24 +60,23 @@ function EmojiList({emoji}) {
 			<div className="list emoji-list">
 				{emoji.length == 0 && "No local emoji yet, add one below"}
 				{Object.entries(emojiByCategory).map(([category, entries]) => {
-					return <EmojiCategory key={category} category={category} entries={entries}/>;
+					return <EmojiCategory key={category} category={category} entries={entries} baseUrl={baseUrl} />;
 				})}
 			</div>
 		</div>
 	);
 }
 
-function EmojiCategory({category, entries}) {
+function EmojiCategory({ category, entries, baseUrl }) {
 	return (
 		<div className="entry">
 			<b>{category}</b>
 			<div className="emoji-group">
 				{entries.map((e) => {
 					return (
-						<Link key={e.id} to={`${base}/${e.id}`}>
-							{/* <Link key={e.static_url} to={`${base}`}> */}
+						<Link key={e.id} to={`${baseUrl}/${e.id}`}>
 							<a>
-								<img src={e.url} alt={e.shortcode} title={`:${e.shortcode}:`}/>
+								<img src={e.url} alt={e.shortcode} title={`:${e.shortcode}:`} />
 							</a>
 						</Link>
 					);
diff --git a/web/source/settings/admin/emoji/local/use-shortcode.js b/web/source/settings/admin/emoji/local/use-shortcode.js
new file mode 100644
index 000000000..109914b8b
--- /dev/null
+++ b/web/source/settings/admin/emoji/local/use-shortcode.js
@@ -0,0 +1,61 @@
+/*
+	GoToSocial
+	Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+	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/>.
+*/
+
+"use strict";
+
+const React = require("react");
+
+const query = require("../../../lib/query");
+const { useTextInput } = require("../../../lib/form");
+
+const shortcodeRegex = /^[a-z0-9_]+$/;
+
+module.exports = function useShortcode() {
+	const {
+		data: emoji = []
+	} = query.useGetAllEmojiQuery({ filter: "domain:local" });
+
+	const emojiCodes = React.useMemo(() => {
+		return new Set(emoji.map((e) => e.shortcode));
+	}, [emoji]);
+
+	return useTextInput("shortcode", {
+		validator: function validateShortcode(code) {
+			// technically invalid, but hacky fix to prevent validation error on page load
+			if (code == "") { return ""; }
+
+			if (emojiCodes.has(code)) {
+				return "Shortcode already in use";
+			}
+
+			if (code.length < 2 || code.length > 30) {
+				return "Shortcode must be between 2 and 30 characters";
+			}
+
+			if (code.toLowerCase() != code) {
+				return "Shortcode must be lowercase";
+			}
+
+			if (!shortcodeRegex.test(code)) {
+				return "Shortcode must only contain lowercase letters, numbers, and underscores";
+			}
+
+			return "";
+		}
+	});
+};
\ No newline at end of file