|
@@ -221,7 +221,7 @@ class MySQLSessionManager(SessionManager):
|
|
|
room_id = ":".join(["private", staff_id, user_id])
|
|
|
if not page:
|
|
|
fetch_query = f"""
|
|
|
- select t1.sender, t2.name, t1.sendtime, t1.content, t2.iconurl
|
|
|
+ select t1.sender, t2.name, t1.sendtime, t1.content, t2.iconurl, t1.msg_type
|
|
|
from {self.chat_history_table} t1
|
|
|
join {self.user_table} t2 on t1.sender = t2.third_party_user_id
|
|
|
where roomid = %s
|
|
@@ -235,7 +235,7 @@ class MySQLSessionManager(SessionManager):
|
|
|
)
|
|
|
else:
|
|
|
fetch_query = f"""
|
|
|
- select t1.sender, t2.name, t1.sendtime, t1.content, t2.iconurl
|
|
|
+ select t1.sender, t2.name, t1.sendtime, t1.content, t2.iconurl, t1.msg_type
|
|
|
from {self.chat_history_table} t1
|
|
|
join {self.user_table} t2 on t1.sender = t2.third_party_user_id
|
|
|
where t1.roomid = %s and t1.sendtime <= %s
|
|
@@ -261,6 +261,7 @@ class MySQLSessionManager(SessionManager):
|
|
|
"avatar": message["iconurl"],
|
|
|
"content": message["content"],
|
|
|
"timestamp": message["sendtime"],
|
|
|
+ "msg_type": message["msg_type"],
|
|
|
"role": "user" if message["sender"] == user_id else "staff",
|
|
|
}
|
|
|
for message in messages
|