From e9bae1ee0caf04e6cbdc470597c45ded5b859572 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Wed, 19 Jun 2019 11:08:46 +0200
Subject: [PATCH] Saving last nickname change within the server

---
 shared/js/ConnectionHandler.ts     | 2 +-
 shared/js/ui/client.ts             | 1 +
 shared/js/ui/modal/ModalConnect.ts | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared/js/ConnectionHandler.ts b/shared/js/ConnectionHandler.ts
index 4d2b11b0..0e9a6a5a 100644
--- a/shared/js/ConnectionHandler.ts
+++ b/shared/js/ConnectionHandler.ts
@@ -509,7 +509,7 @@ class ConnectionHandler {
             console.log(tr("Allowed to auto reconnect. Reconnecting in 5000ms"));
             const server_address = this.serverConnection.remote_address();
             const profile = this.serverConnection.handshake_handler().profile;
-            const name = this.serverConnection.handshake_handler().name;
+            const name = this.getClient().clientNickName();
             const password = this.serverConnection.handshake_handler().server_password;
 
             this._reconnect_timer = setTimeout(() => {
diff --git a/shared/js/ui/client.ts b/shared/js/ui/client.ts
index 0c4125f7..1424e46b 100644
--- a/shared/js/ui/client.ts
+++ b/shared/js/ui/client.ts
@@ -901,6 +901,7 @@ class LocalClientEntry extends ClientEntry {
 
             elm.text(_self.clientNickName());
             _self.handle.serverConnection.command_helper.updateClient("client_nickname", text).then((e) => {
+                settings.changeGlobal(Settings.KEY_CONNECT_USERNAME, text);
                 this.channelTree.client.chat.serverChat().appendMessage(tr("Nickname successfully changed"));
             }).catch((e: CommandResult) => {
                 this.channelTree.client.chat.serverChat().appendError(tr("Could not change nickname ({})"),  e.extra_message);
diff --git a/shared/js/ui/modal/ModalConnect.ts b/shared/js/ui/modal/ModalConnect.ts
index fc102cc4..910f8159 100644
--- a/shared/js/ui/modal/ModalConnect.ts
+++ b/shared/js/ui/modal/ModalConnect.ts
@@ -28,7 +28,7 @@ namespace Modals {
             let updateFields = function () {
                 console.log("Updating");
                 if(selected_profile)
-                    input_nickname.attr("placeholder", selected_profile.default_username);
+                    input_nickname.attr("placeholder", settings.static_global(Settings.KEY_CONNECT_USERNAME, selected_profile.default_username));
                 else
                     input_nickname.attr("placeholder", "");
 
@@ -77,6 +77,10 @@ namespace Modals {
 
                 input_profile.on('change', event => {
                     selected_profile = profiles.find_profile(input_profile.val() as string);
+                    {
+                        settings.changeGlobal(Settings.KEY_CONNECT_USERNAME, selected_profile.default_username);
+                        input_nickname.val(selected_profile.default_username);
+                    }
                     input_profile.toggleClass("is-invalid", !selected_profile || !selected_profile.valid());
                     updateFields();
                 });