enable builtin browser with warning SnosMe#821

yaMax1m · Jan 8, 2023 · e2fec37 · e2fec37
1 parent f6619e9
commit e2fec37
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/main/package.json b/main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "awakened-poe-trade",
-  "version": "3.20.10006",
+  "version": "3.20.10007",
   "private": true,
   "scripts": {
     "dev": "node build/script.cjs",

diff --git a/renderer/src/web/Config.ts b/renderer/src/web/Config.ts
@@ -120,7 +120,7 @@ export interface Config {
 }
 
 export const defaultConfig = (): Config => ({
-  configVersion: 14,
+  configVersion: 15,
   overlayKey: 'Shift + Space',
   overlayBackground: 'rgba(129, 139, 149, 0.15)',
   overlayBackgroundExclusive: true,
@@ -194,6 +194,7 @@ export const defaultConfig = (): Config => ({
       smartInitialSearch: true,
       lockedInitialSearch: true,
       activateStockFilter: false,
+      builtinBrowser: false,
       hotkey: 'D',
       hotkeyHold: 'Ctrl',
       hotkeyLocked: 'Ctrl + Alt + D',
@@ -496,6 +497,14 @@ function upgradeConfig (_config: Config): Config {
     config.configVersion = 14
   }
 
+  if (config.configVersion < 15) {
+    const priceCheck = config.widgets.find(w => w.wmType === 'price-check') as widget.PriceCheckWidget
+
+    priceCheck.builtinBrowser = false
+
+    config.configVersion = 15
+  }
+
   return config as unknown as Config
 }
 

diff --git a/renderer/src/web/overlay/widgets.ts b/renderer/src/web/overlay/widgets.ts
@@ -42,6 +42,7 @@ export interface PriceCheckWidget extends Widget {
   activateStockFilter: boolean
   showCursor: boolean
   requestPricePrediction: boolean
+  builtinBrowser: boolean
 }
 
 export interface ItemCheckWidget extends Widget {

diff --git a/renderer/src/web/price-check/trade/TradeLinks.vue b/renderer/src/web/price-check/trade/TradeLinks.vue
@@ -10,18 +10,17 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, inject } from 'vue'
+import { defineComponent, PropType, inject, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { Host } from '@/web/background/IPC'
+import { AppConfig } from '@/web/Config'
+import { PriceCheckWidget } from '@/web/overlay/widgets'
 
 export default defineComponent({
   props: {
     getLink: {
       type: Function as PropType<() => string>,
       required: true
-    },
-    builtin: {
-      type: Boolean,
-      default: false
     }
   },
   setup (props) {
@@ -30,6 +29,11 @@ export default defineComponent({
 
     return {
       t,
+      builtin: computed(() => {
+        if (!Host.isElectron) return false
+        const priceCheck = AppConfig('price-check') as PriceCheckWidget
+        return priceCheck.builtinBrowser
+      }),
       open (isExternal: boolean) {
         const link = props.getLink()
         if (isExternal) {

diff --git a/renderer/src/web/settings/price-check.vue b/renderer/src/web/settings/price-check.vue
@@ -83,7 +83,15 @@
         <ui-radio v-model="showCursor" :value="false">{{ t('No') }}</ui-radio>
       </div>
     </div>
-    <div class="mb-2 bg-orange-800 p-2">{{ t('Settings below are a compromise between increasing load on PoE website and convenient price checking / more accurate search.') }}</div>
+    <div class="mb-6" :class="{ 'p-2 bg-orange-800 rounded': builtinBrowser }">
+      <div class="flex-1 mb-1">{{ t('Enable builtin browser') }}</div>
+      <div class="flex">
+        <ui-radio v-model="builtinBrowser" :value="true" class="mr-4">{{ t('Yes') }}</ui-radio>
+        <ui-radio v-model="builtinBrowser" :value="false">{{ t('No') }}</ui-radio>
+      </div>
+      <div v-if="builtinBrowser" class="mt-1">{{ t('builtin_browser_warning') }}</div>
+    </div>
+    <div class="mb-2 bg-orange-800 p-2 rounded">{{ t('Settings below are a compromise between increasing load on PoE website and convenient price checking / more accurate search.') }}</div>
     <div class="mb-2">
       <div class="flex-1 mb-1">{{ t('Show indication on collapsed listings') }}</div>
       <div class="mb-4 flex">
@@ -144,6 +152,7 @@ export default defineComponent({
       showSeller: configModelValue(() => configWidget.value, 'showSeller'),
       activateStockFilter: configModelValue(() => configWidget.value, 'activateStockFilter'),
       showCursor: configModelValue(() => configWidget.value, 'showCursor'),
+      builtinBrowser: configModelValue(() => configWidget.value, 'builtinBrowser'),
       requestPricePrediction: configModelValue(() => configWidget.value, 'requestPricePrediction'),
       collapseListings: configModelValue(() => configWidget.value, 'collapseListings'),
       hotkeyQuick: computed(() => configWidget.value.hotkey
@@ -197,6 +206,9 @@ export default defineComponent({
 
 <i18n>
 {
+  "en": {
+    "builtin_browser_warning": "I am aware that future releases can potentially contain malicious code that can steal my POESESSID."
+  },
   "ru": {
     "Account name": "Имя учетной записи",
     "or Private League": "или Приватная лига",
@@ -218,7 +230,10 @@ export default defineComponent({
     "Loading leagues...": "Загрузка лиг...",
     "Failed to load leagues": "Не удалось загрузить лиги",
     "Price check Item, and follow the instructions in the error description.": "Прайс-чекните предмет, и следуйте инструкции в описании ошибки.",
-    "Show price prediction": "Показывать приблизительную цену"
+    "Show price prediction": "Показывать приблизительную цену",
+    "Enable builtin browser": "Включить встроенный браузер",
+    "Show item level": "Показывать уровень предмета",
+    "builtin_browser_warning": "Я осознаю, что в будущие релизы могут потенциально содержать вредоносный код, который может украсть мой POESESSID."
   },
   "cmn-Hant": {
     "League": "聯盟"