Merge pull request #601 from Kvan7:dev

v0.11.5

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -43,6 +43,7 @@ body:
       label: Version
       description: What version of EE2 are you running? You can see this in Settings -> About
       options:
+        - 0.11.5
         - 0.11.4
         - 0.11.3
         - 0.11.2

README.md

@@ -1,6 +1,6 @@
 # ![Perfect Jewelers Orb](./renderer/public/images/jeweler.png) Exiled Exchange 2
 
-![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.11.4.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
+![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.11.5.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
 ![GitHub Tag](https://img.shields.io/github/v/tag/kvan7/exiled-exchange-2?style=plastic&label=latest%20version)
 ![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/kvan7/exiled-exchange-2/latest/dev?style=plastic)
 

docs/.vitepress/config.js

@@ -20,7 +20,7 @@ export default defineConfig({
   },
   themeConfig: {
     // logo: 'TODO', https://github.com/vuejs/vitepress/issues/1401
-    appVersion: '0.11.4',
+    appVersion: '0.11.5',
     github: {
       releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases'
     },

main/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "exiled-exchange-2",
-      "version": "0.11.4",
+      "version": "0.11.5",
       "dependencies": {
         "electron-overlay-window": "3.3.0",
         "uiohook-napi": "1.5.x"

main/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "private": true,
   "scripts": {
     "dev": "node build/script.mjs",

renderer/src/web/price-check/trade/TradeItem.vue

@@ -74,6 +74,11 @@
         class="rounded px-1 text-gray-800 bg-gray-400 ml-1"
         >{{ t("You") }}</span
       >
+      <span
+        v-if="!showSeller && result.inDemand"
+        class="rounded px-1 bg-yellow-500 text-black ml-1"
+        >{{ t("in demand") }}</span
+      >
     </td>
     <td v-if="showSeller" class="px-2 whitespace-nowrap">
       <span
@@ -84,6 +89,11 @@
       <span v-else class="font-sans text-xs">{{
         showSeller === "ign" ? result.ign : result.accountName
       }}</span>
+      <span
+        v-if="result.inDemand"
+        class="rounded px-1 bg-yellow-500 text-black ml-1"
+        >{{ t("in demand") }}</span
+      >
     </td>
   </tr>
 </template>

renderer/src/web/price-check/trade/pathofexile-trade.ts

@@ -277,7 +277,9 @@ interface FetchResult {
       type: "~price";
     };
     account: Account;
+    in_demand?: boolean;
   };
+  gone?: boolean;
 }
 
 export interface DisplayItem {
@@ -308,6 +310,8 @@ export interface PricingResult {
   accountStatus: "offline" | "online" | "afk";
   ign: string;
   displayItem: DisplayItem;
+  inDemand?: boolean;
+  gone?: boolean;
 }
 
 export function createTradeRequest(
@@ -1050,6 +1054,8 @@ export async function requestResults(
           : "online"
         : "offline",
       displayItem,
+      inDemand: result.listing.in_demand,
+      gone: result.gone,
     };
   });
 }

renderer/src/web/price-check/trade/trade-api.ts

@@ -80,7 +80,7 @@ export function useTradeApi() {
                 _searchResult.result.slice(0, 10),
                 { accountName: AppConfig().accountName },
               ).then((results) => {
-                _fetchResults.push(...results);
+                _fetchResults.push(...results.filter((res) => !res.gone));
               })
             : Promise.resolve();
         const r2 =
@@ -91,7 +91,7 @@ export function useTradeApi() {
                 { accountName: AppConfig().accountName },
               ).then(async (results) => {
                 await r1.then(() => {
-                  _fetchResults.push(...results);
+                  _fetchResults.push(...results.filter((res) => !res.gone));
                 });
               })
             : Promise.resolve();
@@ -116,7 +116,7 @@ export function useTradeApi() {
             _searchResult.result.slice(fetched, fetched + 10),
             { accountName: AppConfig().accountName },
           ).then((results) => {
-            _fetchResults.push(...results);
+            _fetchResults.push(...results.filter((res) => !res.gone));
           });
           fetched += 10;
           await fetchMore();