This {type == "statuses" ? "toot" : "account"} uses the following custom emoji, select the ones you want to copy/disable:
diff --git a/web/source/settings/admin/federation/detail.js b/web/source/settings/admin/federation/detail.js
index eb33960a7..6d695a67e 100644
--- a/web/source/settings/admin/federation/detail.js
+++ b/web/source/settings/admin/federation/detail.js
@@ -34,7 +34,7 @@ const BackButton = require("../../components/back-button");
const MutationButton = require("../../components/form/mutation-button");
module.exports = function InstanceDetail({ baseUrl }) {
- const { data: blockedInstances = [], isLoading } = query.useInstanceBlocksQuery();
+ const { data: blockedInstances = {}, isLoading } = query.useInstanceBlocksQuery();
let [_match, { domain }] = useRoute(`${baseUrl}/:domain`);
@@ -43,7 +43,7 @@ module.exports = function InstanceDetail({ baseUrl }) {
}
const existingBlock = React.useMemo(() => {
- return blockedInstances.find((block) => block.domain == domain);
+ return blockedInstances[domain];
}, [blockedInstances, domain]);
if (domain == undefined) {
diff --git a/web/source/settings/admin/federation/import-export.js b/web/source/settings/admin/federation/import-export.js
index 1d70ff86d..ccaa36086 100644
--- a/web/source/settings/admin/federation/import-export.js
+++ b/web/source/settings/admin/federation/import-export.js
@@ -19,14 +19,15 @@
"use strict";
const React = require("react");
+const { Switch, Route, Redirect, useLocation } = require("wouter");
const query = require("../../lib/query");
-const processDomainList = require("../../lib/import-export");
const {
useTextInput,
useBoolInput,
- useFileInput
+ useRadioInput,
+ useCheckListInput
} = require("../../lib/form");
const useFormSubmit = require("../../lib/form/submit");
@@ -35,93 +36,263 @@ const {
TextInput,
TextArea,
Checkbox,
- FileInput,
- useCheckListInput
+ Select,
+ RadioGroup
} = require("../../components/form/inputs");
-const FormWithData = require("../../lib/form/form-with-data");
const CheckList = require("../../components/check-list");
const MutationButton = require("../../components/form/mutation-button");
+const isValidDomain = require("is-valid-domain");
+const FormWithData = require("../../lib/form/form-with-data");
+const { Error } = require("../../components/error");
+
+const baseUrl = "/settings/admin/federation/import-export";
module.exports = function ImportExport() {
- const [parsedList, setParsedList] = React.useState();
-
+ const [updateFromFile, setUpdateFromFile] = React.useState(false);
const form = {
domains: useTextInput("domains"),
- obfuscate: useBoolInput("obfuscate"),
- commentPrivate: useTextInput("private_comment"),
- commentPublic: useTextInput("public_comment"),
- // json: useFileInput("json")
+ exportType: useTextInput("exportType", { defaultValue: "plain", dontReset: true })
};
- function submitImport(e) {
- e.preventDefault();
+ const [submitParse, parseResult] = useFormSubmit(form, query.useProcessDomainListMutation());
+ const [submitExport, exportResult] = useFormSubmit(form, query.useExportDomainListMutation());
- Promise.try(() => {
- return processDomainList(form.domains.value);
- }).then((processed) => {
- setParsedList(processed);
- }).catch((e) => {
- console.error(e);
- });
+ function fileChanged(e) {
+ const reader = new FileReader();
+ reader.onload = function (read) {
+ form.domains.setter(read.target.result);
+ setUpdateFromFile(true);
+ };
+ reader.readAsText(e.target.files[0]);
+ }
+
+ const [_location, setLocation] = useLocation();
+
+ if (updateFromFile) {
+ setUpdateFromFile(false);
+ submitParse();
}
return (
-
-
Import / Export
-
- {
- parsedList
- ?
- :
- }
-
-
+
+
+ {!parseResult.isSuccess && }
+
+
+ {
+ parseResult.reset();
+ setLocation(baseUrl);
+ }}>
+ < back
+ Confirm import:
+
+
+
+
+
+ {parseResult.isSuccess && }
+ Import / Export suspended domains
+
+
+
+
+
);
};
-function ImportExportList({ list }) {
- const entryCheckList = useCheckListInput("selectedDomains", {
- entries: list,
- uniqueKey: "domain"
- });
+function ImportList({ list, data: blockedInstances }) {
+ const hasComment = React.useMemo(() => {
+ let hasPublic = false;
+ let hasPrivate = false;
+
+ list.some((entry) => {
+ if (entry.public_comment?.length > 0) {
+ hasPublic = true;
+ }
+
+ if (entry.private_comment?.length > 0) {
+ hasPrivate = true;
+ }
+
+ return hasPublic && hasPrivate;
+ });
+
+ if (hasPublic && hasPrivate) {
+ return { both: true };
+ } else if (hasPublic) {
+ return { type: "public_comment" };
+ } else if (hasPrivate) {
+ return { type: "private_comment" };
+ } else {
+ return {};
+ }
+ }, [list]);
+
+ const showComment = useTextInput("showComment", { defaultValue: hasComment.type ?? "public_comment" });
+ let commentName = "";
+ if (showComment.value == "public_comment") { commentName = "Public comment"; }
+ if (showComment.value == "private_comment") { commentName = "Private comment"; }
+
+ const form = {
+ domains: useCheckListInput("domains", {
+ entries: list,
+ uniqueKey: "domain"
+ }),
+ obfuscate: useBoolInput("obfuscate"),
+ privateComment: useTextInput("private_comment", {
+ defaultValue: `Imported on ${new Date().toLocaleString()}`
+ }),
+ privateCommentBehavior: useRadioInput("private_comment_behavior", {
+ defaultValue: "append",
+ options: {
+ append: "Append to",
+ replace: "Replace"
+ }
+ }),
+ publicComment: useTextInput("public_comment"),
+ publicCommentBehavior: useRadioInput("public_comment_behavior", {
+ defaultValue: "append",
+ options: {
+ append: "Append to",
+ replace: "Replace"
+ }
+ }),
+ };
+
+ const [importDomains, importResult] = useFormSubmit(form, query.useImportDomainListMutation(), { changedOnly: false });
return (
-
+ <>
+
+
);
}
-function ImportExportForm({ form, submitImport }) {
+function DomainEntry({ entry, onChange, blockedInstances, commentType }) {
+ const domainField = useTextInput("domain", {
+ defaultValue: entry.domain,
+ validator: (value) => {
+ return (entry.checked && !isValidDomain(value, { wildcard: true, allowUnicode: true }))
+ ? "Invalid domain"
+ : "";
+ }
+ });
+
+ React.useEffect(() => {
+ onChange({ valid: domainField.valid });
+ /* eslint-disable-next-line react-hooks/exhaustive-deps */
+ }, [domainField.valid]);
+
+ let icon = null;
+
+ if (blockedInstances[domainField.value] != undefined) {
+ icon = (
+ <>
+
+
Domain block already exists.
+
+ );
+ }
+
return (
-