diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-07-09 19:07:51 +1000 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-07-09 19:07:51 +1000 |
| commit | e38cb9fa3a2ba1281ce49b137817436af5730920 (patch) | |
| tree | 78fcfb5d64aea106052ce2b33ed746626b9153b4 | |
| parent | Redirect to custom login page when client navigates to /login or /register (diff) | |
| parent | Relax some of the limits (diff) | |
| download | server-e38cb9fa3a2ba1281ce49b137817436af5730920.tar.xz | |
Merge branch 'master' into slowcord
| -rw-r--r-- | api/src/routes/channels/#channel_id/messages/index.ts | 2 | ||||
| -rw-r--r-- | util/src/entities/Config.ts | 35 |
2 files changed, 18 insertions, 19 deletions
diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts index fc2e4575..54e6edcc 100644 --- a/api/src/routes/channels/#channel_id/messages/index.ts +++ b/api/src/routes/channels/#channel_id/messages/index.ts @@ -17,7 +17,7 @@ import { } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import { handleMessage, postHandleMessage, route } from "@fosscord/api"; -import multer, { Multer } from "multer"; +import multer from "multer"; import { FindManyOptions, LessThan, MoreThan } from "typeorm"; import { URL } from "url"; diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 3726e122..9eca84ad 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -235,30 +235,30 @@ export const DefaultConfigOptions: ConfigValue = { }, limits: { user: { - maxGuilds: 100, - maxUsername: 32, - maxFriends: 1000, + maxGuilds: 1048576, + maxUsername: 127, + maxFriends: 5000, }, guild: { - maxRoles: 250, - maxEmojis: 50, // TODO: max emojis per guild per nitro level - maxMembers: 250000, - maxChannels: 500, - maxChannelsInCategory: 50, - hideOfflineMember: 1000, + maxRoles: 1000, + maxEmojis: 2000, + maxMembers: 25000000, + maxChannels: 65535, + maxChannelsInCategory: 65535, + hideOfflineMember: 3, }, message: { - maxCharacters: 2000, - maxTTSCharacters: 200, - maxReactions: 20, - maxAttachmentSize: 8388608, + maxCharacters: 1048576, + maxTTSCharacters: 160, + maxReactions: 2048, + maxAttachmentSize: 1024 * 1024 * 1024, maxEmbedDownloadSize: 1024 * 1024 * 5, - maxBulkDelete: 100, + maxBulkDelete: 1000, }, channel: { - maxPins: 50, + maxPins: 500, maxTopic: 1024, - maxWebhooks: 10, + maxWebhooks: 100, }, rate: { disabled: true, @@ -267,9 +267,8 @@ export const DefaultConfigOptions: ConfigValue = { window: 5, }, global: { - count: 20, + count: 250, window: 5, - bot: 250, }, error: { count: 10, |