From 968e6c7fe8392970ddb93751cd8df551ac99c5f1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 Mar 2019 21:04:52 +0200
Subject: correctly paginate on MastoAPI

---
 src/services/api/api.service.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/services/api/api.service.js')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 2c5e9d60..a8de736c 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -276,11 +276,15 @@ const fetchUserRelationship = ({id, credentials}) => {
     })
 }
 
-const fetchFriends = ({id, page, credentials}) => {
+const fetchFriends = ({id, maxId, sinceId, limit = 20, credentials}) => {
   let url = MASTODON_FOLLOWING_URL(id)
-  if (page) {
-    url = url + `?page=${page}`
-  }
+  const args = [
+    maxId && `max_id=${maxId}`,
+    sinceId && `max_id=${sinceId}`,
+    limit && `limit=${limit}`
+  ].filter(_ => _).join('&')
+
+  url = url + (args ? '?' + args : '')
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
     .then((data) => data.map(parseUser))
@@ -293,11 +297,15 @@ const exportFriends = ({id, credentials}) => {
     .then((data) => data.map(parseUser))
 }
 
-const fetchFollowers = ({id, page, credentials}) => {
+const fetchFollowers = ({id, maxId, sinceId, limit = 20, credentials}) => {
   let url = MASTODON_FOLLOWERS_URL(id)
-  if (page) {
-    url = url + `?page=${page}`
-  }
+  const args = [
+    maxId && `max_id=${maxId}`,
+    sinceId && `max_id=${sinceId}`,
+    limit && `limit=${limit}`
+  ].filter(_ => _).join('&')
+
+  url = url + (args ? '?' + args : '')
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
     .then((data) => data.map(parseUser))
-- 
cgit v1.2.3-70-g09d2