summary refs log tree commit diff
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2022-08-18 06:18:00 +0200
committerTheArcaneBrony <myrainbowdash949@gmail.com>2022-09-04 10:48:54 +0200
commitc0e00d04c061351317de93a88dde4d49f5e99630 (patch)
tree49e505f18e6cd2d7fea6fd63158e30411872810a
parentCleanup, reformat, fix some todos, git hook (diff)
downloadserver-c0e00d04c061351317de93a88dde4d49f5e99630.tar.xz
Add fallback to bcryptjs, make canvas optional
-rw-r--r--src/api/routes/users/@me/delete.ts1
-rw-r--r--src/api/routes/users/@me/disable.ts1
-rw-r--r--src/api/routes/users/@me/index.ts1
-rw-r--r--src/api/routes/users/@me/mfa/codes.ts1
-rw-r--r--src/plugins/PluginIndex.ts5
5 files changed, 3 insertions, 6 deletions
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