From 3a88f8f12184fe9fc257c34aba8238db3bf79dcd Mon Sep 17 00:00:00 2001 From: Alexander Drozdov Date: Tue, 6 Dec 2022 14:10:26 +0200 Subject: [PATCH] closes #781 --- renderer/src/web/background/Leagues.ts | 5 +---- renderer/src/web/background/Prices.ts | 4 ++-- renderer/src/web/price-check/CheckedItem.vue | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/renderer/src/web/background/Leagues.ts b/renderer/src/web/background/Leagues.ts index 4826237b..dd175362 100644 --- a/renderer/src/web/background/Leagues.ts +++ b/renderer/src/web/background/Leagues.ts @@ -24,9 +24,6 @@ export const selected = computed({ } }) -export const isPublic = computed(() => - selected.value ? isPublicLeague(selected.value) : undefined) - export function isPublicLeague (id: string) { return tradeLeagues.value.some(league => id === league.id) } @@ -58,7 +55,7 @@ export async function load () { } } -function isRegularLeague (id: string) { +export function isRegularLeague (id: string) { // not a Private League (PL01) // not a Race Event (.RE01) return /^[A-Za-z ]+$/.test(id) diff --git a/renderer/src/web/background/Prices.ts b/renderer/src/web/background/Prices.ts index 0f6378bf..3b55068f 100644 --- a/renderer/src/web/background/Prices.ts +++ b/renderer/src/web/background/Prices.ts @@ -1,7 +1,7 @@ import { shallowRef, watch } from 'vue' import { AppConfig } from '@/web/Config' import { MainProcess } from '@/web/background/IPC' -import { selected as selectedLeague, isPublic as isPublicLeague } from './Leagues' +import { selected as selectedLeague, isPublicLeague } from './Leagues' interface NinjaDenseInfo { chaos: number @@ -20,7 +20,7 @@ const RETRY_TIME = 2 * 60 * 1000 const UPDATE_TIME = 16 * 60 * 1000 async function load (force: boolean = false) { - if (!selectedLeague.value || !isPublicLeague.value || AppConfig().realm !== 'pc-ggg') return + if (!selectedLeague.value || !isPublicLeague(selectedLeague.value) || AppConfig().realm !== 'pc-ggg') return const leagueAtStartOfLoad = selectedLeague.value if (!force && (Date.now() - lastUpdateTime) < UPDATE_TIME) return diff --git a/renderer/src/web/price-check/CheckedItem.vue b/renderer/src/web/price-check/CheckedItem.vue index f4e5188d..b2bf8a0b 100644 --- a/renderer/src/web/price-check/CheckedItem.vue +++ b/renderer/src/web/price-check/CheckedItem.vue @@ -63,7 +63,7 @@ import { CATEGORY_TO_TRADE_ID, createTradeRequest } from './trade/pathofexile-tr import { AppConfig } from '@/web/Config' import { FilterPreset } from './filters/interfaces' import { PriceCheckWidget } from '../overlay/interfaces' -import { selected as selectedLeague, isPublic as isPublicLeague } from '@/web/background/Leagues' +import { selected as selectedLeague, isRegularLeague } from '@/web/background/Leagues' let _showSupportLinksCounter = 0 @@ -173,7 +173,7 @@ export default defineComponent({ const showPredictedPrice = computed(() => { if (!widget.value.requestPricePrediction || AppConfig().language !== 'en' || - !isPublicLeague.value) return false + !isRegularLeague(selectedLeague.value!)) return false if (presets.value.active === 'Base item') return false