Matrix-Mirrors/mjolnir
1
0
Fork 0
mirror of https://github.com/matrix-org/mjolnir.git synced 2024-06-16 10:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix traceback on Abuse Report. (#230)" (#293)

Browse Source 
This reverts commit 27ae3ec625.
This commit is contained in:
David Teller 2022-05-13 15:29:49 +02:00 committed by GitHub
parent 27ae3ec625
commit bcc3405e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -73,5 +73,5 @@ typings/
# Python packing directories. # Python packing directories.
mjolnir.egg-info/ mjolnir.egg-info/
# Visual Studio data # VS
.vs .vs

6
src/Mjolnir.ts
View File

@ -253,7 +253,7 @@ export class Mjolnir {
// Setup Web APIs // Setup Web APIs
console.log("Creating Web APIs"); console.log("Creating Web APIs");
const reportManager = new ReportManager(this); const reportManager = new ReportManager(this);
reportManager.on("report.new", this.handleReport.bind(this)); reportManager.on("report.new", this.handleReport);
this.webapis = new WebAPIs(reportManager, this.ruleServer); this.webapis = new WebAPIs(reportManager, this.ruleServer);
// Setup join/leave listener // Setup join/leave listener
@ -1158,9 +1158,9 @@ export class Mjolnir {
return await this.eventRedactionQueue.process(this, roomId); return await this.eventRedactionQueue.process(this, roomId);
} }
private async handleReport(e: { roomId: string, reporterId: string, event: any, reason?: string }) { private async handleReport(roomId: string, reporterId: string, event: any, reason?: string) {
for (const protection of this.enabledProtections) { for (const protection of this.enabledProtections) {
await protection.handleReport(this, e.roomId, e.reporterId, e.event, e.reason); await protection.handleReport(this, roomId, reporterId, event, reason);
} }
} }
} }

2
src/protections/IProtection.ts
View File

@ -39,7 +39,7 @@ export abstract class Protection {
} }
/* /*
* Handle a single reported event from a protected room, to decide if we * Handle a single reported event from a protecte room, to decide if we
* need to respond to it * need to respond to it
*/ */
async handleReport(mjolnir: Mjolnir, roomId: string, reporterId: string, event: any, reason?: string): Promise<any> { async handleReport(mjolnir: Mjolnir, roomId: string, reporterId: string, event: any, reason?: string): Promise<any> {