diff options
Diffstat (limited to 'web/source/settings/views/moderation/reports')
3 files changed, 9 insertions, 73 deletions
diff --git a/web/source/settings/views/moderation/reports/detail.tsx b/web/source/settings/views/moderation/reports/detail.tsx index bc356edce..ad8d69a47 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 "./username"; +import Username from "../../../components/username"; import { useGetReportQuery, useResolveReportMutation } from "../../../lib/query/admin/reports"; import { useBaseUrl } from "../../../lib/navigation/util"; @@ -53,13 +53,15 @@ function ReportDetailForm({ data: report }) { <div className="report detail"> <div className="usernames"> <Username - user={from} - link={`~/settings/moderation/accounts/${from.id}`} + account={from} + linkTo={`~/settings/moderation/accounts/${from.id}`} + backLocation={`~/settings/moderation/reports/${report.id}`} /> <> reported </> <Username - user={target} - link={`~/settings/moderation/accounts/${target.id}`} + account={target} + linkTo={`~/settings/moderation/accounts/${target.id}`} + backLocation={`~/settings/moderation/reports/${report.id}`} /> </div> diff --git a/web/source/settings/views/moderation/reports/overview.tsx b/web/source/settings/views/moderation/reports/overview.tsx index 03ce1a382..18eb5492a 100644 --- a/web/source/settings/views/moderation/reports/overview.tsx +++ b/web/source/settings/views/moderation/reports/overview.tsx @@ -20,7 +20,7 @@ import React from "react"; import { Link } from "wouter"; import FormWithData from "../../../lib/form/form-with-data"; -import Username from "./username"; +import Username from "../../../components/username"; import { useListReportsQuery } from "../../../lib/query/admin/reports"; export function ReportOverview({ }) { @@ -75,7 +75,7 @@ function ReportEntry({ report }) { <div className={`report entry${report.action_taken ? " resolved" : ""}`}> <div className="byline"> <div className="usernames"> - <Username user={from} /> reported <Username user={target} /> + <Username account={from} /> reported <Username account={target} /> </div> <h3 className="report-status"> {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 deleted file mode 100644 index 294d97e8b..000000000 --- a/web/source/settings/views/moderation/reports/username.tsx +++ /dev/null @@ -1,66 +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 <http://www.gnu.org/licenses/>. -*/ - -import React from "react"; -import { Link } from "wouter"; -import { AdminAccount } from "../../../lib/types/account"; - -interface UsernameProps { - user: AdminAccount; - link?: string; -} - -export default function Username({ user, link }: UsernameProps) { - let className = "user"; - let isLocal = user.domain == null; - - if (user.suspended) { - className += " suspended"; - } - - if (isLocal) { - className += " local"; - } - - let icon = isLocal - ? { fa: "fa-home", info: "Local user" } - : { fa: "fa-external-link-square", info: "Remote user" }; - - const content = ( - <> - <span className="acct">@{user.account.acct}</span> - <i className={`fa fa-fw ${icon.fa}`} aria-hidden="true" title={icon.info} /> - <span className="sr-only">{icon.info}</span> - </> - ); - - if (link) { - return ( - <Link className={className} to={link}> - {content} - </Link> - ); - } else { - return ( - <div className={className}> - {content} - </div> - ); - } -} |