Skip to content

Fix discord error handling #1726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Fix discord error handling #1726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe418f7
fix discord error handling
garrrikkotua Oct 18, 2023
946e084
add back showErrors param
garrrikkotua Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 17 additions & 24 deletions services/libs/integrations/src/integrations/discord/api/getMembers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,27 @@ import axios from 'axios'
import { DiscordApiMember, DiscordGetMembersInput, DiscordGetMembersOutput } from '../types'
import { IProcessStreamContext } from '../../../types'
import { getRateLimiter } from './handleRateLimit'
import { handleDiscordError } from './errorHandler'

async function getMembers(
input: DiscordGetMembersInput,
ctx: IProcessStreamContext,
): Promise<DiscordGetMembersOutput> {
const rateLimiter = getRateLimiter(ctx)
try {
let url = `https://discord.com/api/v10/guilds/${input.guildId}/members?limit=${input.perPage}`
if (input.page !== undefined && input.page !== '') {
url += `&after=${input.page}`
}
const config = {
method: 'get',
url,
headers: {
Authorization: input.token,
},
}

let url = `https://discord.com/api/v10/guilds/${input.guildId}/members?limit=${input.perPage}`
if (input.page !== undefined && input.page !== '') {
url += `&after=${input.page}`
}

const config = {
method: 'get',
url,
headers: {
Authorization: input.token,
},
}
try {
await rateLimiter.checkRateLimit('getMembers')
await rateLimiter.incrementRateLimit()
const response = await axios(config)
Expand All @@ -35,19 +37,10 @@ async function getMembers(
timeUntilReset,
}
} catch (err) {
if (err.response.status === 429) {
ctx.log.warn(
`Rate limit exceeded in Get Members. Wait value in header is ${err.response.headers['x-ratelimit-reset-after']}`,
)
return {
records: [],
nextPage: input.page,
limit: 0,
timeUntilReset: err.response.headers['x-ratelimit-reset-after'],
}
const newErr = handleDiscordError(err, config, { input }, ctx)
if (newErr) {
throw newErr
}
ctx.log.error({ err, input }, 'Error while getting members from Discord')
throw err
}
}

Expand Down
48 changes: 21 additions & 27 deletions services/libs/integrations/src/integrations/discord/api/getMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@ import axios from 'axios'
import { DiscordApiMessage, DiscordParsedReponse, DiscordGetMessagesInput } from '../types'
import { IProcessStreamContext } from '../../../types'
import { getRateLimiter } from './handleRateLimit'
import { handleDiscordError } from './errorHandler'

async function getMessages(
input: DiscordGetMessagesInput,
ctx: IProcessStreamContext,
showError = true,
showErrors = true,
): Promise<DiscordParsedReponse> {
const rateLimiter = getRateLimiter(ctx)
try {
let url = `https://discord.com/api/v10/channels/${input.channelId}/messages?limit=${input.perPage}`
if (input.page !== undefined && input.page !== '') {
url += `&before=${input.page}`
}
const config = {
method: 'get',
url,
headers: {
Authorization: input.token,
},
}

let url = `https://discord.com/api/v10/channels/${input.channelId}/messages?limit=${input.perPage}`
if (input.page !== undefined && input.page !== '') {
url += `&before=${input.page}`
}

const config = {
method: 'get',
url,
headers: {
Authorization: input.token,
},
}

try {
await rateLimiter.checkRateLimit('getMessages')
await rateLimiter.incrementRateLimit()
const response = await axios(config)
Expand All @@ -37,27 +40,18 @@ async function getMessages(
timeUntilReset,
}
} catch (err) {
if (err.response.status === 429) {
ctx.log.warn(
`Rate limit exceeded in Get Messages. Wait value in header is ${err.response.headers['x-ratelimit-reset-after']}`,
)
return {
records: [],
nextPage: input.page,
limit: 0,
timeUntilReset: err.response.headers['x-ratelimit-reset-after'],
}
}
if (!showError) {
if (!showErrors) {
return {
records: [],
nextPage: '',
limit: 0,
timeUntilReset: 0,
}
}
ctx.log.error({ err, input }, 'Error while getting messages from Discord')
throw err
const newErr = handleDiscordError(err, config, { input }, ctx)
if (newErr) {
throw newErr
}
}
}

Expand Down