astra/go-mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed pagination regression

Browse source 
Pagination requests have been broken since b8bb5ae68.
Only one of the parameters `max_id`, `since_id` or `min_id` must be supplied.
This commit is contained in:
Christian Muehlhaeuser 2019-05-16 05:25:26 +02:00
parent f51571807d
commit acbaf58d8a
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mastodon.go
View file

@ -372,11 +372,9 @@ func (p *Pagination) toValues() url.Values {
func (p *Pagination) setValues(params url.Values) url.Values {
if p.MaxID != "" {
params.Set("max_id", string(p.MaxID))
}
if p.SinceID != "" {
} else if p.SinceID != "" {
params.Set("since_id", string(p.SinceID))
}
if p.MinID != "" {
} else if p.MinID != "" {
params.Set("min_id", string(p.MinID))
}
if p.Limit > 0 {

28
mastodon_test.go
View file

@ -332,10 +332,8 @@ func TestGetPaginationID(t *testing.T) {
func TestPaginationSetValues(t *testing.T) {
p := &Pagination{
MaxID: "123",
SinceID: "456",
MinID: "789",
Limit: 10,
MaxID: "123",
Limit: 10,
}
before := url.Values{"key": {"value"}}
after := p.setValues(before)
@ -345,29 +343,25 @@ func TestPaginationSetValues(t *testing.T) {
if after.Get("max_id") != "123" {
t.Fatalf("want %q but %q", "123", after.Get("max_id"))
}
if after.Get("since_id") != "456" {
t.Fatalf("want %q but %q", "456", after.Get("since_id"))
}
if after.Get("min_id") != "789" {
t.Fatalf("want %q but %q", "789", after.Get("min_id"))
}
if after.Get("limit") != "10" {
t.Fatalf("want %q but %q", "10", after.Get("limit"))
}
p = &Pagination{
MaxID: "",
MinID: "456",
}
before = url.Values{}
after = p.setValues(before)
if after.Get("min_id") != "456" {
t.Fatalf("want %q but %q", "456", after.Get("min_id"))
}
p = &Pagination{
SinceID: "789",
}
before = url.Values{}
after = p.setValues(before)
if after.Get("max_id") != "" {
t.Fatalf("result should be empty string: %q", after.Get("max_id"))
}
if after.Get("since_id") != "789" {
t.Fatalf("want %q but %q", "789", after.Get("since_id"))
}
if after.Get("min_id") != "" {
t.Fatalf("result should be empty string: %q", after.Get("min_id"))
}
}