Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into slowcord

Browse Source
This commit is contained in:
Madeline 2022-07-09 19:07:51 +10:00
commit 1d7b9329be
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/routes/channels/#channel_id/messages/index.ts
View File

@ -17,7 +17,7 @@ import {
} from "@fosscord/util"; } from "@fosscord/util";
import { HTTPError } from "lambert-server"; import { HTTPError } from "lambert-server";
import { handleMessage, postHandleMessage, route } from "@fosscord/api"; import { handleMessage, postHandleMessage, route } from "@fosscord/api";
import multer, { Multer } from "multer"; import multer from "multer";
import { FindManyOptions, LessThan, MoreThan } from "typeorm"; import { FindManyOptions, LessThan, MoreThan } from "typeorm";
import { URL } from "url"; import { URL } from "url";

35
util/src/entities/Config.ts
View File

@ -235,30 +235,30 @@ export const DefaultConfigOptions: ConfigValue = {
}, },
limits: { limits: {
user: { user: {
maxGuilds: 100, maxGuilds: 1048576,
maxUsername: 32, maxUsername: 127,
maxFriends: 1000, maxFriends: 5000,
}, },
guild: { guild: {
maxRoles: 250, maxRoles: 1000,
maxEmojis: 50, // TODO: max emojis per guild per nitro level maxEmojis: 2000,
maxMembers: 250000, maxMembers: 25000000,
maxChannels: 500, maxChannels: 65535,
maxChannelsInCategory: 50, maxChannelsInCategory: 65535,
hideOfflineMember: 1000, hideOfflineMember: 3,
}, },
message: { message: {
maxCharacters: 2000, maxCharacters: 1048576,
maxTTSCharacters: 200, maxTTSCharacters: 160,
maxReactions: 20, maxReactions: 2048,
maxAttachmentSize: 8388608, maxAttachmentSize: 1024 * 1024 * 1024,
maxEmbedDownloadSize: 1024 * 1024 * 5, maxEmbedDownloadSize: 1024 * 1024 * 5,
maxBulkDelete: 100, maxBulkDelete: 1000,
}, },
channel: { channel: {
maxPins: 50, maxPins: 500,
maxTopic: 1024, maxTopic: 1024,
maxWebhooks: 10, maxWebhooks: 100,
}, },
rate: { rate: {
disabled: true, disabled: true,
@ -267,9 +267,8 @@ export const DefaultConfigOptions: ConfigValue = {
window: 5, window: 5,
}, },
global: { global: {
count: 20, count: 250,
window: 5, window: 5,
bot: 250,
}, },
error: { error: {
count: 10, count: 10,