From 565e28a70d02c32cd8e0687abe5cbefeca62f127 Mon Sep 17 00:00:00 2001 From: Xmader Date: Tue, 24 Nov 2020 01:24:34 -0500 Subject: [PATCH] refactor: remove playerdata from scoreinfo --- src/scoreinfo.ts | 53 ++++++++---------------------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/src/scoreinfo.ts b/src/scoreinfo.ts index c616508..172e15e 100644 --- a/src/scoreinfo.ts +++ b/src/scoreinfo.ts @@ -1,38 +1,14 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ -import { console } from './utils' - -// run at document-start -export const ugappJsStore: Record | null = (() => { - try { - const l = document.body.children as HTMLCollectionOf - const el = [...l].find(e => Object.keys(e.dataset).length > 0) as HTMLDivElement - const json = Object.values(el.dataset)[0] as string - return JSON.parse(json) - } catch (err) { - console.error(err) - return null - } -})() - const IPNS_KEY = 'QmSdXtvzC8v8iTTZuj5cVmiugnzbR1QATYRcGix4bBsioP' const RADIX = 20 export const scoreinfo = { - get playerdata (): any { - // @ts-ignore - return ugappJsStore.store.page.data.score - }, - get id (this: typeof scoreinfo): number { - try { - return this.playerdata.id - } catch { - const el = document.querySelector("meta[property='al:ios:url']") as HTMLMetaElement - const m = el.content.match(/(\d+)$/) as RegExpMatchArray - return +m[1] - } + const el = document.querySelector("meta[property='al:ios:url']") as HTMLMetaElement + const m = el.content.match(/(\d+)$/) as RegExpMatchArray + return +m[1] }, get idLastDigit (this: typeof scoreinfo): number { @@ -40,12 +16,8 @@ export const scoreinfo = { }, get title (this: typeof scoreinfo): string { - try { - return this.playerdata.title - } catch { - const el = document.querySelector("meta[property='og:title']") as HTMLMetaElement - return el.content - } + const el = document.querySelector("meta[property='og:title']") as HTMLMetaElement + return el.content }, get fileName (this: typeof scoreinfo): string { @@ -53,21 +25,12 @@ export const scoreinfo = { }, get pageCount (this: typeof scoreinfo): number { - try { - return this.playerdata.pages_count - } catch { - return document.querySelectorAll('.gXB83').length - } + return document.querySelectorAll('.gXB83').length }, get baseUrl (this: typeof scoreinfo): string { - let thumbnailUrl: string - try { - thumbnailUrl = this.playerdata.thumbnails.original - } catch { - const el = document.querySelector("meta[property='og:image']") as HTMLMetaElement - thumbnailUrl = el.content - } + const el = document.querySelector("meta[property='og:image']") as HTMLMetaElement + const thumbnailUrl = el.content const { origin, pathname } = new URL(thumbnailUrl) // remove the last part