Merge branch 'develop' of https://github.com/scrufulufugus/matrix-appservice-discord into develop

tools/addRoomsToDirectory.ts

@@ -67,7 +67,7 @@ if (options.help) {
     process.exit(0);
 }
 
-const {store, appservice} = ToolsHelper.getToolDependencies(options.config, options.registration);
+const {store, appservice} = ToolsHelper.getToolDependencies(options.config, options.registration, true);
 
 async function run(): Promise<void> {
     try {

tools/adminme.ts

@@ -95,7 +95,7 @@ if (!options.userid) {
     process.exit(1);
 }
 
-const {appservice} = ToolsHelper.getToolDependencies(options.config, options.reg, false);
+const {appservice} = ToolsHelper.getToolDependencies(options.config, options.registration, false);
 
 async function run() {
     try {

tools/chanfix.ts

@@ -67,7 +67,7 @@ if (options.help) {
 }
 
 async function run() {
-    const {store, appservice, config} = ToolsHelper.getToolDependencies(options.config);
+    const {store, appservice, config} = ToolsHelper.getToolDependencies(options.config, options.registration);
     await store!.init();
     const discordbot = new DiscordBot(config, appservice, store!);
     await discordbot.init();

tools/ghostfix.ts

@@ -76,7 +76,7 @@ if (options.help) {
 }
 
 async function run() {
-    const {store, appservice, config} = ToolsHelper.getToolDependencies(options.config);
+    const {appservice, config, store} = ToolsHelper.getToolDependencies(options.config, options.registration);
     await store!.init();
     const discordbot = new DiscordBot(config, appservice, store!);
     await discordbot.init();

tools/toolshelper.ts

@@ -28,7 +28,7 @@ export class ToolsHelper {
             registration: registration as IAppserviceRegistration,
         });
 
-        const store = needsStore ? new DiscordStore(config.database ? config.database.filename : "discord.db") : null;
+        const store = needsStore ? new DiscordStore(config.database) : null;
         return {
             appservice,
             config,