Skip to content

Commit 3effdaf

Browse files
authored
Unify max active thread errors (160006/160007) (#132)
Handle Discord API error codes 160006 and 160007 with the same max-active-threads message in Replyable.buildErrorResponse, removing the separate branch for announcement threads. Remove the unused MessageErrorMaxActiveAnnouncementThreads i18n identifier and tidy the messages list.
1 parent b755737 commit 3effdaf

2 files changed

Lines changed: 30 additions & 33 deletions

File tree

bot/command/context/replyable.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,8 @@ func (r *Replyable) buildErrorResponse(err error, eventId string, includeInviteL
253253
}
254254
} else if restError.ApiError.Code == 160005 { // Thread is locked
255255
message = r.GetMessage(i18n.MessageErrorThreadLocked)
256-
} else if restError.ApiError.Code == 160006 { // Maximum number of active threads reached
256+
} else if restError.ApiError.Code == 160006 || restError.ApiError.Code == 160007 { // Maximum number of active threads reached
257257
message = r.GetMessage(i18n.MessageErrorMaxActiveThreads)
258-
} else if restError.ApiError.Code == 160007 { // Maximum number of active announcement threads reached
259-
message = r.GetMessage(i18n.MessageErrorMaxActiveAnnouncementThreads)
260258
} else if restError.StatusCode == http.StatusTooManyRequests {
261259
// Rate limit error - parse raw response to extract retry_after and global flag
262260
var rateLimit rateLimitResponse

i18n/messages.go

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -293,36 +293,35 @@ var (
293293
MessageButtonGuildOnly MessageId = "button.guild_only"
294294
MessageButtonDMOnly MessageId = "button.dms_only"
295295

296-
MessageErrorUnknownChannel MessageId = "errors.unknown_channel"
297-
MessageErrorUnknownGuild MessageId = "errors.unknown_guild"
298-
MessageErrorUnknownMember MessageId = "errors.unknown_member"
299-
MessageErrorUnknownMessage MessageId = "errors.unknown_message"
300-
MessageErrorUnknownUser MessageId = "errors.unknown_user"
301-
MessageErrorUnknownRole MessageId = "errors.unknown_role"
302-
MessageErrorUnknownCategory MessageId = "errors.unknown_category"
303-
MessageErrorUnknownInteraction MessageId = "errors.unknown_interaction"
304-
MessageErrorMaxWebhooks MessageId = "errors.max_webhooks"
305-
MessageErrorMaxChannels MessageId = "errors.max_channels"
306-
MessageErrorInteractionAcknowledged MessageId = "errors.interaction_acknowledged"
307-
MessageErrorMissingPermissionsTitle MessageId = "errors.missing_permissions.title"
308-
MessageErrorMissingPermissionsBody MessageId = "errors.missing_permissions.body"
309-
MessageErrorMissingAccess MessageId = "errors.missing_access"
310-
MessageErrorInvalidLength MessageId = "errors.invalid_length"
311-
MessageErrorRequiredField MessageId = "errors.required_field"
312-
MessageErrorInvalidChannelType MessageId = "errors.invalid_channel_type"
313-
MessageErrorInvalidCategory MessageId = "errors.invalid_category"
314-
MessageErrorInvalidId MessageId = "errors.invalid_id"
315-
MessageErrorInvalidCharacters MessageId = "errors.invalid_characters"
316-
MessageErrorInvalidChoice MessageId = "errors.invalid_choice"
317-
MessageErrorInvalidForm MessageId = "errors.invalid_form"
318-
MessageErrorThreadLocked MessageId = "errors.thread_locked"
319-
MessageErrorMaxActiveThreads MessageId = "errors.max_active_threads"
320-
MessageErrorMaxActiveAnnouncementThreads MessageId = "errors.max_active_announcement_threads"
321-
MessageErrorTimeout MessageId = "errors.timed_out"
322-
MessageErrorRateLimited MessageId = "errors.rate_limited"
323-
MessageErrorRateLimitedGlobal MessageId = "errors.rate_limited_global"
324-
MessageErrorGeneral MessageId = "errors.general"
325-
MessageErrorId MessageId = "errors.error_id"
296+
MessageErrorUnknownChannel MessageId = "errors.unknown_channel"
297+
MessageErrorUnknownGuild MessageId = "errors.unknown_guild"
298+
MessageErrorUnknownMember MessageId = "errors.unknown_member"
299+
MessageErrorUnknownMessage MessageId = "errors.unknown_message"
300+
MessageErrorUnknownUser MessageId = "errors.unknown_user"
301+
MessageErrorUnknownRole MessageId = "errors.unknown_role"
302+
MessageErrorUnknownCategory MessageId = "errors.unknown_category"
303+
MessageErrorUnknownInteraction MessageId = "errors.unknown_interaction"
304+
MessageErrorMaxWebhooks MessageId = "errors.max_webhooks"
305+
MessageErrorMaxChannels MessageId = "errors.max_channels"
306+
MessageErrorInteractionAcknowledged MessageId = "errors.interaction_acknowledged"
307+
MessageErrorMissingPermissionsTitle MessageId = "errors.missing_permissions.title"
308+
MessageErrorMissingPermissionsBody MessageId = "errors.missing_permissions.body"
309+
MessageErrorMissingAccess MessageId = "errors.missing_access"
310+
MessageErrorInvalidLength MessageId = "errors.invalid_length"
311+
MessageErrorRequiredField MessageId = "errors.required_field"
312+
MessageErrorInvalidChannelType MessageId = "errors.invalid_channel_type"
313+
MessageErrorInvalidCategory MessageId = "errors.invalid_category"
314+
MessageErrorInvalidId MessageId = "errors.invalid_id"
315+
MessageErrorInvalidCharacters MessageId = "errors.invalid_characters"
316+
MessageErrorInvalidChoice MessageId = "errors.invalid_choice"
317+
MessageErrorInvalidForm MessageId = "errors.invalid_form"
318+
MessageErrorThreadLocked MessageId = "errors.thread_locked"
319+
MessageErrorMaxActiveThreads MessageId = "errors.max_active_threads"
320+
MessageErrorTimeout MessageId = "errors.timed_out"
321+
MessageErrorRateLimited MessageId = "errors.rate_limited"
322+
MessageErrorRateLimitedGlobal MessageId = "errors.rate_limited_global"
323+
MessageErrorGeneral MessageId = "errors.general"
324+
MessageErrorId MessageId = "errors.error_id"
326325

327326
HelpAdmin MessageId = "help.admin"
328327
HelpAdminDebug MessageId = "help.admin.debug"

0 commit comments

Comments
 (0)