Merge branch 'mc'

data-manager/DataManager.js

@@ -38,6 +38,7 @@ const UserDialog_1 = require("./entities/UserDialog");
 const RandomDuelScore_1 = require("./entities/RandomDuelScore");
 const jszip_1 = __importDefault(require("jszip"));
 const fs = __importStar(require("fs"));
+require("reflect-metadata");
 class DataManager {
     constructor(config, log) {
         this.config = config;

data-manager/DataManager.ts

@@ -15,6 +15,7 @@ import {UserDialog} from "./entities/UserDialog";
 import {RandomDuelScore} from "./entities/RandomDuelScore";
 import JSZip from "jszip";
 import * as fs from "fs";
+import "reflect-metadata";
 
 interface BasePlayerInfo {
 	name: string;

package.json

@@ -30,6 +30,7 @@
     "pg": "^6.4.2",
     "q": "^1.5.1",
     "querystring": "^0.2.0",
+    "reflect-metadata": "^0.1.13",
     "request": "latest",
     "sqlite3": "latest",
     "typeorm": "^0.2.29",

ygopro-server.coffee

@@ -363,8 +363,8 @@ init = () ->
       settings.modules.cloud_replay.enabled = false
       await setting_save(settings)
       log.warn("Cloud replay cannot be enabled because no MySQL.")
-    if settings.modules.tournament_mode.enable_recover.enabled
-      settings.modules.tournament_mode.enable_recover.enabled = false
+    if settings.modules.tournament_mode.enable_recover
+      settings.modules.tournament_mode.enable_recover = false
       await setting_save(settings)
       log.warn("Recover mode cannot be enabled because no MySQL.")
     if settings.modules.chat_color.enabled

ygopro-server.js

@@ -479,8 +479,8 @@
         await setting_save(settings);
         log.warn("Cloud replay cannot be enabled because no MySQL.");
       }
-      if (settings.modules.tournament_mode.enable_recover.enabled) {
-        settings.modules.tournament_mode.enable_recover.enabled = false;
+      if (settings.modules.tournament_mode.enable_recover) {
+        settings.modules.tournament_mode.enable_recover = false;
         await setting_save(settings);
         log.warn("Recover mode cannot be enabled because no MySQL.");
       }