1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2024-10-31 20:14:21 +00:00

API: Fixed Messages{Before,After} fetching incorrectly beyond 100s

This commit is contained in:
diamondburned 2020-10-18 22:14:06 -07:00
parent 6dabffb46c
commit dec39c4c2d

View file

@ -8,6 +8,9 @@ import (
"github.com/diamondburned/arikawa/utils/json/option" "github.com/diamondburned/arikawa/utils/json/option"
) )
// the limit of max messages per request, as imposed by Discord
const maxMessageFetchLimit = 100
// Messages returns a list of messages sent in the channel with the passed ID. // Messages returns a list of messages sent in the channel with the passed ID.
// This method automatically paginates until it reaches the passed limit, or, // This method automatically paginates until it reaches the passed limit, or,
// if the limit is set to 0, has fetched all guilds within the passed ange. // if the limit is set to 0, has fetched all guilds within the passed ange.
@ -42,30 +45,30 @@ func (c *Client) MessagesBefore(
var msgs []discord.Message var msgs []discord.Message
// this is the limit of max messages per request, as imposed by Discord fetch := uint(maxMessageFetchLimit)
const hardLimit int = 100
unlimited := limit == 0 for limit >= 0 {
for fetch := uint(hardLimit); limit > 0 || unlimited; fetch = uint(hardLimit) {
if limit > 0 { if limit > 0 {
// Only fetch as much as we need. Since limit gradually decreases,
// we only need to fetch min(fetch, limit).
if fetch > limit { if fetch > limit {
fetch = limit fetch = limit
} }
limit -= fetch limit -= maxMessageFetchLimit
} }
m, err := c.messagesRange(channelID, before, 0, 0, fetch) m, err := c.messagesRange(channelID, before, 0, 0, fetch)
if err != nil { if err != nil {
return msgs, err return msgs, err
} }
msgs = append(m, msgs...) // Append the older messages into the list of newer messages.
msgs = append(msgs, m...)
if len(m) < hardLimit { if len(m) < maxMessageFetchLimit {
break break
} }
before = m[0].ID before = m[len(m)-1].ID
} }
return msgs, nil return msgs, nil
@ -84,30 +87,30 @@ func (c *Client) MessagesAfter(
var msgs []discord.Message var msgs []discord.Message
// this is the limit of max messages per request, as imposed by Discord fetch := uint(maxMessageFetchLimit)
const hardLimit int = 100
unlimited := limit == 0 for limit >= 0 {
for fetch := uint(hardLimit); limit > 0 || unlimited; fetch = uint(hardLimit) {
if limit > 0 { if limit > 0 {
// Only fetch as much as we need. Since limit gradually decreases,
// we only need to fetch min(fetch, limit).
if fetch > limit { if fetch > limit {
fetch = limit fetch = limit
} }
limit -= fetch limit -= maxMessageFetchLimit
} }
m, err := c.messagesRange(channelID, 0, after, 0, fetch) m, err := c.messagesRange(channelID, 0, after, 0, fetch)
if err != nil { if err != nil {
return msgs, err return msgs, err
} }
msgs = append(msgs, m...) // Prepend the older messages into the newly-fetched messages list.
msgs = append(m, msgs...)
if len(m) < hardLimit { if len(m) < maxMessageFetchLimit {
break break
} }
after = m[len(m)-1].ID after = m[0].ID
} }
return msgs, nil return msgs, nil