From 0587cff625799175b69f4d54996d61f73987c040 Mon Sep 17 00:00:00 2001 From: wryk Date: Sat, 7 Mar 2020 19:00:39 +0100 Subject: [PATCH] fix simple status iterator --- src/services/mastodon.js | 2 +- src/services/misc.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/mastodon.js b/src/services/mastodon.js index c35b513..d5a3740 100644 --- a/src/services/mastodon.js +++ b/src/services/mastodon.js @@ -18,7 +18,7 @@ export const fetchStatus = (domain, id) => fetch(`https://${domain}/api/v1/statu .then(response => response.json()) export async function* statusIterator({ domain, id }) { - const partialTrack = await fetchStatus(domain, id) + const partialTrack = processStatus(domain, await fetchStatus(domain, id)) if (partialTrack !== null) { yield partialTrack diff --git a/src/services/misc.js b/src/services/misc.js index 96a3081..e9b25c7 100644 --- a/src/services/misc.js +++ b/src/services/misc.js @@ -50,7 +50,7 @@ export const secondsToElapsedTime = (seconds) => { .join(':') } -export async function* tracksIterator(refererGenerator, cache) { +export async function* tracksIterator(partialTrackGenerator, cache) { const notKnow = (values) => { if (cache.has(values)) { console.log(`Drop already processed ${values.join(':')}`) @@ -63,7 +63,7 @@ export async function* tracksIterator(refererGenerator, cache) { try { yield* execPipe( - refererGenerator, + partialTrackGenerator, asyncFilter(({ referer: { credentials: { domain, id } } }) => notKnow(['referer', 'mastodon', domain, id])), asyncFilter(({ partialMedia: { credentials: { id } } }) => notKnow(['media', 'youtube', id])), asyncMap(async ({ referer, partialMedia }) => { @@ -82,7 +82,7 @@ export async function* tracksIterator(refererGenerator, cache) { }) ) } finally { - refererGenerator.return() + partialTrackGenerator.return() } }