Merge pull request #2226 from h3poteto/fix/link_header

Skip link header if it is the final page
h3poteto · Nov 5, 2024 · f371978 · f371978
2 parents 43bb7ac + d7073c6
commit f371978
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/megalodon/src/friendica.ts b/megalodon/src/friendica.ts
@@ -487,6 +487,9 @@ export default class Friendica implements MegalodonInterface {
         converted = Object.assign({}, converted, {
           data: [...converted.data, ...nextRes.data.map(a => FriendicaAPI.Converter.account(a))]
         })
+        if (nextRes.headers.link === undefined) {
+          break
+        }
         parsed = parseLinkHeader(nextRes.headers.link)
         if (sleep_ms) {
           await new Promise<void>(converted => setTimeout(converted, sleep_ms))

diff --git a/megalodon/src/mastodon.ts b/megalodon/src/mastodon.ts
@@ -564,6 +564,9 @@ export default class Mastodon implements MegalodonInterface {
         converted = Object.assign({}, converted, {
           data: [...converted.data, ...nextRes.data.map(a => MastodonAPI.Converter.account(a))]
         })
+        if (nextRes.headers.link === undefined) {
+          break
+        }
         parsed = parseLinkHeader(nextRes.headers.link)
         if (sleep_ms) {
           await new Promise<void>(converted => setTimeout(converted, sleep_ms))