From c0e00d04c061351317de93a88dde4d49f5e99630 Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Thu, 18 Aug 2022 06:18:00 +0200
Subject: Add fallback to bcryptjs, make canvas optional

---
 src/api/routes/users/@me/delete.ts    | 1 -
 src/api/routes/users/@me/disable.ts   | 1 -
 src/api/routes/users/@me/index.ts     | 1 -
 src/api/routes/users/@me/mfa/codes.ts | 1 -
 src/plugins/PluginIndex.ts            | 5 +++--
 5 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts
index c3caf327..66b0bfc1 100644
--- a/src/api/routes/users/@me/delete.ts
+++ b/src/api/routes/users/@me/delete.ts
@@ -1,6 +1,5 @@
 import { route } from "@fosscord/api";
 import { HTTPError, Member, User } from "@fosscord/util";
-import bcrypt from "bcrypt";
 import { Request, Response, Router } from "express";
 
 let bcrypt: any;
diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts
index e47ace91..05976908 100644
--- a/src/api/routes/users/@me/disable.ts
+++ b/src/api/routes/users/@me/disable.ts
@@ -1,6 +1,5 @@
 import { route } from "@fosscord/api";
 import { User } from "@fosscord/util";
-import bcrypt from "bcrypt";
 import { Request, Response, Router } from "express";
 
 let bcrypt: any;
diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index 7ee0a178..563300dc 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -12,7 +12,6 @@ import {
 	UserModifySchema,
 	UserUpdateEvent
 } from "@fosscord/util";
-import bcrypt from "bcrypt";
 import { Request, Response, Router } from "express";
 
 let bcrypt: any;
diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts
index 956ac2ae..f3852013 100644
--- a/src/api/routes/users/@me/mfa/codes.ts
+++ b/src/api/routes/users/@me/mfa/codes.ts
@@ -1,5 +1,4 @@
 import { BackupCode, Config, FieldErrors, generateMfaBackupCodes, MfaCodesSchema, User } from "@fosscord/util";
-import bcrypt from "bcrypt";
 import { Request, Response, Router } from "express";
 import { route } from "../../../..";
 
diff --git a/src/plugins/PluginIndex.ts b/src/plugins/PluginIndex.ts
index 2688d0bf..502161a1 100644
--- a/src/plugins/PluginIndex.ts
+++ b/src/plugins/PluginIndex.ts
@@ -1,5 +1,6 @@
+import { Plugin } from "util/plugin";
 import * as example_plugin from "./example-plugin/TestPlugin";
 
 export const PluginIndex: any = {
-	"example-plugin": new example_plugin.default()
-};
+    "example-plugin": new example_plugin.default(),
+};
\ No newline at end of file
-- 
cgit 1.5.1