From 034935db1399eded1252a884b2774fa47c8c8d72 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Thu, 29 Mar 2018 16:57:22 +0530 Subject: [PATCH] Fixed Website Chat updates --- frappe/chat/__init__.py | 1 + frappe/public/js/frappe/chat.js | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/frappe/chat/__init__.py b/frappe/chat/__init__.py index 18a8bee061..a1a2e9cb36 100644 --- a/frappe/chat/__init__.py +++ b/frappe/chat/__init__.py @@ -1,4 +1,5 @@ import frappe +from frappe import _ session = frappe.session diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js index 746c17cf58..86aa1b8a4a 100644 --- a/frappe/public/js/frappe/chat.js +++ b/frappe/public/js/frappe/chat.js @@ -721,7 +721,6 @@ frappe.chat.room.get = function (names, fields, fn) { } return new Promise(resolve => { - frappe.call("frappe.chat.doctype.chat_room.chat_room.get", { user: frappe.session.user, rooms: names, fields: fields }, response => { @@ -1394,10 +1393,12 @@ class extends Component { return r }) - if ( !exists ) - frappe.chat.room.get(room, (room) => this.room.add(room)) - else - this.set_state({ rooms }) + if ( frappe.session.user !== 'Guest' ) { + if ( !exists ) + frappe.chat.room.get(room, (room) => this.room.add(room)) + else + this.set_state({ rooms }) + } if ( state.room.name === room ) { if ( update.typing ) { @@ -1906,7 +1907,6 @@ class extends Component { else if ( props.last_message ) { const message = props.last_message - console.log(message) const content = message.content if ( message.type === "File" ) { @@ -2065,13 +2065,15 @@ class extends Component { } ]) - if (props.messages) { - props.messages = frappe._.as_array(props.messages) - for (const message of props.messages) - if ( !message.seen.includes(frappe.session.user) ) - frappe.chat.message.seen(message.name) - else - break + if ( frappe.session.user !== 'Guest' ) { + if (props.messages) { + props.messages = frappe._.as_array(props.messages) + for (const message of props.messages) + if ( !message.seen.includes(frappe.session.user) ) + frappe.chat.message.seen(message.name) + else + break + } } return (