diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2024-11-27 17:23:00 +00:00
Code Issues Releases Activity

state: Fix Messages() being wasteful on later calls

Browse source
This commit is contained in:
diamondburned 2024-01-22 02:41:10 -08:00
parent 10d3626429
commit dbc4ae8978
No known key found for this signature in database
GPG key ID: D78C4471CE776659
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
state/state.go
View file

@ -707,17 +707,25 @@ func (s *State) Messages(channelID discord.ChannelID, limit uint) ([]discord.Mes
return storeMessages[:limit], nil return storeMessages[:limit], nil
} }
// Decrease the limit, if we aren't fetching all messages. fetchLimit := limit
if limit > 0 {
limit -= uint(len(storeMessages)) // If the user is requesting less than MaxMessages, then increase the limit
// to at least that so that channels don't accidentally get marked as tiny.
if fetchLimit < uint(s.MaxMessages()) {
fetchLimit = uint(s.MaxMessages())
} }
var before discord.MessageID = 0 // Decrease the fetchLimit, if we aren't fetching all messages.
if fetchLimit > 0 {
fetchLimit -= uint(len(storeMessages))
}
var before discord.MessageID
if len(storeMessages) > 0 { if len(storeMessages) > 0 {
before = storeMessages[len(storeMessages)-1].ID before = storeMessages[len(storeMessages)-1].ID
} }
apiMessages, err := s.Session.MessagesBefore(channelID, before, limit) apiMessages, err := s.Session.MessagesBefore(channelID, before, fetchLimit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -730,6 +738,9 @@ func (s *State) Messages(channelID discord.ChannelID, limit uint) ([]discord.Mes
} }
if len(apiMessages) == 0 { if len(apiMessages) == 0 {
if limit > 0 && len(storeMessages) > int(limit) {
return storeMessages[:limit], nil
}
return storeMessages, nil return storeMessages, nil
} }
@ -764,7 +775,12 @@ func (s *State) Messages(channelID discord.ChannelID, limit uint) ([]discord.Mes
} }
} }
return append(storeMessages, apiMessages...), nil msgs := append(storeMessages, apiMessages...)
if limit > 0 && len(msgs) > int(limit) {
msgs = msgs[:limit]
}
return msgs, nil
} }
//// ////