octo/mastoradio-fork
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

multi hashtags support

Browse Source
This commit is contained in:
wryk
2020-02-14 17:49:56 +01:00
parent dacc31ce77
commit 4ff59af24c
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/App.svelte
View File

@ -27,7 +27,7 @@
import Controls from '/components/Controls.svelte'
import Queue from '/components/Queue.svelte'
import Viewer from '/components/Viewer.svelte'
import { hashtagIterator } from '/services/mastodon.js'
import { hashtagIterator, combinedIterator } from '/services/mastodon.js'
import { mkTracksIterator } from '/services/misc.js'
import { domain, hashtags, queue, next, current, enqueueing, select } from '/store.js'
@ -36,7 +36,13 @@
let currentUnsubcribe = null
onMount(async () => {
const iterator = mkTracksIterator(hashtagIterator(get(domain), get(hashtags)[0]))
// const iterator = mkTracksIterator(hashtagIterator(get(domain), get(hashtags)[0]))
const domainValue = get(domain)
const hashtagsValue = get(hashtags)
const iterator = combinedIterator(
hashtagsValue.map(hashtag => mkTracksIterator(hashtagIterator(domainValue, hashtag)))
)
const { value: first } = await iterator.next()