summary refs log tree commit diff
path: root/src/routes/api/v8
diff options
context:
space:
mode:
authorxnacly <matteogropp@gmail.com>2021-02-05 17:39:09 +0100
committerxnacly <matteogropp@gmail.com>2021-02-05 17:39:09 +0100
commit7058118de61bc944a6a2c0b37925c13f700507f9 (patch)
tree68b9cff6e35a3741137a670e49cc32d68d8d9f81 /src/routes/api/v8
parentadded Member model & updated Guild model (diff)
parent:art: use discord-server-util (diff)
downloadserver-7058118de61bc944a6a2c0b37925c13f700507f9.tar.xz
Merge branch 'master' of https://github.com/discord-open-source/discord-api into master
Diffstat (limited to 'src/routes/api/v8')
-rw-r--r--src/routes/api/v8/auth/login.ts2
-rw-r--r--src/routes/api/v8/auth/register.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/routes/api/v8/auth/login.ts b/src/routes/api/v8/auth/login.ts

index 6820c399..9cccbca5 100644 --- a/src/routes/api/v8/auth/login.ts +++ b/src/routes/api/v8/auth/login.ts
@@ -1,11 +1,11 @@ import { Request, Response, Router } from "express"; -import db from "../../../../util/Database"; import { check, FieldErrors, Length } from "../../../../util/instanceOf"; import bcrypt from "bcrypt"; import jwt from "jsonwebtoken"; import Config from "../../../../util/Config"; import { User } from "../../../../models/User"; import { adjustEmail } from "./register"; +import { db } from "discord-server-util"; const router: Router = Router(); export default router; diff --git a/src/routes/api/v8/auth/register.ts b/src/routes/api/v8/auth/register.ts
index 5c163890..b5800d1f 100644 --- a/src/routes/api/v8/auth/register.ts +++ b/src/routes/api/v8/auth/register.ts
@@ -1,6 +1,6 @@ import { NextFunction, Request, Response, Router } from "express"; import Config from "../../../../util/Config"; -import db from "../../../../util/Database"; +import { db } from "discord-server-util"; import bcrypt from "bcrypt"; import { check, Email, EMAIL_REGEX, FieldErrors, Length } from "../../../../util/instanceOf"; import { Snowflake } from "../../../../util/Snowflake";