{infoContent}
{
- if (v.length === 0) {
- return "";
- }
-
- if (v[v.length-1] === ".") {
- return "invalid domain";
- }
-
- const valid = isValidDomain(v, {
- subdomain: true,
- wildcard: false,
- allowUnicode: true,
- topLevel: false,
- });
-
- if (valid) {
- return "";
- }
-
- return "invalid domain";
- }
+ validator: formDomainValidator,
}),
obfuscate: useBoolInput("obfuscate", { source: perm }),
commentPrivate: useTextInput("private_comment", { source: perm }),
@@ -209,9 +203,7 @@ function DomainPermForm({ defaultDomain, perm, permType }: DomainPermFormProps)
const [submitForm, submitFormResult] = useFormSubmit(form, [addTrigger, addResult], { changedOnly: false });
// Uppercase first letter of given permType.
- const permTypeUpper = useMemo(() => {
- return permType.charAt(0).toUpperCase() + permType.slice(1);
- }, [permType]);
+ const permTypeUpper = useCapitalize(permType);
const [location, setLocation] = useLocation();
diff --git a/web/source/settings/views/moderation/domain-permissions/drafts/common.tsx b/web/source/settings/views/moderation/domain-permissions/drafts/common.tsx
new file mode 100644
index 000000000..af919dc57
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/drafts/common.tsx
@@ -0,0 +1,43 @@
+/*
+ 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";
+
+export function DomainPermissionDraftHelpText() {
+ return (
+ <>
+ Domain permission drafts are domain block or domain allow entries that are not yet in force.
+
+ You can choose to accept or remove a draft.
+
+ );
+}
+
+export function DomainPermissionDraftDocsLink() {
+ return (
+
+ Learn more about domain permission drafts (opens in a new tab)
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/drafts/detail.tsx b/web/source/settings/views/moderation/domain-permissions/drafts/detail.tsx
new file mode 100644
index 000000000..a5ba325f0
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/drafts/detail.tsx
@@ -0,0 +1,210 @@
+/*
+ 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 { useLocation, useParams } from "wouter";
+import Loading from "../../../../components/loading";
+import { useBaseUrl } from "../../../../lib/navigation/util";
+import BackButton from "../../../../components/back-button";
+import {
+ useAcceptDomainPermissionDraftMutation,
+ useGetDomainPermissionDraftQuery,
+ useRemoveDomainPermissionDraftMutation
+} from "../../../../lib/query/admin/domain-permissions/drafts";
+import { Error as ErrorC } from "../../../../components/error";
+import UsernameLozenge from "../../../../components/username-lozenge";
+import MutationButton from "../../../../components/form/mutation-button";
+import { useBoolInput, useTextInput } from "../../../../lib/form";
+import { Checkbox, Select } from "../../../../components/form/inputs";
+import { PermType } from "../../../../lib/types/perm";
+
+export default function DomainPermissionDraftDetail() {
+ const baseUrl = useBaseUrl();
+ const backLocation: string = history.state?.backLocation ?? `~${baseUrl}`;
+ const params = useParams();
+
+ let id = params.permDraftId as string | undefined;
+ if (!id) {
+ throw "no perm ID";
+ }
+
+ const {
+ data: permDraft,
+ isLoading,
+ isFetching,
+ isError,
+ error,
+ } = useGetDomainPermissionDraftQuery(id);
+
+ if (isLoading || isFetching) {
+ return ;
+ } else if (isError) {
+ return ;
+ } else if (permDraft === undefined) {
+ return ;
+ }
+
+ const created = permDraft.created_at ? new Date(permDraft.created_at).toDateString(): "unknown";
+ const domain = permDraft.domain;
+ const permType = permDraft.permission_type;
+ if (!permType) {
+ return ;
+ }
+ const publicComment = permDraft.public_comment ?? "[none]";
+ const privateComment = permDraft.private_comment ?? "[none]";
+ const subscriptionID = permDraft.subscription_id ?? "[none]";
+
+ return (
+
+
Domain Permission Draft Detail
+
+
+
Created
+
+
+
+
Created By
+
+
+
+
+
+
Domain
+
{domain}
+
+
+
Permission type
+
+
+ {permType}
+
+
+
+
Private comment
+
{privateComment}
+
+
+
Public comment
+
{publicComment}
+
+
+
Subscription ID
+
{subscriptionID}
+
+
+
+
+ );
+}
+
+function HandleDraft({ id, permType, backLocation }: { id: string, permType: PermType, backLocation: string }) {
+ const [ accept, acceptResult ] = useAcceptDomainPermissionDraftMutation();
+ const [ remove, removeResult ] = useRemoveDomainPermissionDraftMutation();
+ const [_location, setLocation] = useLocation();
+ const form = {
+ acceptOrRemove: useTextInput("accept_or_remove", { defaultValue: "accept" }),
+ overwrite: useBoolInput("overwrite"),
+ exclude_target: useBoolInput("exclude_target"),
+ };
+
+ const onClick = (e) => {
+ e.preventDefault();
+ if (form.acceptOrRemove.value === "accept") {
+ const overwrite = form.overwrite.value;
+ accept({id, overwrite, permType}).then(res => {
+ if ("data" in res) {
+ setLocation(backLocation);
+ }
+ });
+ } else {
+ const exclude_target = form.exclude_target.value;
+ remove({id, exclude_target}).then(res => {
+ if ("data" in res) {
+ setLocation(backLocation);
+ }
+ });
+ }
+ };
+
+ return (
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/drafts/index.tsx b/web/source/settings/views/moderation/domain-permissions/drafts/index.tsx
new file mode 100644
index 000000000..19dbe0d88
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/drafts/index.tsx
@@ -0,0 +1,293 @@
+/*
+ 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, { ReactNode, useEffect, useMemo } from "react";
+
+import { useTextInput } from "../../../../lib/form";
+import { PageableList } from "../../../../components/pageable-list";
+import MutationButton from "../../../../components/form/mutation-button";
+import { useLocation, useSearch } from "wouter";
+import { useAcceptDomainPermissionDraftMutation, useLazySearchDomainPermissionDraftsQuery, useRemoveDomainPermissionDraftMutation } from "../../../../lib/query/admin/domain-permissions/drafts";
+import { DomainPerm } from "../../../../lib/types/domain-permission";
+import { Error as ErrorC } from "../../../../components/error";
+import { Select, TextInput } from "../../../../components/form/inputs";
+import { formDomainValidator } from "../../../../lib/util/formvalidators";
+import { useCapitalize } from "../../../../lib/util";
+import { DomainPermissionDraftDocsLink, DomainPermissionDraftHelpText } from "./common";
+
+export default function DomainPermissionDraftsSearch() {
+ return (
+
+
+
Domain Permission Drafts
+
+ You can use the form below to search through domain permission drafts.
+
+
+
+
+
+
+
+ );
+}
+
+function DomainPermissionDraftsSearchForm() {
+ const [ location, setLocation ] = useLocation();
+ const search = useSearch();
+ const urlQueryParams = useMemo(() => new URLSearchParams(search), [search]);
+ const hasParams = urlQueryParams.size != 0;
+ const [ searchDrafts, searchRes ] = useLazySearchDomainPermissionDraftsQuery();
+
+ const form = {
+ subscription_id: useTextInput("subscription_id", { defaultValue: urlQueryParams.get("subscription_id") ?? "" }),
+ domain: useTextInput("domain", {
+ defaultValue: urlQueryParams.get("domain") ?? "",
+ validator: formDomainValidator,
+ }),
+ permission_type: useTextInput("permission_type", { defaultValue: urlQueryParams.get("permission_type") ?? "" }),
+ limit: useTextInput("limit", { defaultValue: urlQueryParams.get("limit") ?? "20" })
+ };
+
+ // On mount, if urlQueryParams were provided,
+ // trigger the search. For example, if page
+ // was accessed at /search?origin=local&limit=20,
+ // then run a search with origin=local and
+ // limit=20 and immediately render the results.
+ //
+ // If no urlQueryParams set, trigger default
+ // search (first page, no filtering).
+ useEffect(() => {
+ if (hasParams) {
+ searchDrafts(Object.fromEntries(urlQueryParams));
+ } else {
+ setLocation(location + "?limit=20");
+ }
+ }, [
+ urlQueryParams,
+ hasParams,
+ searchDrafts,
+ location,
+ setLocation,
+ ]);
+
+ // Rather than triggering the search directly,
+ // the "submit" button changes the location
+ // based on form field params, and lets the
+ // useEffect hook above actually do the search.
+ function submitQuery(e) {
+ e.preventDefault();
+
+ // Parse query parameters.
+ const entries = Object.entries(form).map(([k, v]) => {
+ // Take only defined form fields.
+ if (v.value === undefined || v.value.length === 0 || v.value === "any") {
+ return null;
+ }
+ return [[k, v.value]];
+ }).flatMap(kv => {
+ // Remove any nulls.
+ return kv || [];
+ });
+
+ const searchParams = new URLSearchParams(entries);
+ setLocation(location + "?" + searchParams.toString());
+ }
+
+ // Location to return to when user clicks "back" on the detail view.
+ const backLocation = location + (hasParams ? `?${urlQueryParams}` : "");
+
+ // Function to map an item to a list entry.
+ function itemToEntry(draft: DomainPerm): ReactNode {
+ return (
+
+ );
+ }
+
+ return (
+ <>
+
+ No drafts found that match your query.}
+ prevNextLinks={searchRes.data?.links}
+ />
+
+ );
+}
+
+interface DraftEntryProps {
+ permDraft: DomainPerm;
+ linkTo: string;
+ backLocation: string;
+}
+
+function DraftListEntry({ permDraft, linkTo, backLocation }: DraftEntryProps) {
+ const [ _location, setLocation ] = useLocation();
+ const [ accept, acceptResult ] = useAcceptDomainPermissionDraftMutation();
+ const [ remove, removeResult ] = useRemoveDomainPermissionDraftMutation();
+
+ const domain = permDraft.domain;
+ const permType = permDraft.permission_type;
+ const permTypeUpper = useCapitalize(permType);
+ if (!permType) {
+ return ;
+ }
+
+ const publicComment = permDraft.public_comment ?? "[none]";
+ const privateComment = permDraft.private_comment ?? "[none]";
+ const subscriptionID = permDraft.subscription_id ?? "[none]";
+ const id = permDraft.id;
+ if (!id) {
+ return ;
+ }
+
+ const title = `${permTypeUpper} ${domain}`;
+
+ return (
+ {
+ // When clicking on a draft, direct
+ // to the detail view for that draft.
+ setLocation(linkTo, {
+ // Store the back location in history so
+ // the detail view can use it to return to
+ // this page (including query parameters).
+ state: { backLocation: backLocation }
+ });
+ }}
+ role="link"
+ tabIndex={0}
+ >
+
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/drafts/new.tsx b/web/source/settings/views/moderation/domain-permissions/drafts/new.tsx
new file mode 100644
index 000000000..c78f8192a
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/drafts/new.tsx
@@ -0,0 +1,119 @@
+/*
+ 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 useFormSubmit from "../../../../lib/form/submit";
+import { useCreateDomainPermissionDraftMutation } from "../../../../lib/query/admin/domain-permissions/drafts";
+import { useBoolInput, useRadioInput, useTextInput } from "../../../../lib/form";
+import { formDomainValidator } from "../../../../lib/util/formvalidators";
+import MutationButton from "../../../../components/form/mutation-button";
+import { Checkbox, RadioGroup, TextArea, TextInput } from "../../../../components/form/inputs";
+import { useLocation } from "wouter";
+import { DomainPermissionDraftDocsLink, DomainPermissionDraftHelpText } from "./common";
+
+export default function DomainPermissionDraftNew() {
+ const [ _location, setLocation ] = useLocation();
+
+ const form = {
+ domain: useTextInput("domain", {
+ validator: formDomainValidator,
+ }),
+ permission_type: useRadioInput("permission_type", {
+ options: {
+ block: "Block domain",
+ allow: "Allow domain",
+ }
+ }),
+ obfuscate: useBoolInput("obfuscate"),
+ public_comment: useTextInput("public_comment"),
+ private_comment: useTextInput("private_comment"),
+ };
+
+ const [formSubmit, result] = useFormSubmit(
+ form,
+ useCreateDomainPermissionDraftMutation(),
+ {
+ changedOnly: false,
+ onFinish: (res) => {
+ if (res.data) {
+ // Creation successful,
+ // redirect to drafts overview.
+ setLocation(`/drafts/search`);
+ }
+ },
+ });
+
+ return (
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/excludes/common.tsx b/web/source/settings/views/moderation/domain-permissions/excludes/common.tsx
new file mode 100644
index 000000000..f88f0af68
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/excludes/common.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 from "react";
+
+export function DomainPermissionExcludeHelpText() {
+ return (
+ <>
+ Domain permission excludes prevent permissions for a domain (and all
+ subdomains) from being auomatically managed by domain permission subscriptions.
+
+ For example, if you create an exclude entry for example.org, then
+ a blocklist or allowlist subscription will exclude entries for example.org
+ and any of its subdomains (sub.example.org, another.sub.example.org etc.)
+ when creating domain permission drafts and domain blocks/allows.
+
+ This functionality allows you to manually manage permissions for excluded domains,
+ in cases where you know you definitely do or don't want to federate with a given domain,
+ no matter what entries are contained in a domain permission subscription.
+
+ Note that by itself, creation of an exclude entry for a given domain does not affect
+ federation with that domain at all, it is only useful in combination with permission subscriptions.
+
+ );
+}
+
+export function DomainPermissionExcludeDocsLink() {
+ return (
+
+ Learn more about domain permission excludes (opens in a new tab)
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/excludes/detail.tsx b/web/source/settings/views/moderation/domain-permissions/excludes/detail.tsx
new file mode 100644
index 000000000..4e14ec3ad
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/excludes/detail.tsx
@@ -0,0 +1,119 @@
+/*
+ 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 { useLocation, useParams } from "wouter";
+import Loading from "../../../../components/loading";
+import { useBaseUrl } from "../../../../lib/navigation/util";
+import BackButton from "../../../../components/back-button";
+import { Error as ErrorC } from "../../../../components/error";
+import UsernameLozenge from "../../../../components/username-lozenge";
+import { useDeleteDomainPermissionExcludeMutation, useGetDomainPermissionExcludeQuery } from "../../../../lib/query/admin/domain-permissions/excludes";
+import MutationButton from "../../../../components/form/mutation-button";
+
+export default function DomainPermissionExcludeDetail() {
+ const baseUrl = useBaseUrl();
+ const backLocation: string = history.state?.backLocation ?? `~${baseUrl}`;
+
+ const params = useParams();
+ let id = params.excludeId as string | undefined;
+ if (!id) {
+ throw "no perm ID";
+ }
+
+ const {
+ data: permExclude,
+ isLoading,
+ isFetching,
+ isError,
+ error,
+ } = useGetDomainPermissionExcludeQuery(id);
+
+ if (isLoading || isFetching) {
+ return ;
+ } else if (isError) {
+ return ;
+ } else if (permExclude === undefined) {
+ return ;
+ }
+
+ const created = permExclude.created_at ? new Date(permExclude.created_at).toDateString(): "unknown";
+ const domain = permExclude.domain;
+ const privateComment = permExclude.private_comment ?? "[none]";
+
+ return (
+
+
Domain Permission Exclude Detail
+
+
+
Created
+
+
+
+
Created By
+
+
+
+
+
+
Domain
+
{domain}
+
+
+
Private comment
+
{privateComment}
+
+
+
+
+ );
+}
+
+function HandleExclude({ id, backLocation}: {id: string, backLocation: string}) {
+ const [_location, setLocation] = useLocation();
+ const [ deleteExclude, deleteResult ] = useDeleteDomainPermissionExcludeMutation();
+
+ return (
+ {
+ e.preventDefault();
+ e.stopPropagation();
+ deleteExclude(id).then(res => {
+ if ("data" in res) {
+ setLocation(backLocation);
+ }
+ });
+ }}
+ disabled={false}
+ showError={true}
+ result={deleteResult}
+ />
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/excludes/index.tsx b/web/source/settings/views/moderation/domain-permissions/excludes/index.tsx
new file mode 100644
index 000000000..915d6f5cc
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/excludes/index.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 .
+*/
+
+import React, { ReactNode, useEffect, useMemo } from "react";
+
+import { useTextInput } from "../../../../lib/form";
+import { PageableList } from "../../../../components/pageable-list";
+import MutationButton from "../../../../components/form/mutation-button";
+import { useLocation, useSearch } from "wouter";
+import { useDeleteDomainPermissionExcludeMutation, useLazySearchDomainPermissionExcludesQuery } from "../../../../lib/query/admin/domain-permissions/excludes";
+import { DomainPerm } from "../../../../lib/types/domain-permission";
+import { Error as ErrorC } from "../../../../components/error";
+import { Select, TextInput } from "../../../../components/form/inputs";
+import { formDomainValidator } from "../../../../lib/util/formvalidators";
+import { DomainPermissionExcludeDocsLink, DomainPermissionExcludeHelpText } from "./common";
+
+export default function DomainPermissionExcludesSearch() {
+ return (
+
+
+
Domain Permission Excludes
+
+ You can use the form below to search through domain permission excludes.
+
+
+
+
+
+
+
+ );
+}
+
+function DomainPermissionExcludesSearchForm() {
+ const [ location, setLocation ] = useLocation();
+ const search = useSearch();
+ const urlQueryParams = useMemo(() => new URLSearchParams(search), [search]);
+ const hasParams = urlQueryParams.size != 0;
+ const [ searchExcludes, searchRes ] = useLazySearchDomainPermissionExcludesQuery();
+
+ const form = {
+ domain: useTextInput("domain", {
+ defaultValue: urlQueryParams.get("domain") ?? "",
+ validator: formDomainValidator,
+ }),
+ limit: useTextInput("limit", { defaultValue: urlQueryParams.get("limit") ?? "20" })
+ };
+
+ // On mount, if urlQueryParams were provided,
+ // trigger the search. For example, if page
+ // was accessed at /search?origin=local&limit=20,
+ // then run a search with origin=local and
+ // limit=20 and immediately render the results.
+ //
+ // If no urlQueryParams set, trigger default
+ // search (first page, no filtering).
+ useEffect(() => {
+ if (hasParams) {
+ searchExcludes(Object.fromEntries(urlQueryParams));
+ } else {
+ setLocation(location + "?limit=20");
+ }
+ }, [
+ urlQueryParams,
+ hasParams,
+ searchExcludes,
+ location,
+ setLocation,
+ ]);
+
+ // Rather than triggering the search directly,
+ // the "submit" button changes the location
+ // based on form field params, and lets the
+ // useEffect hook above actually do the search.
+ function submitQuery(e) {
+ e.preventDefault();
+
+ // Parse query parameters.
+ const entries = Object.entries(form).map(([k, v]) => {
+ // Take only defined form fields.
+ if (v.value === undefined || v.value.length === 0 || v.value === "any") {
+ return null;
+ }
+ return [[k, v.value]];
+ }).flatMap(kv => {
+ // Remove any nulls.
+ return kv || [];
+ });
+
+ const searchParams = new URLSearchParams(entries);
+ setLocation(location + "?" + searchParams.toString());
+ }
+
+ // Location to return to when user clicks "back" on the detail view.
+ const backLocation = location + (hasParams ? `?${urlQueryParams}` : "");
+
+ // Function to map an item to a list entry.
+ function itemToEntry(exclude: DomainPerm): ReactNode {
+ return (
+
+ );
+ }
+
+ return (
+ <>
+
+ No excludes found that match your query.}
+ prevNextLinks={searchRes.data?.links}
+ />
+
+ );
+}
+
+interface ExcludeEntryProps {
+ permExclude: DomainPerm;
+ linkTo: string;
+ backLocation: string;
+}
+
+function ExcludeListEntry({ permExclude, linkTo, backLocation }: ExcludeEntryProps) {
+ const [ _location, setLocation ] = useLocation();
+ const [ deleteExclude, deleteResult ] = useDeleteDomainPermissionExcludeMutation();
+
+ const domain = permExclude.domain;
+ const privateComment = permExclude.private_comment ?? "[none]";
+ const id = permExclude.id;
+ if (!id) {
+ return ;
+ }
+
+ return (
+ {
+ // When clicking on a exclude, direct
+ // to the detail view for that exclude.
+ setLocation(linkTo, {
+ // Store the back location in history so
+ // the detail view can use it to return to
+ // this page (including query parameters).
+ state: { backLocation: backLocation }
+ });
+ }}
+ role="link"
+ tabIndex={0}
+ >
+
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/excludes/new.tsx b/web/source/settings/views/moderation/domain-permissions/excludes/new.tsx
new file mode 100644
index 000000000..ad33070f8
--- /dev/null
+++ b/web/source/settings/views/moderation/domain-permissions/excludes/new.tsx
@@ -0,0 +1,90 @@
+/*
+ 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 useFormSubmit from "../../../../lib/form/submit";
+import { useCreateDomainPermissionExcludeMutation } from "../../../../lib/query/admin/domain-permissions/excludes";
+import { useTextInput } from "../../../../lib/form";
+import { formDomainValidator } from "../../../../lib/util/formvalidators";
+import MutationButton from "../../../../components/form/mutation-button";
+import { TextArea, TextInput } from "../../../../components/form/inputs";
+import { useLocation } from "wouter";
+import { DomainPermissionExcludeDocsLink, DomainPermissionExcludeHelpText } from "./common";
+
+export default function DomainPermissionExcludeNew() {
+ const [ _location, setLocation ] = useLocation();
+
+ const form = {
+ domain: useTextInput("domain", {
+ validator: formDomainValidator,
+ }),
+ private_comment: useTextInput("private_comment"),
+ };
+
+ const [formSubmit, result] = useFormSubmit(
+ form,
+ useCreateDomainPermissionExcludeMutation(),
+ {
+ changedOnly: false,
+ onFinish: (res) => {
+ if (res.data) {
+ // Creation successful,
+ // redirect to excludes overview.
+ setLocation(`/excludes/search`);
+ }
+ },
+ });
+
+ return (
+
+ );
+}
diff --git a/web/source/settings/views/moderation/domain-permissions/overview.tsx b/web/source/settings/views/moderation/domain-permissions/overview.tsx
index b2e675e05..b9a277e59 100644
--- a/web/source/settings/views/moderation/domain-permissions/overview.tsx
+++ b/web/source/settings/views/moderation/domain-permissions/overview.tsx
@@ -30,6 +30,7 @@ import type { MappedDomainPerms } from "../../../lib/types/domain-permission";
import { NoArg } from "../../../lib/types/query";
import { PermType } from "../../../lib/types/perm";
import { useBaseUrl } from "../../../lib/navigation/util";
+import { useCapitalize } from "../../../lib/util";
export default function DomainPermissionsOverview() {
const baseUrl = useBaseUrl();
@@ -42,9 +43,7 @@ export default function DomainPermissionsOverview() {
const permType = params.permType.slice(0, -1) as PermType;
// Uppercase first letter of given permType.
- const permTypeUpper = useMemo(() => {
- return permType.charAt(0).toUpperCase() + permType.slice(1);
- }, [permType]);
+ const permTypeUpper = useCapitalize(permType);
// Fetch / wait for desired perms to load.
const { data: blocks, isLoading: isLoadingBlocks } = useDomainBlocksQuery(NoArg, { skip: permType !== "block" });
diff --git a/web/source/settings/views/moderation/menu.tsx b/web/source/settings/views/moderation/menu.tsx
index 9488b8c30..7ac6f9327 100644
--- a/web/source/settings/views/moderation/menu.tsx
+++ b/web/source/settings/views/moderation/menu.tsx
@@ -116,6 +116,40 @@ function ModerationDomainPermsMenu() {
itemUrl="import-export"
icon="fa-floppy-o"
/>
+
+
);
}
diff --git a/web/source/settings/views/moderation/reports/detail.tsx b/web/source/settings/views/moderation/reports/detail.tsx
index 298b5bd37..b176b9f1e 100644
--- a/web/source/settings/views/moderation/reports/detail.tsx
+++ b/web/source/settings/views/moderation/reports/detail.tsx
@@ -25,7 +25,7 @@ import { useValue, useTextInput } from "../../../lib/form";
import useFormSubmit from "../../../lib/form/submit";
import { TextArea } from "../../../components/form/inputs";
import MutationButton from "../../../components/form/mutation-button";
-import Username from "../../../components/username";
+import UsernameLozenge from "../../../components/username-lozenge";
import { useGetReportQuery, useResolveReportMutation } from "../../../lib/query/admin/reports";
import { useBaseUrl } from "../../../lib/navigation/util";
import { AdminReport } from "../../../lib/types/report";
@@ -99,7 +99,7 @@ function ReportBasicInfo({ report, baseUrl, location }: ReportSectionProps) {