Commit fd75817f authored by Philipp Hörist's avatar Philipp Hörist

ChatControl: Set message_id on restored conversation lines

Fixes #9879
parent 3d094aff
Pipeline #4436 passed with stages
in 3 minutes and 1 second
......@@ -1259,6 +1259,7 @@ class ChatControl(ChatControlBase):
old_kind=local_old_kind,
xhtml=xhtml,
additional_data=additional_data,
message_id=row.message_id,
marker=row.marker,
error=row.error)
if row.message.startswith('/me ') or row.message.startswith('/me\n'):
......
......@@ -789,7 +789,8 @@ class Logger:
sql = '''
SELECT time, kind, message, error as "error [common_error]",
subject, additional_data, marker as "marker [marker]"
subject, additional_data, marker as "marker [marker]",
message_id
FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND
kind IN ({kinds}) AND time > get_timeout()
ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment