Skip to content

Commit e2a5e2d

Browse files
Fix error logging, dont use simple-array
1 parent 16dcd33 commit e2a5e2d

13 files changed

Lines changed: 76 additions & 20 deletions

src/api/middlewares/ErrorHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export function ErrorHandler(error: Error & { type?: string }, req: Request, res
5050
code = 50109;
5151
message = "The request body contains invalid JSON.";
5252
} else {
53-
console.error(`[Error] ${code} ${req.url}\n`, errors, "\nbody:", req.body);
53+
console.error(`[Error] ${code} ${req.url}\n`, errors ?? error, "\nbody:", req.body);
5454

5555
if (req.server?.options?.production) {
5656
// don't expose internal errors to the user, instead human errors should be thrown as HTTPError

src/util/entities/Application.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class Application extends BaseClass {
6161
@Column()
6262
flags: number = 0;
6363

64-
@Column({ type: "simple-array", nullable: true })
64+
@Column({ type: "varchar", nullable: true })
6565
redirect_uris: string[] = [];
6666

6767
@Column({ nullable: true })
@@ -92,7 +92,7 @@ export class Application extends BaseClass {
9292
@OneToOne(() => User, { onDelete: "CASCADE" })
9393
bot?: User;
9494

95-
@Column({ type: "simple-array", nullable: true })
95+
@Column({ type: "varchar", array: true, nullable: true })
9696
tags?: string[];
9797

9898
@Column({ nullable: true })
@@ -120,7 +120,7 @@ export class Application extends BaseClass {
120120

121121
//just for us
122122

123-
//@Column({ type: "simple-array", nullable: true })
123+
//@Column({ type: "varchar", array: true, nullable: true })
124124
//rpc_origins?: string[];
125125

126126
//@Column({ nullable: true })

src/util/entities/AutomodRule.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ export class AutomodRule extends BaseClass {
3535
@Column()
3636
event_type: AutomodRuleEventType;
3737

38-
@Column({ type: "simple-array" })
38+
@Column({ type: "int8", array: true })
3939
exempt_channels: string[];
4040

41-
@Column({ type: "simple-array" })
41+
@Column({ type: "int8", array: true })
4242
exempt_roles: string[];
4343

4444
@Column()

src/util/entities/BaseClass.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,3 @@ export class BaseClass extends BaseClassWithoutId {
122122
if (!this.id) this.id = Snowflake.generate();
123123
}
124124
}
125-
126-
export const ArrayColumn = (opts: ColumnOptions) => (process.env.DATABASE?.startsWith("postgres") ? Column({ ...opts, array: true }) : Column({ ...opts, type: "simple-array" }));

src/util/entities/ConnectedAccount.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class ConnectedAccount extends BaseClass {
5959
@Column({ select: false })
6060
visibility?: number = 0;
6161

62-
@Column({ type: "simple-array" })
62+
@Column({ type: "varchar", array: true })
6363
integrations?: string[] = [];
6464

6565
@Column({ type: "jsonb", name: "metadata", nullable: true })

src/util/entities/Emoji.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ export class Emoji extends BaseClass {
5757
@Column()
5858
require_colons: boolean;
5959

60-
@Column({ type: "simple-array" })
60+
@Column({ type: "int8", array: true })
6161
roles: string[]; // roles this emoji is whitelisted to (new discord feature?)
6262

63-
@Column({ type: "simple-array", nullable: true })
63+
@Column({ type: "int8", array: true, nullable: true })
6464
groups: string[]; // user groups this emoji is whitelisted to (Spacebar extension)
6565
}

src/util/entities/Encryption.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class SecuritySettings extends BaseClass {
3232
@Column()
3333
encryption_permission_mask: number;
3434

35-
@Column({ type: "simple-array" })
35+
@Column({ type: "varchar", array: true })
3636
allowed_algorithms: string[];
3737

3838
@Column()

src/util/entities/Guild.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class Guild extends BaseClass {
101101
@Column({ nullable: true })
102102
explicit_content_filter?: number;
103103

104-
@Column({ type: "simple-array" })
104+
@Column({ type: "varchar", array: true })
105105
features: string[] = []; //TODO use enum
106106
//TODO: https://discord.com/developers/docs/resources/guild#guild-object-guild-features
107107

@@ -267,7 +267,7 @@ export class Guild extends BaseClass {
267267
@Column({ type: "jsonb" })
268268
welcome_screen: GuildWelcomeScreen;
269269

270-
@Column({ nullable: true })
270+
@Column({ nullable: true, type: "int8" })
271271
@RelationId((guild: Guild) => guild.widget_channel)
272272
widget_channel_id?: string;
273273

@@ -295,7 +295,7 @@ export class Guild extends BaseClass {
295295
@Column({ nullable: true })
296296
premium_progress_bar_enabled: boolean = false;
297297

298-
@Column({ select: false, type: "simple-array" })
298+
@Column({ select: false, type: "int8", array: true })
299299
channel_ordering: string[];
300300

301301
@Column()

src/util/entities/Member.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export class Member extends BaseClassWithoutId {
133133
@Column()
134134
bio: string;
135135

136-
@Column({ nullable: true, type: "simple-array" })
136+
@Column({ nullable: true, type: "int4", array: true })
137137
theme_colors?: number[]; // TODO: Separate `User` and `UserProfile` models
138138

139139
@Column({ nullable: true })

src/util/entities/TeamMember.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class TeamMember extends BaseClass {
2828
@Column({ type: "int" })
2929
membership_state: TeamMemberState;
3030

31-
@Column({ type: "simple-array" })
31+
@Column({ type: "varchar", array: true })
3232
permissions: string[];
3333

3434
@Column()

0 commit comments

Comments
 (0)