From ac1557fc8fe8bc3f47de8e9c836fb9a5e0abc468 Mon Sep 17 00:00:00 2001
From: Saptak S <saptak013@gmail.com>
Date: Tue, 10 Nov 2020 19:57:51 +0530
Subject: [PATCH 1/3] Forces socket io to use websocket instead of polling

SocketIO uses the last successful method of transport to communicate. But we
have eventlet in our dependency which allows for websocket, and we ideally
want communications to be over websocket. So specified the transport method
as websocket in socket io connect.
---
 cli/onionshare_cli/resources/static/js/chat.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cli/onionshare_cli/resources/static/js/chat.js b/cli/onionshare_cli/resources/static/js/chat.js
index 39547725..69d83869 100644
--- a/cli/onionshare_cli/resources/static/js/chat.js
+++ b/cli/onionshare_cli/resources/static/js/chat.js
@@ -1,7 +1,12 @@
 $(function () {
   $(document).ready(function () {
     $('.chat-container').removeClass('no-js');
-    var socket = io.connect('http://' + document.domain + ':' + location.port + '/chat');
+    var socket = io.connect(
+      'http://' + document.domain + ':' + location.port + '/chat',
+      {
+        transports: ['websocket']
+      }
+    );
 
     // Store current username received from app context
     var current_username = $('#username').val();

From c873391a20d935b0cd7f7b15d74ccd6040b63b41 Mon Sep 17 00:00:00 2001
From: Saptak S <saptak013@gmail.com>
Date: Tue, 10 Nov 2020 20:01:11 +0530
Subject: [PATCH 2/3] Improves the logic of updating both flask session and
 socket session with new nickname

---
 .../resources/static/js/chat.js               |  4 +++-
 cli/onionshare_cli/web/chat_mode.py           | 20 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/cli/onionshare_cli/resources/static/js/chat.js b/cli/onionshare_cli/resources/static/js/chat.js
index 69d83869..c4d76bb5 100644
--- a/cli/onionshare_cli/resources/static/js/chat.js
+++ b/cli/onionshare_cli/resources/static/js/chat.js
@@ -88,7 +88,6 @@ var emitMessage = function (socket) {
 var updateUsername = function (socket) {
   var username = $('#username').val();
   if (!checkUsernameExists(username)) {
-    socket.emit('update_username', { username: username });
     $.ajax({
       method: 'POST',
       url: `http://${document.domain}:${location.port}/update-session-username`,
@@ -97,6 +96,9 @@ var updateUsername = function (socket) {
       data: JSON.stringify({ 'username': username })
     }).done(function (response) {
       console.log(response);
+      if (response.success && response.username == username) {
+        socket.emit('update_username', { username: username });
+      }
     });
     return username;
   }
diff --git a/cli/onionshare_cli/web/chat_mode.py b/cli/onionshare_cli/web/chat_mode.py
index 15e236d3..03843ee8 100644
--- a/cli/onionshare_cli/web/chat_mode.py
+++ b/cli/onionshare_cli/web/chat_mode.py
@@ -66,7 +66,8 @@ class ChatModeWeb:
             )
             session["room"] = self.web.settings.default_settings["chat"]["room"]
             self.web.add_request(
-                request.path, {"id": history_id, "status_code": 200},
+                request.path,
+                {"id": history_id, "status_code": 200},
             )
 
             self.web.add_request(self.web.REQUEST_LOAD, request.path)
@@ -83,14 +84,23 @@ class ChatModeWeb:
         def update_session_username():
             history_id = self.cur_history_id
             data = request.get_json()
-            if data.get("username", "") not in self.connected_users:
+            if (
+                data.get("username", "")
+                and data.get("username", "") not in self.connected_users
+            ):
                 session["name"] = data.get("username", session.get("name"))
             self.web.add_request(
-                request.path, {"id": history_id, "status_code": 200},
+                request.path,
+                {"id": history_id, "status_code": 200},
             )
 
             self.web.add_request(self.web.REQUEST_LOAD, request.path)
-            r = make_response(jsonify(username=session.get("name"), success=True,))
+            r = make_response(
+                jsonify(
+                    username=session.get("name"),
+                    success=True,
+                )
+            )
             return self.web.add_security_headers(r)
 
         @self.web.socketio.on("joined", namespace="/chat")
@@ -125,7 +135,7 @@ class ChatModeWeb:
             """Sent by a client when the user updates their username.
             The message is sent to all people in the room."""
             current_name = session.get("name")
-            if message["username"] not in self.connected_users:
+            if message.get("username", ""):
                 session["name"] = message["username"]
                 self.connected_users[
                     self.connected_users.index(current_name)

From 2a454c815657982c13ad4686bb250df3576a02df Mon Sep 17 00:00:00 2001
From: Saptak S <saptak013@gmail.com>
Date: Tue, 10 Nov 2020 20:14:23 +0530
Subject: [PATCH 3/3] Makes username input blur on pressing enter

---
 cli/onionshare_cli/resources/static/js/chat.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cli/onionshare_cli/resources/static/js/chat.js b/cli/onionshare_cli/resources/static/js/chat.js
index c4d76bb5..258b020b 100644
--- a/cli/onionshare_cli/resources/static/js/chat.js
+++ b/cli/onionshare_cli/resources/static/js/chat.js
@@ -50,7 +50,8 @@ $(function () {
     // Keep buttons disabled unless changed or not empty
     $('#username').on('keyup', function (event) {
       if ($('#username').val() !== '' && $('#username').val() !== current_username) {
-        if (event.keyCode == 13) {
+        if (event.keyCode == 13 || event.which == 13) {
+          this.blur();
           current_username = updateUsername(socket) || current_username;
         }
       }