Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(discord): report invalid intents errors

Zhao Dengfeng28bcfad50753
diff --git a/packages/lizi-im/src/discord/__tests__/gateway.test.ts b/packages/lizi-im/src/discord/__tests__/gateway.test.ts
index cd423b7e36..639792e8ad 100644
--- a/packages/lizi-im/src/discord/__tests__/gateway.test.ts
+++ b/packages/lizi-im/src/discord/__tests__/gateway.test.ts
@@ -146,6 +146,13 @@ describe('discord gateway pure logic', () => {
});
});
+ it('maps invalid intents close code to a readable error', () => {
+ expect(mapDiscordCloseCodeToStatus(4013)).toEqual({
+ kind: 'error',
+ reason: 'Discord gateway rejected configured intents',
+ });
+ });
+
it('maps disallowed intents close code to a readable error', () => {
expect(mapDiscordCloseCodeToStatus(4014)).toEqual({
kind: 'error',
@@ -168,6 +175,15 @@ describe('discord gateway pure logic', () => {
});
});
+ it('maps discord.js InvalidIntents login errors to error status', () => {
+ for (const code of ['InvalidIntents', 4013]) {
+ expect(mapDiscordLoginErrorToStatus({ code })).toEqual({
+ kind: 'error',
+ reason: 'Discord gateway rejected configured intents',
+ });
+ }
+ });
+
it('maps discord.js DisallowedIntents login errors to error status', () => {
expect(mapDiscordLoginErrorToStatus({ code: 'DisallowedIntents' })).toEqual({
kind: 'error',
diff --git a/packages/lizi-im/src/discord/gateway.ts b/packages/lizi-im/src/discord/gateway.ts
index e26f7e74de..afd2b13f7d 100644
--- a/packages/lizi-im/src/discord/gateway.ts
+++ b/packages/lizi-im/src/discord/gateway.ts
@@ -53,7 +53,7 @@ export function mapDiscordCloseCodeToStatus(code: number): IMStatus {
if (code === 4004) {
return { kind: 'error', reason: 'Discord authentication failed: invalid bot token' };
}
- if (code === 4014) {
+ if (code === 4013 || code === 4014) {
return { kind: 'error', reason: 'Discord gateway rejected configured intents' };
}
return { kind: 'connecting' };
@@ -64,7 +64,7 @@ export function mapDiscordLoginErrorToStatus(error: unknown): IMStatus {
if (code === 'TokenInvalid' || code === 4004) {
return { kind: 'error', reason: 'Discord authentication failed: invalid bot token' };
}
- if (code === 'DisallowedIntents' || code === 4014) {
+ if (code === 'InvalidIntents' || code === 'DisallowedIntents' || code === 4013 || code === 4014) {
return { kind: 'error', reason: 'Discord gateway rejected configured intents' };
}
return { kind: 'error', reason: errorMessage(error) };