diff --git a/src/mixins.ts b/src/mixins.ts index 8039e48..6e77bb8 100644 --- a/src/mixins.ts +++ b/src/mixins.ts @@ -108,14 +108,13 @@ export async function followersStreaming(streamers: string[], cursor: number): P const payloadData = streamers.slice(cursor, cursor + 35) - const payload = { - streamers: payloadData - } + const payload = { + streamers: payloadData + } - await postEndpoint('api/users/isLive/bulk', payload) - .then((data: string[]) => { - res = [...res, ...data] - }) + await postEndpoint('api/users/isLive/bulk', payload).then((data: string[]) => { + res = [...res, ...data] + }) return res } @@ -126,7 +125,10 @@ export async function followersStreaming(streamers: string[], cursor: number): P * @param cursor which 35 streamer chunk to fetch * @returns the streamers in that list that are online */ -export async function getParsedFollowing(streamers: string[], cursor: number): Promise { +export async function getParsedFollowing( + streamers: string[], + cursor: number +): Promise { // do not make request if no followers if (streamers.length == 0) { return [] @@ -136,14 +138,15 @@ export async function getParsedFollowing(streamers: string[], cursor: number): P const payloadData = streamers.slice(cursor, cursor + 35) - const payload = { - streamers: payloadData - } + const payload = { + streamers: payloadData + } - await postEndpoint('api/users/followingStreamer/bulk', payload) - .then((data: FollowingStreamer[]) => { + await postEndpoint('api/users/followingStreamer/bulk', payload).then( + (data: FollowingStreamer[]) => { res = [...res, ...data] - }) + } + ) return res -} \ No newline at end of file +} diff --git a/src/settingsManager.ts b/src/settingsManager.ts index 7543556..9d40001 100644 --- a/src/settingsManager.ts +++ b/src/settingsManager.ts @@ -206,12 +206,12 @@ export function getFollows(): string[] { export function getTheme(): string { const selectedTheme = localStorage.getItem('theme') || import.meta.env.SAFETWITCH_DEFAULT_THEME - if (selectedTheme === "") { + if (selectedTheme === '') { return 'light' } // Make sure theme exists - const t = themeList.filter(theme => theme.name === selectedTheme) + const t = themeList.filter((theme) => theme.name === selectedTheme) if (t.length === 0) { console.error(`Theme ${selectedTheme} does not exist... Perhaps improperly setup instance defaults or improper config? Stored Theme: ${localStorage.getItem('theme')} diff --git a/src/types/Streamer.ts b/src/types/Streamer.ts index 6c58dfa..5e0d766 100644 --- a/src/types/Streamer.ts +++ b/src/types/Streamer.ts @@ -30,8 +30,8 @@ export interface StreamerData { } export interface FollowingStreamer { - username: string - login: string - pfp: string - followers: number + username: string + login: string + pfp: string + followers: number } diff --git a/src/views/FollowingView.vue b/src/views/FollowingView.vue index 3633c5f..b4c284a 100644 --- a/src/views/FollowingView.vue +++ b/src/views/FollowingView.vue @@ -27,8 +27,8 @@ export default { let bottomOfWindow = document.documentElement.scrollTop + window.innerHeight === document.documentElement.offsetHeight - - if (!bottomOfWindow) return; + + if (!bottomOfWindow) return const follows = getFollows() @@ -40,7 +40,7 @@ export default { let cursor = this.data.length / 35 let maxCursor = follows.length / 35 - if (cursor > maxCursor) return; + if (cursor > maxCursor) return let chunk = await getParsedFollowing(follows, cursor) this.data = [...this.data, ...chunk] @@ -50,7 +50,7 @@ export default { const follows = getFollows() window.onscroll = this.getNextFollowingStage - this.data = await getParsedFollowing(follows, 0); + this.data = await getParsedFollowing(follows, 0) }, components: { LoadingScreen, diff --git a/src/views/HomepageView.vue b/src/views/HomepageView.vue index 812576b..3999021 100644 --- a/src/views/HomepageView.vue +++ b/src/views/HomepageView.vue @@ -68,14 +68,14 @@ export default { }, async handleFollowingScroll(event: UIEvent) { let el = event.target as HTMLUListElement - let fullyScrolled = el.scrollLeft === (el.scrollWidth - el.clientWidth) + let fullyScrolled = el.scrollLeft === el.scrollWidth - el.clientWidth console.log(el) - if (!fullyScrolled) return; + if (!fullyScrolled) return - if (!this.following) return; + if (!this.following) return let offset = this.following.length / 35 let newFollowers = await followersStreaming(getFollows(), offset) - this.following = [ ...this.following, ...newFollowers] + this.following = [...this.following, ...newFollowers] } }, async mounted() { @@ -90,7 +90,7 @@ export default { this.data = data }) - this.following = await followersStreaming(getFollows(), 0) + this.following = await followersStreaming(getFollows(), 0) }, components: { StreamPreviewVue, @@ -107,9 +107,12 @@ export default {
-

{{ $t("home.following") }}

-

{{ $t("home.streamersYouFollow") }}

-
    +

    {{ $t('home.following') }}

    +

    {{ $t('home.streamersYouFollow') }}

    +
    • diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue index 2b21762..c7f360a 100644 --- a/src/views/SettingsView.vue +++ b/src/views/SettingsView.vue @@ -1,6 +1,12 @@