vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed Website Chat updates

Browse source
This commit is contained in:
Achilles Rasquinha 2018-03-29 16:57:22 +05:30
parent 12b628d885
commit 034935db13
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/chat/__init__.py
View file

@ -1,4 +1,5 @@
import frappe
from frappe import _
session = frappe.session

28
frappe/public/js/frappe/chat.js
View file

@ -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 (