-
Awakened PoE Trade 2
+ Awakened PoE2 Trade2
{{ t('app_is_ready') }}
-
-
poeprices.info
poe.ninja
@@ -89,7 +71,7 @@ export default defineComponent({
required: true
}
},
- setup (props) {
+ setup(props) {
const widget = computed(() => AppConfig('price-check')!)
const leagues = useLeagues()
@@ -120,7 +102,7 @@ export default defineComponent({
})
if ((!props.advancedCheck && !widget.value.smartInitialSearch) ||
- (props.advancedCheck && !widget.value.lockedInitialSearch)) {
+ (props.advancedCheck && !widget.value.lockedInitialSearch)) {
doSearch.value = false
} else {
doSearch.value = Boolean(
@@ -174,8 +156,8 @@ export default defineComponent({
const showPredictedPrice = computed(() => {
if (!widget.value.requestPricePrediction ||
- AppConfig().language !== 'en' ||
- !leagues.selected.value!.isPopular) return false
+ AppConfig().language !== 'en' ||
+ !leagues.selected.value!.isPopular) return false
if (presets.value.active === 'filters.preset_base_item') return false
@@ -195,7 +177,7 @@ export default defineComponent({
props.item.info.unique == null)
})
- function handleSearchMouseenter (e: MouseEvent) {
+ function handleSearchMouseenter(e: MouseEvent) {
if ((filtersComponent.value.$el as HTMLElement).contains(e.relatedTarget as HTMLElement)) {
doSearch.value = true
@@ -234,11 +216,11 @@ export default defineComponent({
showSupportLinks,
presets: computed(() => presets.value.presets.map(preset =>
({ id: preset.id, active: (preset.id === presets.value.active) }))),
- selectPreset (id: string) {
+ selectPreset(id: string) {
presets.value.active = id
},
- makeTradeLink () {
- return `https://${getTradeEndpoint()}/trade2/search/${itemFilters.value.trade.league}?q=${JSON.stringify(createTradeRequest(itemFilters.value, itemStats.value, props.item))}`
+ makeTradeLink() {
+ return `https://${getTradeEndpoint()}/trade2/search/poe2/${itemFilters.value.trade.league}?q=${JSON.stringify(createTradeRequest(itemFilters.value, itemStats.value, props.item))}`
}
}
}
diff --git a/renderer/src/web/price-check/PriceCheckWindow.vue b/renderer/src/web/price-check/PriceCheckWindow.vue
index c6281e19..dbd46744 100644
--- a/renderer/src/web/price-check/PriceCheckWindow.vue
+++ b/renderer/src/web/price-check/PriceCheckWindow.vue
@@ -175,7 +175,7 @@ export default defineComponent({
})
const leagues = useLeagues()
- const title = computed(() => leagues.selectedId.value || 'Awakened PoE Trade 2')
+ const title = computed(() => leagues.selectedId.value || 'Awakened PoE2 Trade2')
const stableOrbCost = computed(() => (xchgRate.value) ? Math.round(xchgRate.value) : null)
const isBrowserShown = computed(() => props.config.wmFlags.includes('has-browser'))
const overlayKey = computed(() => AppConfig().overlayKey)
diff --git a/renderer/src/web/price-check/price-prediction/poeprices.ts b/renderer/src/web/price-check/price-prediction/poeprices.ts
index 4150e285..2c15c927 100644
--- a/renderer/src/web/price-check/price-prediction/poeprices.ts
+++ b/renderer/src/web/price-check/price-prediction/poeprices.ts
@@ -1,133 +1,144 @@
-import { ParsedItem } from '@/parser'
-import { useLeagues } from '@/web/background/Leagues'
-import { Host } from '@/web/background/IPC'
-import { Cache } from '../trade/Cache'
-import { usePoeninja } from '@/web/background/Prices'
+import { ParsedItem } from '@/parser';
+import { useLeagues } from '@/web/background/Leagues';
+import { Host } from '@/web/background/IPC';
+import { Cache } from '../trade/Cache';
+import { usePoeninja } from '@/web/background/Prices';
-const cache = new Cache()
+const cache = new Cache();
-interface PoepricesApiResponse { /* eslint-disable camelcase */
- currency: 'chaos' | 'divine' | 'exalt'
- error: number
- error_msg: string
- warning_msg: string
- max: number
- min: number
- pred_confidence_score: number
- pred_explanation: Array<[string, number]>
+interface PoepricesApiResponse {
+ /* eslint-disable camelcase */ currency: 'chaos' | 'divine' | 'exalt';
+ error: number;
+ error_msg: string;
+ warning_msg: string;
+ max: number;
+ min: number;
+ pred_confidence_score: number;
+ pred_explanation: Array<[string, number]>;
}
export interface RareItemPrice {
- max: number
- min: number
- confidence: number
- currency: 'chaos' | 'div'
- explanation: Array<{
- name: string
- contrib: number
- }>
+ max: number;
+ min: number;
+ confidence: number;
+ currency: 'chaos' | 'div';
+ explanation: Array<{
+ name: string;
+ contrib: number;
+ }>;
}
-export async function requestPoeprices (item: ParsedItem): Promise {
- const query = querystring({
- i: utf8ToBase64(transformItemText(item.rawText)),
- l: useLeagues().selectedId.value,
- s: 'awakened-poe-trade'
- })
+export async function requestPoeprices(
+ item: ParsedItem
+): Promise {
+ const query = querystring({
+ i: utf8ToBase64(transformItemText(item.rawText)),
+ l: useLeagues().selectedId.value,
+ s: 'awakened-poe-trade', // might be required name here
+ });
- let data = cache.get(query)
- if (!data) {
- const response = await Host.proxy(`www.poeprices.info/api?${query}`)
- try {
- data = await response.json() as PoepricesApiResponse
- } catch (e) {
- throw new Error(`${response.status}, poeprices.info API is under load or down.`)
- }
+ let data = cache.get(query);
+ if (!data) {
+ const response = await Host.proxy(`www.poeprices.info/api?${query}`);
+ try {
+ data = (await response.json()) as PoepricesApiResponse;
+ } catch (e) {
+ throw new Error(
+ `${response.status}, poeprices.info API is under load or down.`
+ );
+ }
- if (data.error !== 0) {
- throw new Error(data.error_msg)
- }
+ if (data.error !== 0) {
+ throw new Error(data.error_msg);
+ }
- cache.set(query, data, 300)
- }
+ cache.set(query, data, 300);
+ }
- if (data.currency === 'exalt') {
- const { findPriceByQuery, autoCurrency } = usePoeninja()
- const xchgExalted = findPriceByQuery({ ns: 'ITEM', name: 'Exalted Orb', variant: undefined })
- if (!xchgExalted) {
- throw new Error('poeprices.info gave the price in Exalted Orbs.')
- }
- const converted = autoCurrency([data.min * xchgExalted.chaos, data.max * xchgExalted.chaos])
- data.min = converted.min
- data.max = converted.max
- data.currency = (converted.currency === 'div') ? 'divine' : 'chaos'
- } else if (data.currency !== 'divine' && data.currency !== 'chaos') {
- throw new Error('poeprices.info gave the price in unknown currency.')
- }
+ if (data.currency === 'exalt') {
+ const { findPriceByQuery, autoCurrency } = usePoeninja();
+ const xchgExalted = findPriceByQuery({
+ ns: 'ITEM',
+ name: 'Exalted Orb',
+ variant: undefined,
+ });
+ if (!xchgExalted) {
+ throw new Error('poeprices.info gave the price in Exalted Orbs.');
+ }
+ const converted = autoCurrency([
+ data.min * xchgExalted.chaos,
+ data.max * xchgExalted.chaos,
+ ]);
+ data.min = converted.min;
+ data.max = converted.max;
+ data.currency = converted.currency === 'div' ? 'divine' : 'chaos';
+ } else if (data.currency !== 'divine' && data.currency !== 'chaos') {
+ throw new Error('poeprices.info gave the price in unknown currency.');
+ }
- return {
- currency: (data.currency === 'divine') ? 'div' : 'chaos',
- min: data.min,
- max: data.max,
- confidence: Math.round(data.pred_confidence_score),
- explanation: data.pred_explanation.map(expl => ({
- name: expl[0],
- contrib: Math.round(expl[1] * 100)
- }))
- }
+ return {
+ currency: data.currency === 'divine' ? 'div' : 'chaos',
+ min: data.min,
+ max: data.max,
+ confidence: Math.round(data.pred_confidence_score),
+ explanation: data.pred_explanation.map((expl) => ({
+ name: expl[0],
+ contrib: Math.round(expl[1] * 100),
+ })),
+ };
}
-export function getExternalLink (item: ParsedItem): string {
- const query = querystring({
- i: utf8ToBase64(transformItemText(item.rawText)),
- l: useLeagues().selectedId.value,
- s: 'awakened-poe-trade',
- w: 1
- })
- return `https://www.poeprices.info/api?${query}`
+export function getExternalLink(item: ParsedItem): string {
+ const query = querystring({
+ i: utf8ToBase64(transformItemText(item.rawText)),
+ l: useLeagues().selectedId.value,
+ s: 'awakened-poe-trade',
+ w: 1,
+ });
+ return `https://www.poeprices.info/api?${query}`;
}
-export async function sendFeedback (
- feedback: { text: string, option: 'fair' | 'low' | 'high' },
- prediction: Pick,
- item: ParsedItem
+export async function sendFeedback(
+ feedback: { text: string; option: 'fair' | 'low' | 'high' },
+ prediction: Pick,
+ item: ParsedItem
): Promise {
- const body = new FormData()
- body.append('selector', feedback.option)
- body.append('feedbacktxt', feedback.text)
- body.append('qitem_txt', utf8ToBase64(transformItemText(item.rawText)))
- body.append('source', 'awakened-poe-trade')
- body.append('min', String(prediction.min))
- body.append('max', String(prediction.max))
- body.append('currency', prediction.currency)
- body.append('league', useLeagues().selectedId.value!)
- // body.append('debug', String(1))
+ const body = new FormData();
+ body.append('selector', feedback.option);
+ body.append('feedbacktxt', feedback.text);
+ body.append('qitem_txt', utf8ToBase64(transformItemText(item.rawText)));
+ body.append('source', 'awakened-poe-trade');
+ body.append('min', String(prediction.min));
+ body.append('max', String(prediction.max));
+ body.append('currency', prediction.currency);
+ body.append('league', useLeagues().selectedId.value!);
+ // body.append('debug', String(1))
- const response = await Host.proxy('www.poeprices.info/send_feedback', {
- method: 'POST',
- body
- })
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- const text = await response.text()
- // console.assert(text === `"${feedback.option}"`)
+ const response = await Host.proxy('www.poeprices.info/send_feedback', {
+ method: 'POST',
+ body,
+ });
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const text = await response.text();
+ // console.assert(text === `"${feedback.option}"`)
}
-function utf8ToBase64 (value: string) {
- return btoa(unescape(encodeURIComponent(value)))
+function utf8ToBase64(value: string) {
+ return btoa(unescape(encodeURIComponent(value)));
}
-function querystring (q: Record) {
- return Object.entries(q)
- .map(pair => pair.map(encodeURIComponent).join('='))
- .join('&')
+function querystring(q: Record) {
+ return Object.entries(q)
+ .map((pair) => pair.map(encodeURIComponent).join('='))
+ .join('&');
}
/**
* @deprecated TODO blocked by poeprices.info not supporting advanced text
*/
-function transformItemText (rawText: string) {
- // this may not account for all cases
- return rawText
- .replace(/(?<=\d)(\([^)]+\))/gm, '')
- .replace(/^\{.+\}$\n/gm, '')
+function transformItemText(rawText: string) {
+ // this may not account for all cases
+ return rawText
+ .replace(/(?<=\d)(\([^)]+\))/gm, '')
+ .replace(/^\{.+\}$\n/gm, '');
}
diff --git a/renderer/src/web/price-check/trade/TradeBulk.vue b/renderer/src/web/price-check/trade/TradeBulk.vue
index e6db02a5..e7ccfd65 100644
--- a/renderer/src/web/price-check/trade/TradeBulk.vue
+++ b/renderer/src/web/price-check/trade/TradeBulk.vue
@@ -6,12 +6,14 @@
{{ t(':matched') }}
...
- {{ t('Support development on') }} 
+ {{ t('Support development on') }}
-
-
|
- {{ (selectedCurr === 'xchgChaos') ? 'chaos' : 'div' }}{{ '\u2009' }}/{{ '\u2009' }}{{ t(':bulk') }}
+ {{ (selectedCurr === 'xchgChaos') ? 'chaos' : 'div'
+ }}{{ '\u2009' }}/{{ '\u2009' }}{{ t(':bulk')
+ }}
|
{{ t(':stock') }}
@@ -55,19 +59,25 @@
| ||||||
|---|---|---|---|---|---|---|---|
| {{ Number((result.exchangeAmount / result.itemAmount).toFixed(4)) }} | -{{ result.exchangeAmount }}{{ '\u2009' }}/{{ '\u2009' }}{{ result.itemAmount }} | +{{ result.exchangeAmount + }}{{ '\u2009' }}/{{ '\u2009' }}{{ result.itemAmount + }} | {{ result.stock }} | -{{ Math.floor(result.stock / result.itemAmount) }} | +{{ Math.floor(result.stock / + result.itemAmount) }} |
{{ result.relativeDate }}
|
{{ t('You') }} - {{ showSeller === 'ign' ? result.ign : result.accountName }} + {{ showSeller === 'ign' ? result.ign : result.accountName + }} |
-