Merge pull request #157 from Half-Shot/hs/fix-user-commands

Fix UserClientTool - #152, #153 and #154

src/store.ts

@@ -99,7 +99,7 @@ export class DiscordStore {
     return Promise.all([
         this.db.runAsync(
           `
-          INSERT INTO user_id_discord_id (discord_id,user_id) VALUES ($userId,$discordId);
+          INSERT INTO user_id_discord_id (discord_id,user_id) VALUES ($discordId,$userId);
           `
         , {
             $userId: userId,
@@ -121,7 +121,7 @@ export class DiscordStore {
 
   public delete_user_token(discordId: string): Promise<null> {
     log.silly("SQL", "delete_user_token => %s", discordId);
-    return this.db.execAsync(
+    return this.db.runAsync(
       `
       DELETE FROM user_id_discord_id WHERE discord_id = $id;
       DELETE FROM discord_id_token WHERE discord_id = $id;

tools/userClientTools.ts

@@ -5,6 +5,7 @@ import * as args from "command-line-args";
 import * as usage from "command-line-usage";
 import * as readline from "readline";
 import * as Bluebird from "bluebird";
+import * as process from "process";
 import {DiscordClientFactory} from "../src/clientfactory";
 
 import { DiscordBridgeConfig } from "../src/config";
@@ -79,16 +80,20 @@ Please enter your Discord Token
         rl.close();
         addUserToken(userid, token).then(() => {
           log.info("tool", "Completed successfully");
+          process.exit(0);
         }).catch((err) => {
           log.info("tool", "Failed to add, $s", err);
+          process.exit(1);
         });
       });
     } else if (options.remove) {
       rl.close();
       discordstore.delete_user_token(userid).then(() => {
         log.info("tool", "Completed successfully");
+        process.exit(0);
       }).catch((err) => {
         log.info("tool", "Failed to delete, $s", err);
+        process.exit(1);
       });
     }
   });