summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-03-23 22:08:40 +0100
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-03-23 22:08:40 +0100
commite67ca0a1636b5536a68499189f0a7eb2817bcbaf (patch)
tree46a62b8f4f91d40e8146bc092af4359e86da6eb5 /src
parent:bug: fix message post (diff)
parent:construction: shorten relative paths with @shortcut (diff)
downloadserver-e67ca0a1636b5536a68499189f0a7eb2817bcbaf.tar.xz
Merge branch 'master' of https://github.com/discord-open-source/discord-api
Diffstat (limited to 'src')
-rw-r--r--src/routes/api/v8/channels/#channel_id/invites.ts8
-rw-r--r--src/routes/api/v8/channels/#channel_id/messages/bulk-delete.ts6
-rw-r--r--src/routes/api/v8/channels/#channel_id/messages/index.ts8
-rw-r--r--src/routes/api/v8/guilds/#id/bans.ts12
-rw-r--r--src/util/Config.ts8
5 files changed, 24 insertions, 18 deletions
diff --git a/src/routes/api/v8/channels/#channel_id/invites.ts b/src/routes/api/v8/channels/#channel_id/invites.ts

index 0e09c00c..e3f2b77e 100644 --- a/src/routes/api/v8/channels/#channel_id/invites.ts +++ b/src/routes/api/v8/channels/#channel_id/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 { emitEvent } from "../../../../../util/Event"; +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"; diff --git a/src/routes/api/v8/channels/#channel_id/messages/bulk-delete.ts b/src/routes/api/v8/channels/#channel_id/messages/bulk-delete.ts
index c805cf08..dc7d5f66 100644 --- a/src/routes/api/v8/channels/#channel_id/messages/bulk-delete.ts +++ b/src/routes/api/v8/channels/#channel_id/messages/bulk-delete.ts
@@ -1,9 +1,9 @@ import { Router } from "express"; import { ChannelModel, getPermission, MessageDeleteBulkEvent, MessageModel } from "fosscord-server-util"; import { HTTPError } from "lambert-server"; -import Config from "../../../../../../util/Config"; -import { emitEvent } from "../../../../../../util/Event"; -import { check } from "../../../../../../util/instanceOf"; +import Config from "@util/Config"; +import { emitEvent } from "@util/Event"; +import { check } from "@util/instanceOf"; const router: Router = Router(); diff --git a/src/routes/api/v8/channels/#channel_id/messages/index.ts b/src/routes/api/v8/channels/#channel_id/messages/index.ts
index 437ea3fd..b2eb8ef4 100644 --- a/src/routes/api/v8/channels/#channel_id/messages/index.ts +++ b/src/routes/api/v8/channels/#channel_id/messages/index.ts
@@ -1,11 +1,11 @@ import { Router } from "express"; import { ChannelModel, ChannelType, getPermission, Message, MessageCreateEvent, MessageModel, Snowflake } from "fosscord-server-util"; import { HTTPError } from "lambert-server"; -import { MessageCreateSchema } from "../../../../../../schema/Message"; -import { check, instanceOf, Length } from "../../../../../../util/instanceOf"; -import { PublicUserProjection } from "../../../../../../util/User"; +import { MessageCreateSchema } from "@schema/Message"; +import { check, instanceOf, Length } from "@util/instanceOf"; +import { PublicUserProjection } from "@util/User"; import multer from "multer"; -import { emitEvent } from "../../../../../../util/Event"; +import { emitEvent } from "@util/Event"; const router: Router = Router(); export default router; diff --git a/src/routes/api/v8/guilds/#id/bans.ts b/src/routes/api/v8/guilds/#id/bans.ts
index 5133ee3c..9fbcf01c 100644 --- a/src/routes/api/v8/guilds/#id/bans.ts +++ b/src/routes/api/v8/guilds/#id/bans.ts
@@ -1,12 +1,12 @@ import { Request, Response, Router } from "express"; import { BanModel, getPermission, GuildBanAddEvent, GuildBanRemoveEvent, GuildModel } from "fosscord-server-util"; import { HTTPError } from "lambert-server"; -import { getIpAdress } from "../../../../../middlewares/GlobalRateLimit"; -import { BanCreateSchema } from "../../../../../schema/Ban"; -import { emitEvent } from "../../../../../util/Event"; -import { check } from "../../../../../util/instanceOf"; -import { removeMember } from "../../../../../util/Member"; -import { getPublicUser } from "../../../../../util/User"; +import { getIpAdress } from "@middlewares/GlobalRateLimit"; +import { BanCreateSchema } from "@schema/Ban"; +import { emitEvent } from "@util/Event"; +import { check } from "@util/instanceOf"; +import { removeMember } from "@util/Member"; +import { getPublicUser } from "@util/User"; const router: Router = Router(); diff --git a/src/util/Config.ts b/src/util/Config.ts
index cd225407..a9cbddde 100644 --- a/src/util/Config.ts +++ b/src/util/Config.ts
@@ -1,4 +1,4 @@ -import { Config } from "fosscord-server-util"; +import { Config, Snowflake } from "fosscord-server-util"; import crypto from "crypto"; import fs from "fs"; @@ -22,6 +22,9 @@ export interface RateLimit { } export interface DefaultOptions { + general: { + instance_id: bigint; + }; permissions: { user: { createGuilds: boolean; @@ -102,6 +105,9 @@ export interface DefaultOptions { } export const DefaultOptions: DefaultOptions = { + general: { + instance_id: Snowflake.generate(), + }, permissions: { user: { createGuilds: true,