summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Server.ts2
-rw-r--r--src/middlewares/Authentication.ts2
-rw-r--r--src/routes/api/v8/auth/login.ts2
-rw-r--r--src/routes/api/v8/auth/register.ts2
-rw-r--r--src/routes/api/v8/channels/#CHANNELID/invites.ts8
-rw-r--r--src/routes/api/v8/guilds/index.ts2
-rw-r--r--src/routes/api/v8/users/@me/guilds.ts24
-rw-r--r--src/util/Config.ts2
-rw-r--r--src/util/Event.ts2
9 files changed, 23 insertions, 23 deletions
diff --git a/src/Server.ts b/src/Server.ts

index 0c92e1b7..6861cb1c 100644 --- a/src/Server.ts +++ b/src/Server.ts
@@ -4,7 +4,7 @@ import { Connection } from "mongoose"; import { Server, ServerOptions } from "lambert-server"; import { Authentication, GlobalRateLimit } from "./middlewares/"; import Config from "./util/Config"; -import { db } from "fosscord-server-util"; +import { db } from "./routes/api/v8/channels/#channelid/node_modules/fosscord-server-util"; import i18next from "i18next"; import i18nextMiddleware, { I18next } from "i18next-http-middleware"; import i18nextBackend from "i18next-node-fs-backend"; diff --git a/src/middlewares/Authentication.ts b/src/middlewares/Authentication.ts
index e7650684..7869686d 100644 --- a/src/middlewares/Authentication.ts +++ b/src/middlewares/Authentication.ts
@@ -1,6 +1,6 @@ import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { checkToken } from "fosscord-server-util"; +import { checkToken } from "../routes/api/v8/channels/#channelid/node_modules/fosscord-server-util"; export const NO_AUTHORIZATION_ROUTES = ["/api/v8/auth/login", "/api/v8/auth/register"]; diff --git a/src/routes/api/v8/auth/login.ts b/src/routes/api/v8/auth/login.ts
index acdac1ce..68367120 100644 --- a/src/routes/api/v8/auth/login.ts +++ b/src/routes/api/v8/auth/login.ts
@@ -2,7 +2,7 @@ import { Request, Response, Router } from "express"; import { check, FieldErrors, Length } from "../../../../util/instanceOf"; import bcrypt from "bcrypt"; import jwt from "jsonwebtoken"; -import { User, UserModel } from "fosscord-server-util"; +import { User, UserModel } from "../channels/#channelid/node_modules/fosscord-server-util"; import Config from "../../../../util/Config"; import { adjustEmail } from "./register"; diff --git a/src/routes/api/v8/auth/register.ts b/src/routes/api/v8/auth/register.ts
index 1205c462..c73210c5 100644 --- a/src/routes/api/v8/auth/register.ts +++ b/src/routes/api/v8/auth/register.ts
@@ -1,6 +1,6 @@ import { Request, Response, Router } from "express"; import Config from "../../../../util/Config"; -import { trimSpecial, User, Snowflake, UserModel } from "fosscord-server-util"; +import { trimSpecial, User, Snowflake, UserModel } from "../channels/#channelid/node_modules/fosscord-server-util"; import bcrypt from "bcrypt"; import { check, Email, EMAIL_REGEX, FieldErrors, Length } from "../../../../util/instanceOf"; import "missing-native-js-functions"; diff --git a/src/routes/api/v8/channels/#CHANNELID/invites.ts b/src/routes/api/v8/channels/#CHANNELID/invites.ts
index ae9940d0..ee71d1ee 100644 --- a/src/routes/api/v8/channels/#CHANNELID/invites.ts +++ b/src/routes/api/v8/channels/#CHANNELID/invites.ts
@@ -1,11 +1,11 @@ import { Router, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { check } from "./../../../../../util/instanceOf"; -import { random } from "./../../../../../util/RandomInviteID"; +import { check } from "../../../../../util/instanceOf"; +import { random } from "../../../../../util/RandomInviteID"; import { emitEvent } from "../../../../../util/Event"; -import { InviteCreateSchema } from "./../../../../../schema/Invite"; +import { InviteCreateSchema } from "../../../../../schema/Invite"; import { getPermission, ChannelModel, InviteModel, InviteCreateEvent } from "fosscord-server-util"; @@ -13,7 +13,7 @@ const router: Router = Router(); router.post("/", check(InviteCreateSchema), async (req: Request, res: Response) => { const usID = req.userid; - const chID = BigInt(req.params.CHANNELID); + const chID = BigInt(req.params.channelid); const channel = await ChannelModel.findOne({ id: chID }).exec(); if (!channel || !channel.guild_id) { diff --git a/src/routes/api/v8/guilds/index.ts b/src/routes/api/v8/guilds/index.ts
index 95a2a8b4..a4d53e73 100644 --- a/src/routes/api/v8/guilds/index.ts +++ b/src/routes/api/v8/guilds/index.ts
@@ -17,7 +17,7 @@ import { Ban, GuildBanAddEvent, GuildBanRemoveEvent, -} from "fosscord-server-util"; +} from "../channels/#channelid/node_modules/fosscord-server-util"; import { HTTPError } from "lambert-server"; import { check } from "./../../../../util/instanceOf"; import { GuildCreateSchema, GuildUpdateSchema } from "../../../../schema/Guild"; diff --git a/src/routes/api/v8/users/@me/guilds.ts b/src/routes/api/v8/users/@me/guilds.ts
index d7c1bc25..e205f6ec 100644 --- a/src/routes/api/v8/users/@me/guilds.ts +++ b/src/routes/api/v8/users/@me/guilds.ts
@@ -4,8 +4,8 @@ import { MemberModel, UserModel, GuildDeleteEvent, - GuildMemberRemoveEvent -} from "fosscord-server-util"; + GuildMemberRemoveEvent, +} from "../../channels/#channelid/node_modules/fosscord-server-util"; import { HTTPError } from "lambert-server"; import { emitEvent } from "../../../../../util/Event"; @@ -17,36 +17,36 @@ router.get("/", async (req: Request, res: Response) => { "guilds username discriminator id public_flags avatar" ).exec(); - if (!user) throw new HTTPError("User not found", 404); + if (!user) throw new HTTPError("User not found", 404); var guildIDs = user.guilds || []; var guildsss = await GuildModel.find({ id: { $in: guildIDs } }).exec(); - res.json(guildsss) + res.json(guildsss); }); router.delete("/:id", async (req: Request, res: Response) => { const guildID = BigInt(req.params.id); - if(await GuildModel.findOne({id: guildID, owner_id: req.userid}).exec()) throw new HTTPError("You can't leave your own guild", 400); - var user = await UserModel.findOneAndUpdate({ id: req.userid}, { $pull: { guilds: guildID }}).exec(); - await MemberModel.deleteOne({ id: req.userid, guild_id: guildID}).exec(); + if (await GuildModel.findOne({ id: guildID, owner_id: req.userid }).exec()) + throw new HTTPError("You can't leave your own guild", 400); + var user = await UserModel.findOneAndUpdate({ id: req.userid }, { $pull: { guilds: guildID } }).exec(); + await MemberModel.deleteOne({ id: req.userid, guild_id: guildID }).exec(); await emitEvent({ event: "GUILD_DELETE", data: { - id: guildID + id: guildID, }, - user_id: req.userid + user_id: req.userid, } as GuildDeleteEvent); await emitEvent({ event: "GUILD_MEMBER_REMOVE", data: { guild_id: guildID, - user: user + user: user, }, - guild_id: guildID + guild_id: guildID, } as GuildMemberRemoveEvent); - return res.status(204).send(); }); diff --git a/src/util/Config.ts b/src/util/Config.ts
index 200ec1b2..a2587dda 100644 --- a/src/util/Config.ts +++ b/src/util/Config.ts
@@ -1,4 +1,4 @@ -import { Config } from "fosscord-server-util"; +import { Config } from "../routes/api/v8/channels/#channelid/node_modules/fosscord-server-util"; import crypto from "crypto"; import fs from "fs"; diff --git a/src/util/Event.ts b/src/util/Event.ts
index 39389cbb..06553521 100644 --- a/src/util/Event.ts +++ b/src/util/Event.ts
@@ -1,4 +1,4 @@ -import { Event, EventModel } from "fosscord-server-util"; +import { Event, EventModel } from "../routes/api/v8/channels/#channelid/node_modules/fosscord-server-util"; export async function emitEvent(payload: Omit<Event, "created_at">) { const emitEvent = {