- fixed an issue parsing unicode item data

CHANGELOG.md

@@ -2,11 +2,13 @@
 
 ## 1.0.6 (2020-06-25)
 
-- added market search history
-- added trade offer received timer
-- added trade player name
-- added trade go to hideout action
-- added harvest seeds evaluate support
+- added a history for the market search
+- added a received timer at the trade message
+- added the player name at the trade message
+- added a new action to go to the hideout for outgoing trades
+- added support for the new harvest seeds
+- update the height of the trade window to be configurable
+- fixed an issue parsing unicode item data
 - fixed an issue at the market which resulted in crashing the app
 
 ## 1.0.5 (2020-06-23)

manifest.json

@@ -4,7 +4,7 @@
     "meta": {
         "name": "PoE Overlay",
         "author": "Kyusung4698",
-        "version": "1.0.5",
+        "version": "1.0.6",
         "minimum-overwolf-version": "0.147.0",
         "description": "Search the market and send trade offers. Get current market values for your item. View insights for maps and items.",
         "dock_button_title": "PoE Overlay",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay-overwolf",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "scripts": {
     "watch": "ng build --watch",
     "watch:prod": "ng build --watch --prod",

src/app/core/helper/base64.ts

@@ -0,0 +1,11 @@
+export function b64EncodeUnicode(str: string): string {
+    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, (_, p1) => {
+        return String.fromCharCode(parseInt(p1, 16));
+    }));
+}
+
+export function b64DecodeUnicode(str: string): string {
+    return decodeURIComponent(Array.prototype.map.call(atob(str), (c: string) => {
+        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+    }).join(''));
+}

src/app/core/helper/index.ts

@@ -1 +1,2 @@
+export * from './base64';
 export * from './roman';

src/app/data/poe-prices/service/item-price-prediction-http.service.ts

@@ -1,5 +1,6 @@
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { b64EncodeUnicode } from '@app/helper';
 import { environment } from '@env/environment';
 import { Observable, of, throwError } from 'rxjs';
 import { delay, flatMap, retryWhen } from 'rxjs/operators';
@@ -19,7 +20,7 @@ export class ItemPricePredictionHttpService {
     }
 
     public get(leagueId: string, stringifiedItem: string): Observable<ItemPricePredictionResponse> {
-        const base64Item = btoa(stringifiedItem);
+        const base64Item = b64EncodeUnicode(stringifiedItem);
         const encodedLeagueId = encodeURIComponent(leagueId);
         const encodedItem = encodeURIComponent(base64Item);
 
@@ -52,7 +53,7 @@ export class ItemPricePredictionHttpService {
         form.set('max', `${max}`);
         form.set('selector', selector);
         form.set('currency', currencyId);
-        form.set('qitem_text', btoa(stringifiedItem));
+        form.set('qitem_text', b64EncodeUnicode(stringifiedItem));
         form.set('debug', `${environment.production ? 0 : 1}`);
         form.set('source', SOURCE);
 

src/app/layout/component/settings-form/settings-form.component.ts

@@ -13,8 +13,6 @@ import { BehaviorSubject } from 'rxjs';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SettingsFormComponent implements OnInit {
-  private language: Language;
-
   public languages = new EnumValues(Language);
   public uiLanguages = new EnumValues(UiLanguage);
 
@@ -32,11 +30,7 @@ export class SettingsFormComponent implements OnInit {
     private readonly leagues: TradeLeaguesService) { }
 
   public ngOnInit(): void {
-    const { language } = this.settings;
-    if (language && this.language !== language) {
-      this.language = language;
-      this.updateLeagues();
-    }
+    this.updateLeagues();
   }
 
   public onChange(): void {
@@ -49,8 +43,8 @@ export class SettingsFormComponent implements OnInit {
   }
 
   private updateLeagues(): void {
-    const { leagueId } = this.settings;
-    this.leagues.get(this.language).subscribe(leagues => {
+    const { leagueId, language } = this.settings;
+    this.leagues.get(language).subscribe(leagues => {
       const selectedLeague = leagues.find(league => league.id === leagueId);
       if (!selectedLeague) {
         this.settings.leagueId = leagues[0].id;

src/app/modules/market/component/market-exchange-bar/market-exchange-bar.component.ts

@@ -18,10 +18,10 @@ export class MarketExchangeBarComponent {
   public request: TradeExchangeRequest;
 
   @Output()
-  public highlight = new EventEmitter<string>();
+  public requestChange = new EventEmitter<TradeExchangeRequest>();
 
   @Output()
-  public reset = new EventEmitter<TradeExchangeRequest>();
+  public highlight = new EventEmitter<string>();
 
   @Output()
   public toggle = new EventEmitter<boolean>();
@@ -35,7 +35,11 @@ export class MarketExchangeBarComponent {
 
   public onResetClick(request?: TradeExchangeRequest): void {
     this.recordsVisible$.next(false);
-    this.reset.next(request);
+    if (request) {
+      this.requestChange.next(JSON.parse(JSON.stringify(request)));
+    } else {
+      this.requestChange.next();
+    }
   }
 
   public onToggleClick(): void {

src/app/modules/market/component/market-exchange/market-exchange.component.html

@@ -1,5 +1,5 @@
 <app-market-exchange-bar [request]="request" (search)="onSearch()" (toggle)="onToggle($event)"
-    (highlight)="onHighlight($event)" (reset)="onReset($event)">
+    (highlight)="onHighlight($event)" (requestChange)="onRequestChange($event)">
 </app-market-exchange-bar>
 
 <div class="content">

src/app/modules/market/component/market-exchange/market-exchange.component.ts

@@ -93,7 +93,7 @@ export class MarketExchangeComponent implements OnInit, OnDestroy {
     this.page$.next(this.page$.value + 1);
   }
 
-  public onReset(request?: TradeExchangeRequest): void {
+  public onRequestChange(request?: TradeExchangeRequest): void {
     this.request = request || DEFAULT_REQUEST();
     this.initSearch();
     this.clear();

src/app/modules/market/component/market-item-search-bar/market-item-search-bar.component.ts

@@ -41,13 +41,13 @@ export class MarketItemSearchBarComponent implements OnInit {
   }
 
   @Output()
-  public search = new EventEmitter<void>();
+  public requestChange = new EventEmitter<TradeSearchRequest>();
 
   @Output()
-  public toggle = new EventEmitter<boolean>();
+  public search = new EventEmitter<void>();
 
   @Output()
-  public reset = new EventEmitter<TradeSearchRequest>();
+  public toggle = new EventEmitter<boolean>();
 
   constructor(private readonly items: TradeItemsService) { }
 
@@ -72,7 +72,11 @@ export class MarketItemSearchBarComponent implements OnInit {
 
   public onResetClick(request?: TradeSearchRequest): void {
     this.recordsVisible$.next(false);
-    this.reset.next(request);
+    if (request) {
+      this.requestChange.next(JSON.parse(JSON.stringify(request)));
+    } else {
+      this.requestChange.next();
+    }
   }
 
   public onItemClick(item: TradeItem): void {
@@ -95,7 +99,7 @@ export class MarketItemSearchBarComponent implements OnInit {
     setTimeout(() => {
       this.filterVisible$.next(false);
       this.update();
-    }, 200)
+    }, 200);
   }
 
   private resetRequest(): void {
@@ -124,8 +128,8 @@ export class MarketItemSearchBarComponent implements OnInit {
     if (hasType || hasName) {
       this.items.get().subscribe(items => {
         let found = false;
-        for (let group of items) {
-          for (let item of group.items) {
+        for (const group of items) {
+          for (const item of group.items) {
             if ((!hasType || item.type === type) && (!hasName || item.name === name)) {
               found = true;
               this.setViewValue(item.text);

src/app/modules/market/component/market-item-search/market-item-search.component.html

@@ -1,5 +1,5 @@
 <app-market-item-search-bar [request]="request" (search)="onSearch()" (toggle)="onToggle($event)"
-    (reset)="onReset($event)">
+    (requestChange)="onRequestChange($event)">
 </app-market-item-search-bar>
 
 <div class="content">

src/app/modules/market/component/market-item-search/market-item-search.component.ts

@@ -100,7 +100,7 @@ export class MarketItemSearchComponent implements OnInit, OnDestroy {
     this.page$.next(this.page$.value + 1);
   }
 
-  public onReset(request?: TradeSearchRequest): void {
+  public onRequestChange(request?: TradeSearchRequest): void {
     this.request = request || DEFAULT_REQUEST();
     this.initSearch();
     this.clear();

src/app/modules/trade/component/trade-message/trade-message.component.html

@@ -6,7 +6,7 @@
             <mat-icon (click)="onWait($event)" *ngIf="visible['wait']">pan_tool</mat-icon>
         </div>
         <div class="title">
-            <div class="name" [title]="message.name">{{message.name | truncateText: 20}}</div>
+            <div class="name" [title]="message.name">{{message.name | truncateText: 30}}</div>
             <div class="spacer"></div>
             <div class="timer">{{message.timeReceived | timer | async}}</div>
         </div>

src/app/modules/trade/component/trade-settings/trade-settings.component.html

@@ -7,6 +7,20 @@
             </mat-slide-toggle>
         </div>
     </div>
+    <div class="row">
+        <div class="col-12">
+            <div class="value-range">
+                <label class="label"> {{'trade.height' | translate}}:
+                    {{displayWithPercentage(settings.tradeHeight)}}
+                </label>
+                <div class="slider">
+                    <mat-slider min="10" max="100" step="5" tickInterval="2" [displayWith]="displayWithPercentage"
+                        [(value)]="settings.tradeHeight" (valueChange)="onChange()">
+                    </mat-slider>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row">
         <div class="col-6">
             <mat-form-field>
@@ -75,10 +89,10 @@
         <div class="col-12">
             <div class="value-range">
                 <label class="label"> {{'trade.sound.volume' | translate}}:
-                    {{displayWithVolume(settings.tradeSoundVolume)}}
+                    {{displayWithPercentage(settings.tradeSoundVolume)}}
                 </label>
                 <div class="slider">
-                    <mat-slider min="0" max="100" step="5" tickInterval="2" [displayWith]="displayWithVolume"
+                    <mat-slider min="0" max="100" step="5" tickInterval="2" [displayWith]="displayWithPercentage"
                         [(value)]="settings.tradeSoundVolume" (valueChange)="onChange()">
                     </mat-slider>
                     <button mat-raised-button color="primary" (click)="onPlay()">

src/app/modules/trade/component/trade-settings/trade-settings.component.ts

@@ -18,7 +18,7 @@ export class TradeSettingsComponent extends FeatureSettingsComponent<TradeFeatur
 
   public layouts = new EnumValues(TradeLayout);
   public filters = new EnumValues(TradeFilter);
-  public displayWithVolume = (volume: number) => `${volume}%`;
+  public displayWithPercentage = (volume: number) => `${volume}%`;
 
   public load(): void { }
 

src/app/modules/trade/service/trade-window.service.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { WindowName } from '@app/config';
 import { EventEmitter } from '@app/event';
-import { OWWindow } from '@app/odk';
+import { OWGames, OWWindow } from '@app/odk';
 import { ProcessStorageService } from '@app/storage';
 import { TradeExchangeMessage } from '@shared/module/poe/trade/chat';
 import { Observable } from 'rxjs';
-import { TradeFeatureSettings } from '../trade-feature-settings';
 import { flatMap } from 'rxjs/operators';
+import { TradeFeatureSettings } from '../trade-feature-settings';
 
 const WINDOW_DATA_KEY = 'TRADE_WINDOW_DATA';
 
@@ -41,7 +41,13 @@ export class TradeWindowService {
         data.settings = settings;
         this.data$.next(data);
         return this.window.restore().pipe(
-            flatMap(() => this.window.changeSize(310, 400))
+            flatMap(() => OWGames.getRunningGameInfo().pipe(
+                flatMap(({ height }) => {
+                    const newHeight = Math.round(height * settings.tradeHeight / 100);
+                    console.log(newHeight);
+                    return this.window.changeSize(310, newHeight);
+                })
+            ))
         );
     }
 

src/app/modules/trade/trade-feature-settings.ts

@@ -24,4 +24,5 @@ export interface TradeFeatureSettings extends FeatureSettings {
     tradeSoundVolume: number;
     tradeFilter: TradeFilter;
     tradeLayout: TradeLayout;
+    tradeHeight: number;
 }

src/app/modules/trade/trade.module.ts

@@ -59,7 +59,8 @@ export class TradeModule implements FeatureModule<TradeFeatureSettings> {
                 tradeSoundEnabled: true,
                 tradeSoundVolume: 75,
                 tradeFilter: TradeFilter.IncomingOutgoing,
-                tradeLayout: TradeLayout.TopToBottom
+                tradeLayout: TradeLayout.TopToBottom,
+                tradeHeight: 30
             }
         };
         return config;

src/app/modules/trade/window/trade-window/trade-window.component.scss

@@ -53,7 +53,7 @@
 .messages {
   display: flex;
   flex-direction: column;
-  min-height: 370px;
+  min-height: calc(100vh - 30px);
   margin-right: 10px;
 
   &.reverse {

src/app/shared/module/poe/chat/chat.service.ts

@@ -44,7 +44,7 @@ export class ChatService {
         this.queue$.next({ message, send: true });
     }
 
-    public hideout(name: string): void {        
+    public hideout(name: string): void {
         const message = this.generateMessage('/hideout', name);
         this.queue$.next({ message, send: true });
     }

src/app/shared/module/poe/item/clipboard/item-clipboard-parser.service.ts

@@ -49,6 +49,7 @@ export class ItemClipboardParserService {
         ];
     }
 
+    // TODO: get the language via rarity
     public parse(
         content: string,
         parse?: {

src/app/shared/module/poe/price/item-price-prediction.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ItemPricePredictionHttpService } from '@data/poe-prices';
-import { forkJoin, Observable } from 'rxjs';
+import { Language } from '@data/poe/schema';
+import { forkJoin, Observable, throwError } from 'rxjs';
 import { flatMap, map } from 'rxjs/operators';
 import { ContextService } from '../context';
 import { CurrencyConverterService, CurrencySelectService, CurrencySelectStrategy } from '../currency';
@@ -23,6 +24,11 @@ export class ItemPricePredictionService {
         leagueId = leagueId || this.context.get().leagueId;
 
         // TODO: translate item source
+        const language = this.context.get().language;
+        if (language !== Language.English) {
+            return throwError('evaluate.prediction.language');
+        }
+
         const { content } = item;
         return this.prediction.provide(leagueId, content).pipe(
             flatMap(prediction => forkJoin(

src/app/shared/module/poe/trade/fetch/trade-fetch.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { StorageCacheService } from '@app/cache';
+import { b64DecodeUnicode } from '@app/helper';
 import { TradeFetchHttpResult } from '@data/poe/schema';
 import { TradeHttpService } from '@data/poe/service';
 import moment from 'moment';
@@ -166,7 +167,7 @@ export class TradeFetchService {
                 },
                 item: {
                     icon: item.icon.replace(/\\/g, ''),
-                    text: text ? atob(text) : '',
+                    text: text ? b64DecodeUnicode(text) : '',
                     hashes: Object
                         .getOwnPropertyNames(hashes || {})
                         .reduce((a, b) => a.concat(hashes[b].map(([hash]) => hash)), [])