3 files changed, 111 insertions, 0 deletions

diff --git a/web/source/settings/lib/query/user/export-import.ts b/web/source/settings/lib/query/user/export-import.ts
index 56c48e364..006203a68 100644
--- a/web/source/settings/lib/query/user/export-import.ts
+++ b/web/source/settings/lib/query/user/export-import.ts
@@ -125,6 +125,16 @@ const extended = gtsApi.injectEndpoints({
 				return { data: null };
 			}
 		}),
+
+		importData: build.mutation({
+			query: (formData) => ({
+				method: "POST",
+				url: `/api/v1/import`,
+				asForm: true,
+				body: formData,
+				discardEmpty: true
+			}),
+		}),
 	})
 });
 
@@ -135,4 +145,5 @@ export const {
 	useExportListsMutation,
 	useExportBlocksMutation,
 	useExportMutesMutation,
+	useImportDataMutation,
 } = extended;
diff --git a/web/source/settings/views/user/export-import/import.tsx b/web/source/settings/views/user/export-import/import.tsx
new file mode 100644
index 000000000..8cb7b22ba
--- /dev/null
+++ b/web/source/settings/views/user/export-import/import.tsx
@@ -0,0 +1,98 @@
+/*
+	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 from "react";
+import { useImportDataMutation } from "../../../lib/query/user/export-import";
+import MutationButton from "../../../components/form/mutation-button";
+import useFormSubmit from "../../../lib/form/submit";
+import { useFileInput, useTextInput } from "../../../lib/form";
+import { FileInput, Select } from "../../../components/form/inputs";
+
+export default function Import() {
+	const form = {
+		data: useFileInput("data"),
+		type: useTextInput("type", { defaultValue: "" }),
+		mode: useTextInput("mode", { defaultValue: "" })
+	};
+
+	const [submitForm, result] = useFormSubmit(form, useImportDataMutation(), {
+		changedOnly: false,
+		onFinish: () => {
+			form.data.reset();
+			form.type.reset();
+			form.mode.reset();
+		}
+	});
+	
+	return (
+		<form className="import-data" onSubmit={submitForm}>
+			<div className="form-section-docs">
+				<h3>Import Data</h3>
+				<a
+					href="https://docs.gotosocial.org/en/latest/user_guide/export-import#import"
+					target="_blank"
+					className="docslink"
+					rel="noreferrer"
+				>
+					Learn more about this section (opens in a new tab)
+				</a>
+			</div>
+			
+			<FileInput
+				label="CSV data file"
+				field={form.data}
+				accept="text/csv"
+			/>
+
+			<Select
+				field={form.type}
+				label="Import type"
+				options={
+					<>
+						<option value="">- Select import type -</option>
+						<option value="following">Following list</option>
+						<option value="blocks">Blocked accounts list</option>
+					</>
+				}>
+			</Select>
+
+			<Select
+				field={form.mode}
+				label="Import mode"
+				options={
+					<>
+						<option value="">- Select import mode -</option>
+						<option value="merge">Merge (recommended): add to existing records</option>
+						<option value="overwrite">Overwrite: replace existing records</option>
+					</>
+				}>
+			</Select>
+
+			<MutationButton
+				disabled={
+					form.data.value === undefined ||
+					!form.type.value ||
+					!form.mode.value
+				}
+				label="Import"
+				result={result}
+			/>
+		</form>
+	);
+}
diff --git a/web/source/settings/views/user/export-import/index.tsx b/web/source/settings/views/user/export-import/index.tsx
index 2e3533318..b73779bac 100644
--- a/web/source/settings/views/user/export-import/index.tsx
+++ b/web/source/settings/views/user/export-import/index.tsx
@@ -22,6 +22,7 @@ import Export from "./export";
 import Loading from "../../../components/loading";
 import { Error } from "../../../components/error";
 import { useExportStatsQuery } from "../../../lib/query/user/export-import";
+import Import from "./import";
 
 export default function ExportImport() {
 	const {
@@ -52,6 +53,7 @@ export default function ExportImport() {
 				your GoToSocial account. All exports and imports use Mastodon-compatible CSV files.
 			</p>
 			<Export exportStats={exportStats} />
+			<Import />
 		</>
 	);
 }