summary refs log tree commit diff
path: root/util/src/entities
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-09-23 17:03:36 +0200
committerGitHub <noreply@github.com>2021-09-23 17:03:36 +0200
commit5823f8efb4d1335281b64bfcaddf33bd9453cf08 (patch)
tree08c4420554b707d7207da6c2a9f15b4fcdf87e61 /util/src/entities
parentMerge pull request #394 from ChrisChrome/erlpack-fix (diff)
parent:bug: prepare/postinstall only works for packages not local npm install (diff)
downloadserver-5823f8efb4d1335281b64bfcaddf33bd9453cf08.tar.xz
Merge pull request #372 from fosscord/unittests
Automatic Unittests + documentation
Diffstat (limited to 'util/src/entities')
-rw-r--r--util/src/entities/Config.ts2
-rw-r--r--util/src/entities/User.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts

index f969b6bb..a460b437 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts
@@ -77,6 +77,7 @@ export interface ConfigValue { maxWebhooks: number; }; rate: { + disabled: boolean; ip: Omit<RateLimitOptions, "bot_count">; global: RateLimitOptions; error: RateLimitOptions; @@ -188,6 +189,7 @@ export const DefaultConfigOptions: ConfigValue = { maxWebhooks: 10, }, rate: { + disabled: true, ip: { count: 500, window: 5, diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 4c86b2d8..b5c2c308 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts
@@ -161,15 +161,13 @@ export class User extends BaseClass { } static async getPublicUser(user_id: string, opts?: FindOneOptions<User>) { - const user = await User.findOne( + return await User.findOneOrFail( { id: user_id }, { ...opts, select: [...PublicUserProjection, ...(opts?.select || [])], } ); - if (!user) throw new HTTPError("User not found", 404); - return user; } }