Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions bot/command/context/replyable.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,8 @@ func (r *Replyable) buildErrorResponse(err error, eventId string, includeInviteL
}
} else if restError.ApiError.Code == 160005 { // Thread is locked
message = r.GetMessage(i18n.MessageErrorThreadLocked)
} else if restError.ApiError.Code == 160006 { // Maximum number of active threads reached
} else if restError.ApiError.Code == 160006 || restError.ApiError.Code == 160007 { // Maximum number of active threads reached
message = r.GetMessage(i18n.MessageErrorMaxActiveThreads)
} else if restError.ApiError.Code == 160007 { // Maximum number of active announcement threads reached
message = r.GetMessage(i18n.MessageErrorMaxActiveAnnouncementThreads)
} else if restError.StatusCode == http.StatusTooManyRequests {
// Rate limit error - parse raw response to extract retry_after and global flag
var rateLimit rateLimitResponse
Expand Down
59 changes: 29 additions & 30 deletions i18n/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,36 +293,35 @@ var (
MessageButtonGuildOnly MessageId = "button.guild_only"
MessageButtonDMOnly MessageId = "button.dms_only"

MessageErrorUnknownChannel MessageId = "errors.unknown_channel"
MessageErrorUnknownGuild MessageId = "errors.unknown_guild"
MessageErrorUnknownMember MessageId = "errors.unknown_member"
MessageErrorUnknownMessage MessageId = "errors.unknown_message"
MessageErrorUnknownUser MessageId = "errors.unknown_user"
MessageErrorUnknownRole MessageId = "errors.unknown_role"
MessageErrorUnknownCategory MessageId = "errors.unknown_category"
MessageErrorUnknownInteraction MessageId = "errors.unknown_interaction"
MessageErrorMaxWebhooks MessageId = "errors.max_webhooks"
MessageErrorMaxChannels MessageId = "errors.max_channels"
MessageErrorInteractionAcknowledged MessageId = "errors.interaction_acknowledged"
MessageErrorMissingPermissionsTitle MessageId = "errors.missing_permissions.title"
MessageErrorMissingPermissionsBody MessageId = "errors.missing_permissions.body"
MessageErrorMissingAccess MessageId = "errors.missing_access"
MessageErrorInvalidLength MessageId = "errors.invalid_length"
MessageErrorRequiredField MessageId = "errors.required_field"
MessageErrorInvalidChannelType MessageId = "errors.invalid_channel_type"
MessageErrorInvalidCategory MessageId = "errors.invalid_category"
MessageErrorInvalidId MessageId = "errors.invalid_id"
MessageErrorInvalidCharacters MessageId = "errors.invalid_characters"
MessageErrorInvalidChoice MessageId = "errors.invalid_choice"
MessageErrorInvalidForm MessageId = "errors.invalid_form"
MessageErrorThreadLocked MessageId = "errors.thread_locked"
MessageErrorMaxActiveThreads MessageId = "errors.max_active_threads"
MessageErrorMaxActiveAnnouncementThreads MessageId = "errors.max_active_announcement_threads"
MessageErrorTimeout MessageId = "errors.timed_out"
MessageErrorRateLimited MessageId = "errors.rate_limited"
MessageErrorRateLimitedGlobal MessageId = "errors.rate_limited_global"
MessageErrorGeneral MessageId = "errors.general"
MessageErrorId MessageId = "errors.error_id"
MessageErrorUnknownChannel MessageId = "errors.unknown_channel"
MessageErrorUnknownGuild MessageId = "errors.unknown_guild"
MessageErrorUnknownMember MessageId = "errors.unknown_member"
MessageErrorUnknownMessage MessageId = "errors.unknown_message"
MessageErrorUnknownUser MessageId = "errors.unknown_user"
MessageErrorUnknownRole MessageId = "errors.unknown_role"
MessageErrorUnknownCategory MessageId = "errors.unknown_category"
MessageErrorUnknownInteraction MessageId = "errors.unknown_interaction"
MessageErrorMaxWebhooks MessageId = "errors.max_webhooks"
MessageErrorMaxChannels MessageId = "errors.max_channels"
MessageErrorInteractionAcknowledged MessageId = "errors.interaction_acknowledged"
MessageErrorMissingPermissionsTitle MessageId = "errors.missing_permissions.title"
MessageErrorMissingPermissionsBody MessageId = "errors.missing_permissions.body"
MessageErrorMissingAccess MessageId = "errors.missing_access"
MessageErrorInvalidLength MessageId = "errors.invalid_length"
MessageErrorRequiredField MessageId = "errors.required_field"
MessageErrorInvalidChannelType MessageId = "errors.invalid_channel_type"
MessageErrorInvalidCategory MessageId = "errors.invalid_category"
MessageErrorInvalidId MessageId = "errors.invalid_id"
MessageErrorInvalidCharacters MessageId = "errors.invalid_characters"
MessageErrorInvalidChoice MessageId = "errors.invalid_choice"
MessageErrorInvalidForm MessageId = "errors.invalid_form"
MessageErrorThreadLocked MessageId = "errors.thread_locked"
MessageErrorMaxActiveThreads MessageId = "errors.max_active_threads"
MessageErrorTimeout MessageId = "errors.timed_out"
MessageErrorRateLimited MessageId = "errors.rate_limited"
MessageErrorRateLimitedGlobal MessageId = "errors.rate_limited_global"
MessageErrorGeneral MessageId = "errors.general"
MessageErrorId MessageId = "errors.error_id"

HelpAdmin MessageId = "help.admin"
HelpAdminDebug MessageId = "help.admin.debug"
Expand Down