From 5edb4c92bcbd017970e2e017cb7e85553712f155 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 14 Jun 2019 12:35:06 +0100
Subject: [PATCH] fixes

---
 src/Yavsc/wwwroot/js/chat.js | 45 +++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/Yavsc/wwwroot/js/chat.js b/src/Yavsc/wwwroot/js/chat.js
index 963b1900..5236c6aa 100644
--- a/src/Yavsc/wwwroot/js/chat.js
+++ b/src/Yavsc/wwwroot/js/chat.js
@@ -104,8 +104,12 @@ window.ChatHubHandler = (function ($) {
 
       // eslint-disable-next-line no-warning-comments
       // TODO userpart userjoin deniedpv
-      $('<li></li>').append(tag + ': ' + targetid + ': ').append(message).addClass(tag).appendTo(notifications);
+      $('<li></li>').append(tag + ': ' + targetid + ': ').append(message.Value).addClass(tag).appendTo(notifications);
     };
+    var setChanInfo = function (chanInfo) {
+      var chanId = 'r' + chanInfo.Name;
+      $('#tv_' + chanId).replaceWith(chanInfo.Topic);
+    }
 
     var setActiveChan = function (chanId) {
       if (frontChanId != chanId) {
@@ -118,6 +122,14 @@ window.ChatHubHandler = (function ($) {
       $('#inp_' + chanId).focus();
     };
 
+    function join(roomName)
+    {
+      chat.server.join(roomName).done(function (chatInfo) {
+        setChanInfo(chatInfo);
+        setActiveChan(chatInfo.Name);
+      });
+    }
+
     var chatbar = $('<div class="chatbar"></div>');
 
     var roomjoin = $('<div class="chatctl" class="form-control"></div>');
@@ -146,6 +158,7 @@ window.ChatHubHandler = (function ($) {
       var roomview = $('<div></div>').addClass('container');
       roomview.appendTo(chatlist);
       roomview.prop('id', 'v' + chanId);
+      $('<div></div>').prop('id', 'tv_' + chanId).appendTo(roomview);
       var msglist = $('<ul></ul>').addClass('mesglist');
       msglist.prop('id', chanId);
       msglist.appendTo(roomview);
@@ -178,10 +191,6 @@ window.ChatHubHandler = (function ($) {
         else buildChan('@', 'u', userName, chat.server.sendPV);
     };
 
-    $view.data('chans').split(',').forEach(function (chan) {
-      buildRoom(chan);
-    });
-
     /*var getUsers = function () {
       $.get('/api/chat/users').done(function (users) {
         $.each(users, function () {
@@ -190,24 +199,24 @@ window.ChatHubHandler = (function ($) {
         });
       });
     };*/
-    // eslint-disable-next-line no-warning-comments
-    // TODO only query user list for a given channel, and only for a participant
-    function onCx() {
-      setTimeout(function () {
-        chans.forEach(function (room) {
-          chat.server.join(room).done(function (chatInfo) {
-            setActiveChan('r' + chatInfo.Name);
-          });
-        });
-      }, 120);
+    $view.data('chans').split(',').forEach(function (chan){
+      buildRoom(chan);
+    });
 
+    function onCx() {
       $view.removeClass('disabled');
+      setTimeout(function () {
+        chans.forEach(function (chan) {
+            join(chan);
+          });
+      }, 120);
     }
 
     function onDisCx() {
       $view.addClass('disabled');
     }
 
+
     // Start the connection.
     $.connection.hub.start().done(function () {
       onCx();
@@ -221,14 +230,12 @@ window.ChatHubHandler = (function ($) {
           });
         }, 30000); // Re-start connection after 30 seconds
     });
-
+    
     chanName.keydown(function (event) {
       if (event.which == 13) {
         if (this.value.length == 0) return;
         buildRoom(this.value);
-        chat.server.join(this.value).done(function (chatInfo) {
-          setActiveChan('r' + chatInfo.Name);
-        });
+        join(this.value);
         this.value = '';
       }
       // else TODO showRoomInfo(this.value);