Fixes for chat sample

The Chat Sample (fixed):
QBWEBSDK-616;
QBWEBSDK-620;
QBWEBSDK-539.

The JS SDK (fixed):
Updated QB.chat.message.unreadCount() method;
Updated QB.chat.dialog.create() method;
Updated QB.users.listUsers() method.

Author: Vladlukhanin

quickblox.min.js

@@ -308,8 +308,8 @@
     margin: 0 0 16px 0;
 }
 
-.message__wrap.m-notification_message {
-    display: block;
+.message__wrap .m-notification_message {
+    width: 100%;
     color: #778594;
     font-size: 13px;
     font-weight: 500;

samples/chat/css/dashboard.css

@@ -238,8 +238,8 @@ <h1 class="dialog__title j-dialog__title"><%- title %></h1>
     </script>
 
     <script type="text/template" id="tpl_notificationMessage">
-        <div class="message__wrap m-notification_message" id="<%= _id %>">
-            <%= message || body %>
+        <div class="message__wrap" id="<%= id %>">
+            <p class="m-notification_message"><%= text %></p>
         </div>
     </script>
 

samples/chat/index.html

@@ -57,10 +57,11 @@ App.prototype.renderDashboard = function (activeTabName) {
     listeners.setListeners();
 
     logoutBtn.addEventListener('click', function () {
-        QB.users.delete(app.user.id, function(err, user){
-            if (!user) {
-                console.error('Can\'t delete user by id: '+app.user.id+' ', err);
+        QB.logout(function(error, result){
+            if (error) {
+                console.error('Logout was unsuccessful', error);
             }
+
             loginModule.isLogin = false;
             app.isDashboardLoaded = false;
 

samples/chat/js/app.js

@@ -461,7 +461,7 @@ Dialog.prototype.updateDialog = function (updates) {
         if(updates.title !== dialog.name){
             toUpdateParams.name = updates.title;
             updatedMsg.extension.dialog_name = updates.title;
-            updatedMsg.body = app.user.name + ' changed the conversation name to "' + updates.title + '".'
+            updatedMsg.body = app.user.name + ' changed the conversation name to "' + updates.title + '".';
         }
     }
 

samples/chat/js/dialog.js

@@ -136,9 +136,10 @@ Helpers.prototype.fillMessagePrams = function (message) {
     if (message.message === CONSTANTS.ATTACHMENT.BODY) {
         message.message = '';
     }
+
     if(!selfDelevered){
         messageModule.sendDeliveredStatus(message._id, message.sender_id, message.chat_dialog_id);
-    };
+    }
 
     message.selfReaded = selfReaded;
 
@@ -163,25 +164,26 @@ Helpers.prototype.getMessageStatus = function(message){
 };
 
 Helpers.prototype.fillMessageBody = function (str) {
-    var url, url_text,
-        URL_REGEXP = /\b((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
+    var self = this,
+        url,
+        URL_REGEXP = /https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}|www\.[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}/g;
 
-    str = escapeHTML(str);
+    str = self.escapeHTML(str);
 
     // parser of paragraphs
     str = str.replace(/\n/g, '<br>');
     // parser of links
     str = str.replace(URL_REGEXP, function(match) {
-        url = (/^[a-z]+:/i).test(match) ? match : 'http://' + match;
-        url_text = match;
-        return '<a href="' + escapeHTML(url) + '" target="_blank">' + escapeHTML(url_text) + '</a>';
+        url = (/^[a-z]+:/i).test(match) ? match : 'https://' + match;
+
+        return '<a href="' + self.escapeHTML(url) + '" target="_blank">' + self.escapeHTML(match) + '</a>';
     });
 
     return str;
+};
 
-    function escapeHTML(s) {
-        return s.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-    }
+Helpers.prototype.escapeHTML = function (str) {
+    return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
 };
 
 Helpers.prototype.getSrcFromAttachmentId = function (id) {

samples/chat/js/helpers.js

@@ -101,13 +101,15 @@ Login.prototype.login = function (user) {
             reject(error);
         }
     });
+    
 };
 
 Login.prototype.renderLoginPage = function(){
     helpers.clearView(app.page);
 
     app.page.innerHTML = helpers.fillTemplate('tpl_login', {
-        version: QB.version
+        version: QB.version,
+        buildNumber: QB.buildNumber
     });
     this.isLoginPageRendered = true;
     this.setListeners();

samples/chat/js/login.js

@@ -184,10 +184,10 @@ Message.prototype.getMessages = function (dialogId) {
     self.container.classList.add('loading');
 
     QB.chat.message.list(params, function (err, messages) {
-        if (!err) {
+        if (messages) {
             var dialog = dialogModule._cache[dialogId];
             dialog.messages = dialog.messages.concat(messages.items);
-
+            
             if (messages.items.length < self.limit) {
                 dialog.full = true;
             }
@@ -266,8 +266,9 @@ Message.prototype.sendReadStatus = function(messageId, userId, dialogId){
 Message.prototype.renderMessage = function (message, setAsFirst) {
     var self = this,
         sender = userModule._cache[message.sender_id],
+        dialogId = message.chat_dialog_id,
         messagesHtml,
-        dialogId = message.chat_dialog_id;
+        messageText;
 
     if(!message.selfReaded){
         self.sendReadStatus(message._id, message.sender_id, dialogId);
@@ -276,11 +277,14 @@ Message.prototype.renderMessage = function (message, setAsFirst) {
     }
 
     if(message.notification_type || (message.extension && message.extension.notification_type)) {
-        messagesHtml = helpers.fillTemplate('tpl_notificationMessage', message);
+        messageText = message.message ? helpers.escapeHTML(message.message) : helpers.escapeHTML(message.body);
+
+        messagesHtml = helpers.fillTemplate('tpl_notificationMessage', {
+            id: message._id,
+            text: messageText
+        });
     } else {
-        var messageText = message.message ?
-            helpers.fillMessageBody(message.message || '') :
-            helpers.fillMessageBody(message.body || '');
+        messageText = message.message ? helpers.fillMessageBody(message.message || '') : helpers.fillMessageBody(message.body || '');
 
         messagesHtml = helpers.fillTemplate('tpl_message', {
             message: {

samples/chat/js/message.js

@@ -52,7 +52,7 @@ DialogProxy.prototype = {
          * @callback createDialogCallback
          * */
 
-        if (params.occupants_ids instanceof Array) {
+        if (params && params.occupants_ids && Utils.isArray(params.occupants_ids)) {
             params.occupants_ids = params.occupants_ids.join(', ');
         }
 

src/modules/chat/qbDialog.js

@@ -126,6 +126,10 @@ MessageProxy.prototype = {
          * @callback unreadCountMessageCallback
          * */
 
+        if (params && params.chat_dialog_ids && Utils.isArray(params.chat_dialog_ids)) {
+            params.chat_dialog_ids = params.chat_dialog_ids.join(', ');
+        }
+
         this.service.ajax({
             url: Utils.getUrl(MESSAGES_API_URL + '/unread'),
             data: params