diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index eb442c74a..b05a00ed2 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -20,7 +20,7 @@ export default defineConfig({ }, themeConfig: { // logo: 'TODO', https://github.com/vuejs/vitepress/issues/1401 - appVersion: '0.1.2', + appVersion: '0.1.3', github: { releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases' }, diff --git a/docs/complex-query.md b/docs/complex-query.md index d851368bc..f7b0913ab 100644 --- a/docs/complex-query.md +++ b/docs/complex-query.md @@ -13,3 +13,5 @@ Hitting "Browser" from the error message will open in the built-in browser. To open in your default browser, hit the arrow to the right of "trade" before searching the item. Selecting "Trade" will open the trade page in the built-in browser. ![tradeButton](/reference-images/tradeButton.png) + +If there are further issues, or you don't want to use the builtin browser for auth, disable the "Use Pseudo" option in settings. (under Price Check) diff --git a/main/package-lock.json b/main/package-lock.json index 5ab6100f6..fcae40a63 100644 --- a/main/package-lock.json +++ b/main/package-lock.json @@ -1,12 +1,12 @@ { "name": "exiled-exchange-2", - "version": "0.1.2", + "version": "0.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "exiled-exchange-2", - "version": "0.1.2", + "version": "0.1.3", "dependencies": { "electron-overlay-window": "3.3.0", "uiohook-napi": "1.5.x" diff --git a/main/package.json b/main/package.json index 8c756e177..6f54f8d30 100644 --- a/main/package.json +++ b/main/package.json @@ -1,6 +1,6 @@ { "name": "exiled-exchange-2", - "version": "0.1.2", + "version": "0.1.3", "private": true, "scripts": { "dev": "node build/script.mjs", diff --git a/renderer/public/data/en/app_i18n.json b/renderer/public/data/en/app_i18n.json index 83ae2eb89..668053295 100644 --- a/renderer/public/data/en/app_i18n.json +++ b/renderer/public/data/en/app_i18n.json @@ -310,6 +310,7 @@ "hotkey": "Auto-hide Mode", "hotkey_locked": "Open without auto-hide", "enable_browser": "Enable builtin browser", + "use_pseudo": "Use pseudo mods (disable if you have issues with auth)", "builtin_browser_warning": "I am aware that future releases can potentially contain malicious code that can steal my POESESSID.", "highlight_hint": "Your items will be highlighted even if this setting is off", "show_seller": "Show seller", diff --git a/renderer/src/web/Config.ts b/renderer/src/web/Config.ts index 57a1d4156..009f50283 100644 --- a/renderer/src/web/Config.ts +++ b/renderer/src/web/Config.ts @@ -205,6 +205,7 @@ export const defaultConfig = (): Config => ({ lockedInitialSearch: true, activateStockFilter: false, builtinBrowser: false, + usePseudo: true, hotkey: "D", hotkeyHold: "Ctrl", hotkeyLocked: "Ctrl + Alt + D", diff --git a/renderer/src/web/overlay/widgets.ts b/renderer/src/web/overlay/widgets.ts index 46c6a2294..8c1225be8 100644 --- a/renderer/src/web/overlay/widgets.ts +++ b/renderer/src/web/overlay/widgets.ts @@ -42,6 +42,7 @@ export interface PriceCheckWidget extends Widget { showCursor: boolean; requestPricePrediction: boolean; builtinBrowser: boolean; + usePseudo: boolean; rememberCurrency: boolean; } diff --git a/renderer/src/web/price-check/CheckedItem.vue b/renderer/src/web/price-check/CheckedItem.vue index 5eff18ef2..be52e78d7 100644 --- a/renderer/src/web/price-check/CheckedItem.vue +++ b/renderer/src/web/price-check/CheckedItem.vue @@ -163,6 +163,7 @@ export default defineComponent({ item.info.refName === prevItem.info.refName) ? prevCurrency : undefined, + usePseudo: widget.value.usePseudo, }); if ( diff --git a/renderer/src/web/price-check/filters/create-presets.ts b/renderer/src/web/price-check/filters/create-presets.ts index ced4b5d44..e4e509f3d 100644 --- a/renderer/src/web/price-check/filters/create-presets.ts +++ b/renderer/src/web/price-check/filters/create-presets.ts @@ -18,6 +18,7 @@ export function createPresets( activateStockFilter: boolean; searchStatRange: number; useEn: boolean; + usePseudo: boolean; }, ): { presets: FilterPreset[]; active: string } { if (item.info.refName === "Expedition Logbook") { diff --git a/renderer/src/web/price-check/filters/create-stat-filters.ts b/renderer/src/web/price-check/filters/create-stat-filters.ts index 4c58479d7..ad27834f8 100644 --- a/renderer/src/web/price-check/filters/create-stat-filters.ts +++ b/renderer/src/web/price-check/filters/create-stat-filters.ts @@ -126,6 +126,7 @@ export function initUiModFilters( item: ParsedItem, opts: { searchStatRange: number; + usePseudo: boolean; }, ): StatFilter[] { const ctx: FiltersCreationContext = { @@ -147,7 +148,7 @@ export function initUiModFilters( if (item.info.refName !== "Split Personality") { filterItemProp(ctx); - filterPseudo(ctx); + filterPseudo(ctx, opts.usePseudo); if (item.info.refName === "Emperor's Vigilance") { filterBasePercentile(ctx); } diff --git a/renderer/src/web/price-check/filters/pseudo/index.ts b/renderer/src/web/price-check/filters/pseudo/index.ts index 02fa7466e..178901051 100644 --- a/renderer/src/web/price-check/filters/pseudo/index.ts +++ b/renderer/src/web/price-check/filters/pseudo/index.ts @@ -325,9 +325,11 @@ const PSEUDO_RULES: PseudoRule[] = [ // }, ]; -export function filterPseudo(ctx: FiltersCreationContext) { +export function filterPseudo(ctx: FiltersCreationContext, usePseudo: boolean) { const filterByGroup = new Map(); + if (!usePseudo) return; + rulesLoop: for (const rule of PSEUDO_RULES) { const sources = filterPseudoSources(ctx.statsByType, ({ stat }, source) => { const info = rule.stats.find((info) => info.ref === stat.ref); diff --git a/renderer/src/web/settings/price-check.vue b/renderer/src/web/settings/price-check.vue index 60675ef2b..42cdb0ee5 100644 --- a/renderer/src/web/settings/price-check.vue +++ b/renderer/src/web/settings/price-check.vue @@ -3,11 +3,7 @@
{{ t("league") }} -
@@ -17,21 +13,13 @@
@@ -45,10 +33,7 @@
{{ t("settings.account_name") }}
- +
@@ -71,10 +56,8 @@
+- - + %
{{ @@ -88,15 +71,14 @@ {{ t(":select_stock") }} - {{ t(":show_prediction") }} - www.poeprices.info + {{ t(":show_prediction") }} + www.poeprices.info {{ t(":cursor_pos") }} + + {{ t(":use_pseudo") + }}
{{ t(":enable_browser") @@ -107,20 +89,12 @@
{{ t(":warn_expensive") }}
- {{ t(":accurate_collapsed") }} + {{ t(":accurate_collapsed") + }}
{{ t(":auto_search") }}
- + {{ hotkeyQuick }} @@ -136,10 +110,8 @@
{{ t(":extra_delay") }}
- + {{ t("seconds") }}
@@ -196,6 +168,7 @@ export default defineComponent({ () => configWidget.value, "builtinBrowser", ), + usePseudo: configModelValue(() => configWidget.value, "usePseudo"), requestPricePrediction: configModelValue( () => configWidget.value, "requestPricePrediction",