PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix reporting events not working (#8257)

Browse source 
* Fix report dialog not working

During the removal of skinning the dialog opener was moved, but the wrong property was given.

* Log errors out of the report event dialog

So we can actually see them in rageshakes
This commit is contained in:
Travis Ralston 2022-04-08 08:19:14 -06:00 committed by GitHub
parent 9f8c208516
commit 1db805bbdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/dialogs/ReportEventDialog.tsx
View file

@ -16,6 +16,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { logger } from "matrix-js-sdk/src/logger";
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import { ensureDMExists } from "../../../createRoom"; import { ensureDMExists } from "../../../createRoom";
@ -213,7 +214,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
try { try {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
const ev = this.props.mxEvent; const ev = this.props.mxEvent;
if (this.moderation && this.state.nature != NonStandardValue.Admin) { if (this.moderation && this.state.nature !== NonStandardValue.Admin) {
const nature: Nature = this.state.nature; const nature: Nature = this.state.nature;
// Report to moderators through to the dedicated bot, // Report to moderators through to the dedicated bot,
@ -233,6 +234,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
} }
this.props.onFinished(true); this.props.onFinished(true);
} catch (e) { } catch (e) {
logger.error(e);
this.setState({ this.setState({
busy: false, busy: false,
err: e.message, err: e.message,

2
src/utils/DialogOpener.ts
View file

@ -70,7 +70,7 @@ export class DialogOpener {
break; break;
case Action.OpenReportEventDialog: case Action.OpenReportEventDialog:
Modal.createTrackedDialog('Report Event', '', ReportEventDialog, { Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
event: payload.event, mxEvent: payload.event,
}, 'mx_Dialog_reportEvent'); }, 'mx_Dialog_reportEvent');
break; break;
case Action.OpenTabbedIntegrationManagerDialog: case Action.OpenTabbedIntegrationManagerDialog: