This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add an option to ignore (block) a user when reporting their events (#…
…8471) * Add an option to ignore (block) a user when reporting their events This is primarily useful if the content being reported really doesn't belong on your screen, and the room moderators are slow to react. Ideally we'd use the word "block" instead of "ignore", but we call it "ignore user" everywhere else. See https://github.com/vector-im/element-web/issues/19590 for further context on the word choice. This change includes a minor refactor to the styles of labelled toggles (for reusability). * Appease the linter * Use a checkbox instead of toggle in the dialog * Update classnames handling for toggle switch * Appease the linter
- Loading branch information
Showing
13 changed files
with
350 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| /* | ||
| Copyright 2019 Michael Telatynski <[email protected]> | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
|
|
@@ -30,6 +31,7 @@ import BaseDialog from "./BaseDialog"; | |
| import DialogButtons from "../elements/DialogButtons"; | ||
| import Field from "../elements/Field"; | ||
| import Spinner from "../elements/Spinner"; | ||
| import LabelledCheckbox from "../elements/LabelledCheckbox"; | ||
|
|
||
| interface IProps extends IDialogProps { | ||
| mxEvent: MatrixEvent; | ||
|
|
@@ -42,6 +44,7 @@ interface IState { | |
| err?: string; | ||
| // If we know it, the nature of the abuse, as specified by MSC3215. | ||
| nature?: ExtendedNature; | ||
| ignoreUserToo: boolean; // if true, user will be ignored/blocked on submit | ||
| } | ||
|
|
||
| const MODERATED_BY_STATE_EVENT_TYPE = [ | ||
|
|
@@ -160,9 +163,14 @@ export default class ReportEventDialog extends React.Component<IProps, IState> { | |
| err: null, | ||
| // If specified, the nature of the abuse, as specified by MSC3215. | ||
| nature: null, | ||
| ignoreUserToo: false, // default false, for now. Could easily be argued as default true | ||
| }; | ||
| } | ||
|
|
||
| private onIgnoreUserTooChanged = (newVal: boolean): void => { | ||
| this.setState({ ignoreUserToo: newVal }); | ||
| }; | ||
|
|
||
| // The user has written down a freeform description of the abuse. | ||
| private onReasonChange = ({ target: { value: reason } }): void => { | ||
| this.setState({ reason }); | ||
|
|
@@ -232,6 +240,15 @@ export default class ReportEventDialog extends React.Component<IProps, IState> { | |
| // Report to homeserver admin through the dedicated Matrix API. | ||
| await client.reportEvent(ev.getRoomId(), ev.getId(), -100, this.state.reason.trim()); | ||
| } | ||
|
|
||
| // if the user should also be ignored, do that | ||
| if (this.state.ignoreUserToo) { | ||
| await client.setIgnoredUsers([ | ||
| ...client.getIgnoredUsers(), | ||
| ev.getSender(), | ||
| ]); | ||
| } | ||
|
|
||
| this.props.onFinished(true); | ||
| } catch (e) { | ||
| logger.error(e); | ||
|
|
@@ -242,7 +259,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> { | |
| } | ||
| }; | ||
|
|
||
| render() { | ||
| public render() { | ||
| let error = null; | ||
| if (this.state.err) { | ||
| error = <div className="error"> | ||
|
|
@@ -259,6 +276,14 @@ export default class ReportEventDialog extends React.Component<IProps, IState> { | |
| ); | ||
| } | ||
|
|
||
| const ignoreUserCheckbox = <LabelledCheckbox | ||
| value={this.state.ignoreUserToo} | ||
| label={_t("Ignore user")} | ||
| byline={_t("Check if you want to hide all current and future messages from this user.")} | ||
| onChange={this.onIgnoreUserTooChanged} | ||
| disabled={this.state.busy} | ||
| />; | ||
|
|
||
| const adminMessageMD = SdkConfig | ||
| .getObject("report_event")?.get("admin_message_md", "adminMessageMD"); | ||
| let adminMessage; | ||
|
|
@@ -387,6 +412,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> { | |
| /> | ||
| { progress } | ||
| { error } | ||
| { ignoreUserCheckbox } | ||
| </div> | ||
| <DialogButtons | ||
| primaryButton={_t("Send report")} | ||
|
|
@@ -428,6 +454,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> { | |
| /> | ||
| { progress } | ||
| { error } | ||
| { ignoreUserCheckbox } | ||
| </div> | ||
| <DialogButtons | ||
| primaryButton={_t("Send report")} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from "react"; | ||
|
|
||
| import StyledCheckbox from "./StyledCheckbox"; | ||
|
|
||
| interface IProps { | ||
| // The value for the checkbox | ||
| value: boolean; | ||
| // The translated label for the checkbox | ||
| label: string; | ||
| // Optional translated string to show below the checkbox | ||
| byline?: string; | ||
| // Whether or not to disable the checkbox | ||
| disabled?: boolean; | ||
| // The function to call when the value changes | ||
| onChange(checked: boolean): void; | ||
| } | ||
|
|
||
| const LabelledCheckbox: React.FC<IProps> = ({ value, label, byline, disabled, onChange }) => { | ||
| return <label className="mx_LabelledCheckbox"> | ||
| <StyledCheckbox disabled={disabled} checked={value} onChange={e => onChange(e.target.checked)} /> | ||
| <div className="mx_LabelledCheckbox_labels"> | ||
| <span className="mx_LabelledCheckbox_label">{ label }</span> | ||
| { byline ? <span className="mx_LabelledCheckbox_byline">{ byline }</span> : null } | ||
| </div> | ||
| </label>; | ||
| }; | ||
|
|
||
| export default LabelledCheckbox; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.