- reported
+
+ <> reported
+
{report.action_taken &&
diff --git a/web/source/settings/views/moderation/reports/overview.tsx b/web/source/settings/views/moderation/reports/overview.tsx
index ca8fc185c..03ce1a382 100644
--- a/web/source/settings/views/moderation/reports/overview.tsx
+++ b/web/source/settings/views/moderation/reports/overview.tsx
@@ -19,9 +19,7 @@
import React from "react";
import { Link } from "wouter";
-
import FormWithData from "../../../lib/form/form-with-data";
-
import Username from "./username";
import { useListReportsQuery } from "../../../lib/query/admin/reports";
@@ -77,7 +75,7 @@ function ReportEntry({ report }) {
- reported
+ reported
{report.action_taken ? "Resolved" : "Open"}
diff --git a/web/source/settings/views/moderation/reports/username.tsx b/web/source/settings/views/moderation/reports/username.tsx
index 6fba0b804..294d97e8b 100644
--- a/web/source/settings/views/moderation/reports/username.tsx
+++ b/web/source/settings/views/moderation/reports/username.tsx
@@ -19,8 +19,14 @@
import React from "react";
import { Link } from "wouter";
+import { AdminAccount } from "../../../lib/types/account";
-export default function Username({ user, link = true }) {
+interface UsernameProps {
+ user: AdminAccount;
+ link?: string;
+}
+
+export default function Username({ user, link }: UsernameProps) {
let className = "user";
let isLocal = user.domain == null;
@@ -36,19 +42,25 @@ export default function Username({ user, link = true }) {
? { fa: "fa-home", info: "Local user" }
: { fa: "fa-external-link-square", info: "Remote user" };
- let Element: any = "div";
- let href: any = null;
-
- if (link) {
- Element = Link;
- href = `/settings/admin/accounts/${user.id}`;
- }
-
- return (
-
+ const content = (
+ <>
@{user.account.acct}
{icon.info}
-
+
);
+
+ if (link) {
+ return (
+
+ {content}
+
+ );
+ } else {
+ return (
+
+ {content}
+
+ );
+ }
}
diff --git a/web/source/settings/views/moderation/router.tsx b/web/source/settings/views/moderation/router.tsx
new file mode 100644
index 000000000..37344462b
--- /dev/null
+++ b/web/source/settings/views/moderation/router.tsx
@@ -0,0 +1,149 @@
+/*
+ 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 { BaseUrlContext, useBaseUrl, useHasPermission } from "../../lib/navigation/util";
+import { Redirect, Route, Router, Switch } from "wouter";
+import { ReportOverview } from "./reports/overview";
+import ReportDetail from "./reports/detail";
+import { ErrorBoundary } from "../../lib/navigation/error";
+import ImportExport from "./domain-permissions/import-export";
+import DomainPermissionsOverview from "./domain-permissions/overview";
+import DomainPermDetail from "./domain-permissions/detail";
+import AccountsOverview from "./accounts";
+import AccountsPending from "./accounts/pending";
+import AccountDetail from "./accounts/detail";
+
+/*
+ EXPORTED COMPONENTS
+*/
+
+/**
+ * - /settings/moderation/reports/overview
+ * - /settings/moderation/reports/:reportId
+ * - /settings/moderation/accounts/overview
+ * - /settings/moderation/accounts/pending
+ * - /settings/moderation/accounts/:accountID
+ * - /settings/moderation/domain-permissions/:permType
+ * - /settings/moderation/domain-permissions/:permType/:domain
+ * - /settings/moderation/domain-permissions/import-export
+ * - /settings/moderation/domain-permissions/process
+ */
+export default function ModerationRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/moderation";
+ const absBase = parentUrl + thisBase;
+
+ const permissions = ["moderator"];
+ const moderator = useHasPermission(permissions);
+ if (!moderator) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+
+
+ );
+}
+
+/*
+ INTERNAL COMPONENTS
+*/
+
+/**
+ * - /settings/moderation/reports/overview
+ * - /settings/moderation/reports/:reportId
+ */
+function ModerationReportsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/reports";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+/**
+ * - /settings/moderation/accounts/overview
+ * - /settings/moderation/accounts/pending
+ * - /settings/moderation/accounts/:accountID
+ */
+function ModerationAccountsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/accounts";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+/**
+ * - /settings/moderation/domain-permissions/:permType
+ * - /settings/moderation/domain-permissions/:permType/:domain
+ * - /settings/moderation/domain-permissions/import-export
+ * - /settings/moderation/domain-permissions/process
+ */
+function ModerationDomainPermsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/domain-permissions";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/web/source/settings/views/moderation/routes.tsx b/web/source/settings/views/moderation/routes.tsx
deleted file mode 100644
index 238abaff6..000000000
--- a/web/source/settings/views/moderation/routes.tsx
+++ /dev/null
@@ -1,201 +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 .
-*/
-
-import { MenuItem } from "../../lib/navigation/menu";
-import React from "react";
-import { BaseUrlContext, useBaseUrl } from "../../lib/navigation/util";
-import { Redirect, Route, Router, Switch } from "wouter";
-import AccountsOverview from "./accounts";
-import AccountsPending from "./accounts/pending";
-import AccountDetail from "./accounts/detail";
-import { ReportOverview } from "./reports/overview";
-import DomainPermissionsOverview from "./domain-permissions/overview";
-import DomainPermDetail from "./domain-permissions/detail";
-import ImportExport from "./domain-permissions/import-export";
-import ReportDetail from "./reports/detail";
-
-/*
- EXPORTED COMPONENTS
-*/
-
-/**
- * Moderation menu. Reports, accounts,
- * domain permissions import + export.
- */
-export function ModerationMenu() {
- return (
-
- );
-}
-
-/**
- * Moderation router. Reports, accounts,
- * domain permissions import + export.
- */
-export function ModerationRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/moderation";
- const absBase = parentUrl + thisBase;
-
- return (
-
-
-
-
-
-
-
- );
-}
-
-/*
- INTERNAL COMPONENTS
-*/
-
-/*
- MENUS
-*/
-
-function ModerationReportsMenu() {
- return (
-
- );
-}
-
-function ModerationAccountsMenu() {
- return (
-
- );
-}
-
-function ModerationDomainPermsMenu() {
- return (
-
- );
-}
-
-/*
- ROUTERS
-*/
-
-function ModerationReportsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/reports";
- const absBase = parentUrl + thisBase;
-
- return (
-
-
-
-
-
-
-
-
- );
-}
-
-function ModerationAccountsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/accounts";
- const absBase = parentUrl + thisBase;
-
- return (
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-function ModerationDomainPermsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/domain-permissions";
- const absBase = parentUrl + thisBase;
-
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
-}
--
cgit v1.2.3