ScuroNeko/Laniakea
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

v1.0.0 beta 8; ratelimt war

Browse Source
This commit is contained in:
ScuroNeko
2026-03-02 17:06:13 +03:00
parent fa7a296a66
commit 6cf3355a36
4 changed files with 110 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tgapi/api.go
View File

@@ -102,10 +102,14 @@ type ApiResponse[R any] struct {
type TelegramRequest[R, P any] struct {
method string
params P
chatId int64
}
func NewRequest[R, P any](method string, params P) TelegramRequest[R, P] {
return TelegramRequest[R, P]{method: method, params: params}
return TelegramRequest[R, P]{method, params, 0}
}
func NewRequestWithChatID[R, P any](method string, params P, chatId int64) TelegramRequest[R, P] {
return TelegramRequest[R, P]{method, params, chatId}
}
func (r TelegramRequest[R, P]) doRequest(ctx context.Context, api *API) (R, error) {
var zero R
@@ -165,7 +169,12 @@ func (r TelegramRequest[R, P]) doRequest(ctx context.Context, api *API) (R, erro
if responseData.Parameters.RetryAfter != nil {
after = *responseData.Parameters.RetryAfter
}
api.Limiter.SetGlobalLock(after)
if r.chatId > 0 {
api.Limiter.SetChatLock(r.chatId, after)
} else {
api.Limiter.SetGlobalLock(after)
}
time.Sleep(time.Duration(after) * time.Second)
return r.doRequest(ctx, api)
}
return zero, ErrRateLimit

4
tgapi/messages_methods.go
View File

@@ -21,7 +21,7 @@ type SendMessageP struct {
}
func (api *API) SendMessage(params SendMessageP) (Message, error) {
req := NewRequest[Message, SendMessageP]("sendMessage", params)
req := NewRequestWithChatID[Message, SendMessageP]("sendMessage", params, params.ChatID)
return req.Do(api)
}
@@ -275,7 +275,7 @@ type SendMessageDraftP struct {
}
func (api *API) SendMessageDraft(params SendMessageDraftP) (bool, error) {
req := NewRequest[bool]("sendMessageDraft", params)
req := NewRequestWithChatID[bool]("sendMessageDraft", params, params.ChatID)
return req.Do(api)
}