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

fix: Chat message not found on refresh issue fix (#6990)

Browse source 
If chat message is deleted then chat message not found error message is shown on refresh.

![chat message](https://user-images.githubusercontent.com/42651287/53424137-a55d1100-3a08-11e9-909f-1c585ddb416a.png)
This commit is contained in:
Deepesh Garg 2019-02-26 23:55:32 +05:30 • committed by Faris Ansari
parent c9d60da566
commit c9c607b71d
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
frappe/chat/doctype/chat_message/chat_message.py
View file

@ -141,13 +141,16 @@ def send(user, room, content, type = "Content"):
def seen(message, user = None):
authenticate(user)
mess = frappe.get_doc('Chat Message', message)
mess.add_seen(user)
has_message = frappe.db.exists('Chat Message', message)
room = mess.room
resp = dict(message = message, data = dict(seen = json.loads(mess._seen)))
if has_message:
mess = frappe.get_doc('Chat Message', message)
mess.add_seen(user)
frappe.publish_realtime('frappe.chat.message:update', resp, room = room, after_commit = True)
room = mess.room
resp = dict(message = message, data = dict(seen = json.loads(mess._seen)))
frappe.publish_realtime('frappe.chat.message:update', resp, room = room, after_commit = True)
def history(room, fields = None, limit = 10, start = None, end = None):
room = frappe.get_doc('Chat Room', room)
@ -194,18 +197,21 @@ def mark_messages_as_seen(message_names, user):
def get(name, rooms = None, fields = None):
rooms, fields = safe_json_loads(rooms, fields)
dmess = frappe.get_doc('Chat Message', name)
data = dict(
name = dmess.name,
user = dmess.user,
room = dmess.room,
room_type = dmess.room_type,
content = json.loads(dmess.content) if dmess.type in ["File"] else dmess.content,
type = dmess.type,
urls = dmess.urls,
mentions = dmess.mentions,
creation = dmess.creation,
seen = get_if_empty(dmess._seen, [ ])
)
has_message = frappe.db.exists('Chat Message', name)
return data
if has_message:
dmess = frappe.get_doc('Chat Message', name)
data = dict(
name = dmess.name,
user = dmess.user,
room = dmess.room,
room_type = dmess.room_type,
content = json.loads(dmess.content) if dmess.type in ["File"] else dmess.content,
type = dmess.type,
urls = dmess.urls,
mentions = dmess.mentions,
creation = dmess.creation,
seen = get_if_empty(dmess._seen, [ ])
)
return data