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

Remove message_id attribute from decrypted-message event

It's available via properties attribute
parent 056279ed
......@@ -804,7 +804,7 @@ class ChatControl(ChatControlBase):
kind,
tim=obj.properties.mam.timestamp,
correct_id=obj.correct_id,
message_id=obj.message_id,
message_id=obj.properties.id,
additional_data=obj.additional_data)
def _nec_decrypted_message_received(self, obj):
......@@ -827,7 +827,7 @@ class ChatControl(ChatControlBase):
xhtml=obj.xhtml,
displaymarking=obj.displaymarking,
msg_log_id=obj.msg_log_id,
message_id=obj.message_id,
message_id=obj.properties.id,
correct_id=obj.correct_id,
additional_data=obj.additional_data)
if obj.msg_log_id:
......
......@@ -235,7 +235,6 @@ class MAM(BaseModule):
'groupchat': groupchat,
'stanza_id': stanza_id,
'origin_id': message_id,
'message_id': properties.id,
'correct_id': parse_correction(properties),
'archive_jid': properties.mam.archive,
'msgtxt': properties.body,
......
......@@ -185,7 +185,6 @@ class Message(BaseModule):
'resource': resource,
'stanza_id': stanza_id,
'unique_id': stanza_id or message_id,
'message_id': properties.id,
'correct_id': parse_correction(properties),
'msgtxt': msgtxt,
'session': session,
......@@ -253,7 +252,7 @@ class Message(BaseModule):
contact_name=event.nick,
additional_data=event.additional_data,
stanza_id=event.stanza_id,
message_id=event.message_id)
message_id=event.properties.id)
def _check_for_mam_compliance(self, room_jid, stanza_id):
disco_info = app.logger.get_last_disco_info(room_jid)
......
......@@ -101,7 +101,6 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase):
'jid': jid,
'resource': resource,
'unique_id': id_,
'message_id': properties.id,
'correct_id': parse_correction(properties),
'msgtxt': msgtxt,
'session': session,
......
......@@ -823,7 +823,7 @@ class GroupchatControl(ChatControlBase):
contact=obj.nick,
tim=obj.properties.mam.timestamp,
correct_id=obj.correct_id,
message_id=obj.message_id,
message_id=obj.properties.id,
additional_data=obj.additional_data)
@event_filter(['account', 'room_jid'])
......@@ -844,7 +844,7 @@ class GroupchatControl(ChatControlBase):
xhtml=obj.xhtml_msgtxt,
displaymarking=obj.displaymarking,
correct_id=obj.correct_id,
message_id=obj.message_id,
message_id=obj.properties.id,
additional_data=obj.additional_data)
obj.needs_highlight = self.needs_visual_notification(obj.msgtxt)
......@@ -1101,7 +1101,7 @@ class GroupchatControl(ChatControlBase):
tim=obj.properties.timestamp,
xhtml=obj.xhtml,
displaymarking=obj.displaymarking,
message_id=obj.message_id,
message_id=obj.properties.id,
correct_id=obj.correct_id)
else:
# otherwise pass it off to the control to be queued
......
......@@ -125,7 +125,7 @@ class ChatControlSession:
subject=obj.properties.subject,
additional_data=obj.additional_data,
stanza_id=obj.unique_id,
message_id=obj.message_id)
message_id=obj.properties.id)
if obj.properties.is_muc_pm and not obj.gc_control:
# This is a carbon of a PM from a MUC we are not currently
......@@ -236,7 +236,7 @@ class ChatControlSession:
obj.resource,
obj.msg_log_id,
correct_id=obj.correct_id,
message_id=obj.message_id,
message_id=obj.properties.id,
xhtml=obj.xhtml,
session=self,
displaymarking=obj.displaymarking,
......
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