From 1a591b4dcf29204dfc772345c9a73afa14fc19b4 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 13 Feb 2020 23:04:28 -0700 Subject: [PATCH] Revert "Disable ban list server for release" This reverts commit 3e303219a6de475c4fb0904fd3fa0f265437f03c. --- config/default.yaml | 11 +++++++++++ src/index.ts | 9 +++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index de5af7d..01b0b6e 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -83,6 +83,17 @@ protectedRooms: # protected rooms to protect it. protectAllJoinedRooms: false +# An optional server for the Synapse Mjolnir plugin to connect to. This is +# recommended if you're running the Synapse module in a worker environment, +# particularly if you're running a federation reader. +# +# It is not recommended to expose this to the wider internet. Connections +# are over TCP only. +banListServer: + enabled: false + bind: "0.0.0.0" + port: 5186 + # Misc options for command handling and commands commands: # If true, Mjolnir will respond to commands like !help and !ban instead of diff --git a/src/index.ts b/src/index.ts index 07fe394..087c1ea 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,6 +30,7 @@ import BanList from "./models/BanList"; import { Mjolnir } from "./Mjolnir"; import { logMessage } from "./LogProxy"; import { MembershipEvent } from "matrix-bot-sdk/lib/models/events/MembershipEvent"; +import {BanListServer} from "./server/BanListServer"; config.RUNTIME = {client: null}; @@ -95,10 +96,10 @@ LogService.info("index", "Starting bot..."); const bot = new Mjolnir(client, protectedRooms, banLists); - // if (config.banListServer && config.banListServer.enabled) { - // const server = new BanListServer(bot); - // await server.start(); - // } + if (config.banListServer && config.banListServer.enabled) { + const server = new BanListServer(bot); + await server.start(); + } await bot.start(); })();