Merge branch 'lindo-app.com'

JulienCoutault · JulienCoutault · commit 110175748cb3 · 2021-04-13T21:32:54.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## ⚠ ATTENTION, VÉRIFIEZ QUE VOUS TÉLÉCHARGEZ LINDO DEPUIS LINDO.NO-EMU.CO
+## ⚠ ATTENTION, VÉRIFIEZ QUE VOUS TÉLÉCHARGEZ LINDO DEPUIS LINDO-APP.COM
 ## ⚠ CERTAINS SITES MALVEILLANTS INSTALLERONT UN VIRUS SUR VOTRE ORDINATEUR
 
 ## [2.6.0]
@@ -16,11 +16,15 @@
 ### Correctifs
 - Crash de Lindo avec le déplacement rapide lorsque la case est inaccessible
 
+## [2.5.4] - 2021-04-13
+
+### Ajouts
+- Possibilité de choisir la position du champ texte du chat
+
 ## [2.5.3] - 2021-04-04
 
 ### Correctifs
-
-- Mise à jour des liens du site de Lindo pour qu'ils pointent vers la nouvelle adresse: https://lindo-app.com
+- Mise à jour les liens du site de Lindo pour qu'ils pointent vers la nouvelle adresse: https://lindo-app.com
 
 ## [2.5.2] - 2020-11-14
 
diff --git a/electron/application.ts b/electron/application.ts
@@ -11,7 +11,7 @@ const pkg = require(`${app.getAppPath()}/package.json`);
 export class Application {
 
     public static mainWindows: MainWindow[] = [];
-    public static websiteUrl: string = "http://lindo.no-emu.co";
+    public static websiteUrl: string = "https://lindo-app.com";
     public static appPath: string = __dirname + '/../..';
     public static userDataPath: string = app.getPath('userData');
 
diff --git a/electron/core/api.ts b/electron/core/api.ts
@@ -5,7 +5,7 @@ const settings = require('electron-settings');
 
 export class Api {
 
-    public static apiUrl: string = "http://api.no-emu.co";
+    public static apiUrl: string = "https://api.lindo-app.com";
 
     public static getRemoteVersion(): Promise<Object | any> {
 
diff --git a/electron/settings/settings-default.ts b/electron/settings/settings-default.ts
@@ -23,6 +23,9 @@ export const SettingsDefault: SettingsInterface = {
             audio_muted: false,
             user_agent: 'Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-N920T Build/MMB29K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.83 Mobile Safari/537.36'
         },
+        chat: {
+            inputBottom: true,
+        },
         shortcuts: {
             no_emu: {
                 new_tab: "ctrl+t",
diff --git a/electron/settings/settings.interface.ts b/electron/settings/settings.interface.ts
@@ -20,7 +20,10 @@ export interface SettingsInterface {
             sound_focus: boolean;
             early: boolean;
             audio_muted: boolean;
-        }
+        },
+        chat: {
+            inputBottom: boolean;
+        },
         shortcuts: {
             no_emu: {
                 new_tab: string;
diff --git a/electron/update/update-app.ts b/electron/update/update-app.ts
@@ -57,7 +57,7 @@ export class UpdateApp {
 
                     Logger.info("[UPDATE] Redirected to app download page.");
 
-                    shell.openExternal("http://lindo.no-emu.co/#download");
+                    shell.openExternal("https://lindo-app.com");
                     app.exit();
                 } else {
 
diff --git a/locale/en.json b/locale/en.json
@@ -61,6 +61,7 @@
           "general": {
             "header": "General",
             "disable-inactivity": "Extend the delay before disconnection for inactivity",
+            "chat-input-bottom": "Put the chat text field at the bottom",
             "health-bar": "Activate the display of the life bars below the fighters",
             "health-bar-shortcut": "Shortcuts for show/hide life bars",
             "jobsxp": "Activate the display of the job xp need for leveling",
diff --git a/locale/es.json b/locale/es.json
@@ -59,6 +59,7 @@
           "general": {
             "header": "General",
             "disable-inactivity": "Extender el período de inactividad",
+            "chat-input-bottom": "Coloque el campo de texto del chat en la parte inferior",
             "health-bar": "Visualización de barras de vida debajo de los combatientes",
             "health-bar-shortcut": "Atajos para mostrar las barras de salud",
             "jobsxp": "Activate the display of the job xp need for leveling",
diff --git a/locale/fr.json b/locale/fr.json
@@ -61,6 +61,7 @@
           "general": {
             "header": "Général",
             "disable-inactivity": "Prolonger le délai maximum d'inactivité",
+            "chat-input-bottom": "Mettre le champ texte du chat en bas",
             "estimator": "Estimation des dégats des sorts en combat",
             "health-bar": "Barres de vie en-dessous des combatants",
             "health-bar-shortcut": "Raccourcis pour les barres de vie",
diff --git a/locale/it.json b/locale/it.json
@@ -61,6 +61,7 @@
           "general": {
             "header": "Generali",
             "disable-inactivity": "Aumenta il tempo per disconessione da inattività",
+            "chat-input-bottom": "Metti il ​​campo di testo della chat in basso",
             "health-bar": "Visualizza le barre della vita sotto i combattenti",
             "health-bar-shortcut": "Tasto rapido per mostrare/nascondere le barre della vita",
             "jobsxp": "Attiva il display dell'esperienza del lavoro necessaria ad aumentarne il livello",
diff --git a/locale/pl.json b/locale/pl.json
@@ -61,6 +61,7 @@
           "general": {
             "header": "Główne",
             "disable-inactivity": "Pozostań ciągle zalogowany",
+            "chat-input-bottom": "Umieść pole tekstowe czatu na dole",
             "health-bar": "Aktywuj wyświetlanie paska życia poniżej postaci",
             "health-bar-shortcut": "Skrót klawiszowy do pokazywania/chowania pasków życia",
             "jobsxp": "Wyświetl niezbędną liczbę doświadczenia wymaganego do następnego poziomu",
diff --git a/locale/tr.json b/locale/tr.json
@@ -61,6 +61,7 @@
           "general": {
             "header": "Genel",
             "disable-inactivity": "Bağlantı kesilmeden önce hareketsizlik nedeniyle gecikmeyi uzatın",
+            "chat-input-bottom": "Sohbet metin alanını en alta yerleştirin",
             "health-bar": "Savaşçıların altındaki yaşam çubuklarının görüntülenmesini etkinleştirin",
             "health-bar-shortcut": "Yaşam çubuklarını göster / gizle kısayolları",
             "jobsxp": "Seviye atlamak için iş xp ihtiyacının görüntülenmesini etkinleştirin",
diff --git a/src/app/core/mods/chat/chat.ts b/src/app/core/mods/chat/chat.ts
@@ -0,0 +1,30 @@
+import { Logger } from "app/core/electron/logger.helper";
+
+import { Mod } from "../mod";
+
+export class Chat extends Mod {
+    public inputBottom: boolean;
+
+    startMod(): void {
+        this.inputBottom = this.settings.option.chat.inputBottom;
+
+        if (this.inputBottom) {
+            // move input to the bot
+            Logger.info('- enable chat inputBottom');
+            let stylesheet = this.wGame.document.createElement('style');
+            stylesheet.id = "inputBottom";
+            stylesheet.innerHTML = '.chat .formChat {order: 6;}';
+            this.wGame.document.getElementsByTagName('head')[0].appendChild(stylesheet);
+        }
+    }
+
+    public reset() {
+        super.reset();
+        if (this.inputBottom) {
+            let inputBottomCss = this.wGame.document.getElementById('inputBottom');
+            if (inputBottomCss && inputBottomCss.parentElement) {
+                inputBottomCss.parentElement.removeChild(inputBottomCss);
+            }
+        }
+    }
+}
diff --git a/src/app/core/mods/index.ts b/src/app/core/mods/index.ts
@@ -2,6 +2,7 @@
 export { General } from "app/core/mods/general/general";
 
 export { AutoGroup } from "app/core/mods/autoGroup/autoGroup";
+export { Chat } from "app/core/mods/chat/chat";
 export { DamageEstimator } from "app/core/mods/damageEstimator/damageEstimator";
 export { FightChronometer } from "app/core/mods/fightChronometer/fightChronometer";
 export { ZaapSearchFilter } from "app/core/mods/zaapSearchFilter/zaapSearchFilter";
diff --git a/src/app/core/service/bug-report.service.ts b/src/app/core/service/bug-report.service.ts
@@ -23,7 +23,7 @@ export class BugReportService {
 
     public send(description) {
         let body = this.getOs() + "\n" + description + "\n\n" + this.logs;
-        axios.post('http://api.no-emu.co/report.php', {
+        axios.post('https://api.lindo-app.com/report.php', {
             logs: body,
             version: this.applicationService.version
         }).then(response => {
diff --git a/src/app/core/service/settings.service.ts b/src/app/core/service/settings.service.ts
@@ -9,19 +9,37 @@ import { SettingsDefault } from '../../../../electron/settings/settings-default'
 
 export class Option {
     public general: Option.General;
+    public chat: Option.Chat;
     public shortcuts: Option.Shortcuts;
     public notification: Option.Notification;
     public vip: Option.VIP;
 
     constructor(private settingsProvider: SettingsProvider) {
         this.general = new Option.General(settingsProvider);
+        this.chat = new Option.Chat(settingsProvider);
         this.shortcuts = new Option.Shortcuts(settingsProvider);
         this.notification = new Option.Notification(settingsProvider);
         this.vip = new Option.VIP(settingsProvider);
     }
 }
 
 export module Option {
+    export class Chat {
+        public _inputBottom: boolean;
+
+        constructor(private settingsProvider: SettingsProvider) {
+            this._inputBottom = this.settingsProvider.read('option.chat.inputBottom');
+        }
+
+        get inputBottom(): boolean {
+            return this._inputBottom;
+        }
+
+        set inputBottom(inputBottom: boolean) {
+            this.settingsProvider.write('option.chat.inputBottom', inputBottom);
+            this._inputBottom = inputBottom;
+        }
+    }
 
     export class Shortcuts {
         public no_emu: Shortcuts.NoEmu;
diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
@@ -24,6 +24,7 @@ export class MainComponent implements OnInit {
                 public authService: AuthService) {
         this.windowService.window.appVersion = applicationService.remoteAppVersion;
         this.windowService.window.buildVersion = applicationService.remoteBuildVersion;
+        this.windowService.window.lindoVersion = applicationService.version;
     }
 
     ngOnInit(): void {
diff --git a/src/app/window/official-game-update/official-game-update.component.ts b/src/app/window/official-game-update/official-game-update.component.ts
@@ -73,7 +73,7 @@ export class OfficialGameUpdateComponent implements OnInit, OnDestroy {
     private remoteManifestPath: string = "manifest.json";
     private remoteAssetMapPath: string = "assetMap.json";
     private remoteLindoManifest: string = "https://raw.githubusercontent.com/Clover-Lindo/lindo-game-base/master/manifest.json";
-    private remoteLindoManifestAlt: string = "http://api.no-emu.co/manifest.json";
+    private remoteLindoManifestAlt: string = "https://api.lindo-app.com/manifest.json";
     private remoteKeymaster: string = "https://raw.githubusercontent.com/madrobby/keymaster/master/keymaster.js";
     private remoteITunesAppVersion: string = (this.settingsService.option.general.early ? "https://itunes.apple.com/lookup?id=1245534439" : "https://itunes.apple.com/lookup?id=1041406978") + "&t=" + (new Date().getTime())
     private currentLindoManifest: Manifest;
diff --git a/src/app/window/option/general/general.component.html b/src/app/window/option/general/general.component.html
@@ -26,6 +26,9 @@ <h2>{{ 'app.option.general.interface' | translate }}</h2>
         <div class="col-xs-12">
             <mat-checkbox color="primary" [(ngModel)]="settingsService.option.general.hidden_shop">{{ 'app.option.general.hide-shop' | translate }}</mat-checkbox>
         </div>
+        <div class="col-xs-12">
+            <mat-checkbox color="primary" [(ngModel)]="settingsService.option.chat.inputBottom">{{ 'app.window.options.features.general.chat-input-bottom' | translate }}</mat-checkbox>
+        </div>
         <div class="col-xs-12">
             <mat-checkbox color="primary" [(ngModel)]="settingsService.option.shortcuts.diver.active_open_menu">{{ 'app.option.shortcuts.diver.active-open-menu' | translate }}</mat-checkbox>
         </div>
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -2,6 +2,6 @@ export const environment = {
   envName: 'prod',
   production: true,
   appName: "Lindo",
-  websiteUrl: "http://lindo.no-emu.co",
-  apiUrl: "http://api.no-emu.co"
+  websiteUrl: "https://lindo-app.com",
+  apiUrl: "https://api.lindo-app.com"
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -2,6 +2,6 @@ export const environment = {
   envName: 'dev',
   production: false,
   appName: "Lindo",
-  websiteUrl: "http://lindo.no-emu.co",
-  apiUrl: "http://api.no-emu.co"
+  websiteUrl: "https://lindo-app.com",
+  apiUrl: "https://api.lindo-app.com"
 };
