Skip to content

Commit 61c97fd

Browse files
authored
fix: order default opts correctly in communication methods (#121)
1 parent 29cf8dc commit 61c97fd

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/communication/interaction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ function genericCommandLog (
5555
void runCatching(
5656
async () =>
5757
await options.ctx.send({
58-
...makeSlashMessageOpts(options),
59-
...DEFAULT_MESSAGE_OPTS_SLASH
58+
...DEFAULT_MESSAGE_OPTS_SLASH,
59+
...makeSlashMessageOpts(options)
6060
}),
6161
'rethrow'
6262
)

src/communication/internal.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ function genericLog (options: InternalLogOptions<BaseMessageOptions, AnySubmissi
1919
void runCatching(async () =>
2020

2121
await config.channels().internalLogs.send({
22-
...makeDjsMessageOpts(options),
23-
...DEFAULT_MESSAGE_OPTS_DJS
22+
...DEFAULT_MESSAGE_OPTS_DJS,
23+
...makeDjsMessageOpts(options)
2424
}), 'rethrow'
2525
)
2626
}

src/communication/private.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function genericLog (
1818
void runCatching(
1919
async () =>
2020
await config.channels().privateLogs.send({
21-
...makeDjsMessageOpts(options),
22-
...DEFAULT_MESSAGE_OPTS_DJS
21+
...DEFAULT_MESSAGE_OPTS_DJS,
22+
...makeDjsMessageOpts(options)
2323
}),
2424
'rethrow'
2525
)

src/communication/public.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function genericLog (
1818
void runCatching(
1919
async () =>
2020
await config.channels().publicLogs.send({
21-
...makeDjsMessageOpts(options),
22-
...DEFAULT_MESSAGE_OPTS_DJS
21+
...DEFAULT_MESSAGE_OPTS_DJS,
22+
...makeDjsMessageOpts(options)
2323
}),
2424
'rethrow'
2525
)

src/communication/thread.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ function doLog (
1515
void runCatching(
1616
async () =>
1717
await options.ctx.send({
18-
...makeDjsMessageOpts(options),
19-
...DEFAULT_MESSAGE_OPTS_DJS
18+
...DEFAULT_MESSAGE_OPTS_DJS,
19+
...makeDjsMessageOpts(options)
2020
}),
2121
'rethrow'
2222
)

0 commit comments

Comments
 (0)