|
|
@@ -182,21 +182,24 @@ class MySQLSessionManager(SessionManager):
|
|
|
temp_obj = {}
|
|
|
user_id = session["user_id"]
|
|
|
room_id = ":".join(["private", staff_id, user_id])
|
|
|
- select_query = f"""select content, max(sendtime) as max_timestamp from {self.chat_history_table} where roomid = %s;"""
|
|
|
+ select_query = f"""select content, msg_type, max(sendtime) as max_timestamp from {self.chat_history_table} where roomid = %s;"""
|
|
|
last_message = self.db.select(
|
|
|
sql=select_query,
|
|
|
cursor_type=pymysql.cursors.DictCursor,
|
|
|
args=(room_id,),
|
|
|
)
|
|
|
if not last_message:
|
|
|
- temp_obj["message"] = ""
|
|
|
+ temp_obj["message"] = None
|
|
|
temp_obj["timestamp"] = 0
|
|
|
+ temp_obj["msg_type"] = None
|
|
|
else:
|
|
|
temp_obj["message"] = last_message[0]["content"]
|
|
|
temp_obj["timestamp"] = last_message[0]["max_timestamp"]
|
|
|
+ temp_obj["msg_type"] = last_message[0]["msg_type"]
|
|
|
temp_obj["user_id"] = user_id
|
|
|
temp_obj["user_name"] = session["name"]
|
|
|
temp_obj["avatar"] = session["iconurl"]
|
|
|
+ temp_obj["current_state"] = session["current_state"]
|
|
|
response_data.append(temp_obj)
|
|
|
return {
|
|
|
"staff_id": staff_id,
|
luojunhui