📝 #CHANNELID -> #channelid

This commit is contained in:
Flam3rboy 2021-02-22 08:37:10 +01:00
parent 5a505f331a
commit eb181ae41d
9 changed files with 23 additions and 23 deletions

View File

@ -4,7 +4,7 @@ import { Connection } from "mongoose";
import { Server, ServerOptions } from "lambert-server"; import { Server, ServerOptions } from "lambert-server";
import { Authentication, GlobalRateLimit } from "./middlewares/"; import { Authentication, GlobalRateLimit } from "./middlewares/";
import Config from "./util/Config"; 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 i18next from "i18next";
import i18nextMiddleware, { I18next } from "i18next-http-middleware"; import i18nextMiddleware, { I18next } from "i18next-http-middleware";
import i18nextBackend from "i18next-node-fs-backend"; import i18nextBackend from "i18next-node-fs-backend";

View File

@ -1,6 +1,6 @@
import { NextFunction, Request, Response } from "express"; import { NextFunction, Request, Response } from "express";
import { HTTPError } from "lambert-server"; 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"]; export const NO_AUTHORIZATION_ROUTES = ["/api/v8/auth/login", "/api/v8/auth/register"];

View File

@ -2,7 +2,7 @@ import { Request, Response, Router } from "express";
import { check, FieldErrors, Length } from "../../../../util/instanceOf"; import { check, FieldErrors, Length } from "../../../../util/instanceOf";
import bcrypt from "bcrypt"; import bcrypt from "bcrypt";
import jwt from "jsonwebtoken"; 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 Config from "../../../../util/Config";
import { adjustEmail } from "./register"; import { adjustEmail } from "./register";

View File

@ -1,6 +1,6 @@
import { Request, Response, Router } from "express"; import { Request, Response, Router } from "express";
import Config from "../../../../util/Config"; 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 bcrypt from "bcrypt";
import { check, Email, EMAIL_REGEX, FieldErrors, Length } from "../../../../util/instanceOf"; import { check, Email, EMAIL_REGEX, FieldErrors, Length } from "../../../../util/instanceOf";
import "missing-native-js-functions"; import "missing-native-js-functions";

View File

@ -1,11 +1,11 @@
import { Router, Request, Response } from "express"; import { Router, Request, Response } from "express";
import { HTTPError } from "lambert-server"; import { HTTPError } from "lambert-server";
import { check } from "./../../../../../util/instanceOf"; import { check } from "../../../../../util/instanceOf";
import { random } from "./../../../../../util/RandomInviteID"; import { random } from "../../../../../util/RandomInviteID";
import { emitEvent } from "../../../../../util/Event"; import { emitEvent } from "../../../../../util/Event";
import { InviteCreateSchema } from "./../../../../../schema/Invite"; import { InviteCreateSchema } from "../../../../../schema/Invite";
import { getPermission, ChannelModel, InviteModel, InviteCreateEvent } from "fosscord-server-util"; 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) => { router.post("/", check(InviteCreateSchema), async (req: Request, res: Response) => {
const usID = req.userid; const usID = req.userid;
const chID = BigInt(req.params.CHANNELID); const chID = BigInt(req.params.channelid);
const channel = await ChannelModel.findOne({ id: chID }).exec(); const channel = await ChannelModel.findOne({ id: chID }).exec();
if (!channel || !channel.guild_id) { if (!channel || !channel.guild_id) {

View File

@ -17,7 +17,7 @@ import {
Ban, Ban,
GuildBanAddEvent, GuildBanAddEvent,
GuildBanRemoveEvent, GuildBanRemoveEvent,
} from "fosscord-server-util"; } from "../channels/#channelid/node_modules/fosscord-server-util";
import { HTTPError } from "lambert-server"; import { HTTPError } from "lambert-server";
import { check } from "./../../../../util/instanceOf"; import { check } from "./../../../../util/instanceOf";
import { GuildCreateSchema, GuildUpdateSchema } from "../../../../schema/Guild"; import { GuildCreateSchema, GuildUpdateSchema } from "../../../../schema/Guild";

View File

@ -4,8 +4,8 @@ import {
MemberModel, MemberModel,
UserModel, UserModel,
GuildDeleteEvent, GuildDeleteEvent,
GuildMemberRemoveEvent GuildMemberRemoveEvent,
} from "fosscord-server-util"; } from "../../channels/#channelid/node_modules/fosscord-server-util";
import { HTTPError } from "lambert-server"; import { HTTPError } from "lambert-server";
import { emitEvent } from "../../../../../util/Event"; import { emitEvent } from "../../../../../util/Event";
@ -21,32 +21,32 @@ router.get("/", async (req: Request, res: Response) => {
var guildIDs = user.guilds || []; var guildIDs = user.guilds || [];
var guildsss = await GuildModel.find({ id: { $in: guildIDs } }).exec(); var guildsss = await GuildModel.find({ id: { $in: guildIDs } }).exec();
res.json(guildsss) res.json(guildsss);
}); });
router.delete("/:id", async (req: Request, res: Response) => { router.delete("/:id", async (req: Request, res: Response) => {
const guildID = BigInt(req.params.id); 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); if (await GuildModel.findOne({ id: guildID, owner_id: req.userid }).exec())
var user = await UserModel.findOneAndUpdate({ id: req.userid}, { $pull: { guilds: guildID }}).exec(); throw new HTTPError("You can't leave your own guild", 400);
await MemberModel.deleteOne({ id: req.userid, guild_id: guildID}).exec(); var user = await UserModel.findOneAndUpdate({ id: req.userid }, { $pull: { guilds: guildID } }).exec();
await MemberModel.deleteOne({ id: req.userid, guild_id: guildID }).exec();
await emitEvent({ await emitEvent({
event: "GUILD_DELETE", event: "GUILD_DELETE",
data: { data: {
id: guildID id: guildID,
}, },
user_id: req.userid user_id: req.userid,
} as GuildDeleteEvent); } as GuildDeleteEvent);
await emitEvent({ await emitEvent({
event: "GUILD_MEMBER_REMOVE", event: "GUILD_MEMBER_REMOVE",
data: { data: {
guild_id: guildID, guild_id: guildID,
user: user user: user,
}, },
guild_id: guildID guild_id: guildID,
} as GuildMemberRemoveEvent); } as GuildMemberRemoveEvent);
return res.status(204).send(); return res.status(204).send();
}); });

View File

@ -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 crypto from "crypto";
import fs from "fs"; import fs from "fs";

View File

@ -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">) { export async function emitEvent(payload: Omit<Event, "created_at">) {
const emitEvent = { const emitEvent = {