From fbf587823c3eaa0aff0a2d8c603133546835f9af Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 2 Nov 2019 11:45:57 -0600
Subject: [PATCH] Fix DimensionStore after sequelize-typescript update

---
 package-lock.json        | 47 ++++++++++++----------------------------
 package.json             |  2 +-
 src/db/DimensionStore.ts |  6 ++---
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 22b774b..6f6f075 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4557,8 +4557,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4579,14 +4578,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4601,20 +4598,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4731,8 +4725,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4744,7 +4737,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4759,7 +4751,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4767,14 +4758,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4793,7 +4782,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4874,8 +4862,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4887,7 +4874,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4973,8 +4959,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5010,7 +4995,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5030,7 +5014,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5074,14 +5057,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -10542,9 +10523,9 @@
       "integrity": "sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA=="
     },
     "sequelize-typescript": {
-      "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-1.0.0-beta.3.tgz",
-      "integrity": "sha512-JICyUiRJSUqYIbGgzrWHJBfWSxhL6eTXqcPKuEB7aB9zKaAcyuOxVGWpiUa9rJHg2M2wWZGPfHdcFJM0KDRJGg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-1.0.0.tgz",
+      "integrity": "sha512-oXyvHRTOyI8sJettpISL5LO30GaMMrLqzxiLCy6MjUmBJdaQDpdjn7ofge4J87MSdw+YPzkjrJLogMc9ONY2Tg==",
       "requires": {
         "glob": "7.1.2"
       },
diff --git a/package.json b/package.json
index c99e499..c5fb579 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "require-dir-all": "^0.4.15",
     "semver": "^6.0.0",
     "sequelize": "^5.15.1",
-    "sequelize-typescript": "^1.0.0-beta.3",
+    "sequelize-typescript": "^1.0.0",
     "sharp": "^0.21.1",
     "split-host": "^0.1.1",
     "spotify-uri": "^1.0.0",
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index 10ec77c..b0cda57 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -1,4 +1,4 @@
-import { Model, Sequelize } from "sequelize-typescript";
+import { Sequelize } from "sequelize-typescript";
 import config from "../config";
 import { LogService } from "matrix-js-snippets";
 import User from "./models/User";
@@ -43,7 +43,7 @@ class _DimensionStore {
             password: "",
             logging: i => LogService.verbose("DimensionStore [SQL]", i)
         });
-        this.sequelize.addModels(<Array<typeof Model>>[
+        this.sequelize.addModels([
             User,
             UserScalarToken,
             Upstream,
@@ -90,4 +90,4 @@ class _DimensionStore {
     }
 }
 
-export const DimensionStore = new _DimensionStore();
\ No newline at end of file
+export const DimensionStore = new _DimensionStore();