From ce8d04b6e9e6510bf44c1597d8fe604eb949a5b3 Mon Sep 17 00:00:00 2001 From: ZerataX <mail@zera.tax> Date: Wed, 1 Apr 2020 13:19:08 +0200 Subject: [PATCH] fix tool scripts tools/toolshelper.ts: Objects need to be assigned instead of casted tools/adminme.ts: fix typing error (room{I=>i}d) --- tools/adminme.ts | 5 ++--- tools/toolshelper.ts | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/adminme.ts b/tools/adminme.ts index f8b2818..1504d0e 100644 --- a/tools/adminme.ts +++ b/tools/adminme.ts @@ -100,9 +100,8 @@ const {appservice} = ToolsHelper.getToolDependencies(options.config, options.reg async function run() { try { const powerLevels = (await appservice.botIntent.underlyingClient.getRoomStateEvent( - options.roomId, "m.room.power_levels", "", - )).content; - + options.roomid, "m.room.power_levels", "", + )); powerLevels.users[options.userid] = options.power; await appservice.botIntent.underlyingClient.sendStateEvent( diff --git a/tools/toolshelper.ts b/tools/toolshelper.ts index 5e4dd35..1449f13 100644 --- a/tools/toolshelper.ts +++ b/tools/toolshelper.ts @@ -12,7 +12,8 @@ export class ToolsHelper { config: DiscordBridgeConfig, } { const registration = yaml.safeLoad(fs.readFileSync(regFile, "utf8")); - const config: DiscordBridgeConfig = yaml.safeLoad(fs.readFileSync(configFile, "utf8")) as DiscordBridgeConfig; + const config: DiscordBridgeConfig = Object.assign( + new DiscordBridgeConfig(), yaml.safeLoad(fs.readFileSync(configFile, "utf8"))); config.applyEnvironmentOverrides(process.env); if (registration === null) { throw Error("Failed to parse registration file"); -- GitLab