diff --git a/Dockerfile b/Dockerfile index 1948299..08781f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:alpine +FROM node:14-alpine COPY . /tmp/src RUN cd /tmp/src \ && yarn install \ diff --git a/README.md b/README.md index 5d5f461..e4fffa5 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ docker run --rm -it -v /etc/mjolnir:/data matrixdotorg/mjolnir:latest ## Build it (alternative installation) -This bot requires `yarn` and Node 10. +This bot requires `yarn` and Node 14. ```bash git clone https://github.com/matrix-org/mjolnir.git diff --git a/package.json b/package.json index 7df5830..311466d 100644 --- a/package.json +++ b/package.json @@ -40,5 +40,8 @@ "js-yaml": "^4.1.0", "jsdom": "^16.6.0", "matrix-bot-sdk": "^v0.6.0-beta.4" + }, + "engines": { + "node": ">=14.0.0" } } diff --git a/src/report/ReportManager.ts b/src/report/ReportManager.ts index 0b7c66e..74fd124 100644 --- a/src/report/ReportManager.ts +++ b/src/report/ReportManager.ts @@ -142,6 +142,11 @@ export class ReportManager { let initialNoticeReport: IReport | undefined, confirmationReport: IReportWithAction | undefined; try { let originalEvent = await this.mjolnir.client.getEvent(roomId, relation.event_id); + if (originalEvent.sender !== await this.mjolnir.client.getUserId()) { + // Let's not handle reactions to events we didn't send as + // some setups have two or more Mjolnir's in the same management room. + return; + } if (!("content" in originalEvent)) { return; }