Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
2e266601
by Philipp Hörist at 2019-11-05T18:14:20Z
-
74ac7653
by Philipp Hörist at 2019-11-05T18:14:21Z
-
b8d83eb5
by Philipp Hörist at 2019-11-05T18:14:25Z
4 changed files:
- gajim/common/connection_handlers_events.py
- gajim/common/modules/mam.py
- gajim/common/modules/message.py
- gajim/groupchat_control.py
Changes:
| ... | ... | @@ -423,7 +423,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): |
| 423 | 423 |
sound = msg_obj.gc_control.highlighting_for_message(
|
| 424 | 424 |
msg_obj.msgtxt, msg_obj.properties.timestamp)[1]
|
| 425 | 425 |
|
| 426 |
- if msg_obj.nickname != msg_obj.gc_control.nick:
|
|
| 426 |
+ if msg_obj.properties.muc_nickname != msg_obj.gc_control.nick:
|
|
| 427 | 427 |
self.do_sound = True
|
| 428 | 428 |
if sound == 'received':
|
| 429 | 429 |
self.sound_event = 'muc_message_received'
|
| ... | ... | @@ -471,7 +471,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): |
| 471 | 471 |
self.popup_title = i18n.ngettext(
|
| 472 | 472 |
'New message from %(nickname)s',
|
| 473 | 473 |
'%(n_msgs)i unread messages in %(groupchat_name)s',
|
| 474 |
- count) % {'nickname': msg_obj.nick,
|
|
| 474 |
+ count) % {'nickname': msg_obj.properties.muc_nickname,
|
|
| 475 | 475 |
'n_msgs': count,
|
| 476 | 476 |
'groupchat_name': contact.get_shown_name()}
|
| 477 | 477 |
|
| ... | ... | @@ -250,7 +250,7 @@ class MAM(BaseModule): |
| 250 | 250 |
event_attrs['kind'],
|
| 251 | 251 |
unread=False,
|
| 252 | 252 |
message=msgtxt,
|
| 253 |
- contact_name=event_attrs['nick'],
|
|
| 253 |
+ contact_name=properties.muc_nickname,
|
|
| 254 | 254 |
additional_data=additional_data,
|
| 255 | 255 |
stanza_id=stanza_id,
|
| 256 | 256 |
message_id=properties.id)
|
| ... | ... | @@ -260,12 +260,7 @@ class MAM(BaseModule): |
| 260 | 260 |
|
| 261 | 261 |
@staticmethod
|
| 262 | 262 |
def _parse_gc_attrs(properties):
|
| 263 |
- real_jid = None
|
|
| 264 |
- if properties.muc_user is not None:
|
|
| 265 |
- real_jid = properties.muc_user.jid
|
|
| 266 | 263 |
return {'with_': properties.jid,
|
| 267 |
- 'nick': properties.muc_nickname,
|
|
| 268 |
- 'real_jid': real_jid,
|
|
| 269 | 264 |
'kind': KindConstant.GC_MSG}
|
| 270 | 265 |
|
| 271 | 266 |
def _parse_chat_attrs(self, properties):
|
| ... | ... | @@ -275,7 +270,6 @@ class MAM(BaseModule): |
| 275 | 270 |
kind = KindConstant.CHAT_MSG_RECV
|
| 276 | 271 |
|
| 277 | 272 |
return {'with_': properties.jid,
|
| 278 |
- 'nick': None,
|
|
| 279 | 273 |
'kind': kind}
|
| 280 | 274 |
|
| 281 | 275 |
def _is_valid_request(self, properties):
|
| ... | ... | @@ -200,8 +200,6 @@ class Message(BaseModule): |
| 200 | 200 |
|
| 201 | 201 |
event_attr.update({
|
| 202 | 202 |
'room_jid': jid,
|
| 203 |
- 'nickname': resource,
|
|
| 204 |
- 'nick': resource or '',
|
|
| 205 | 203 |
})
|
| 206 | 204 |
event = NetworkEvent('gc-message-received', **event_attr)
|
| 207 | 205 |
app.nec.push_incoming_event(event)
|
| ... | ... | @@ -236,19 +234,20 @@ class Message(BaseModule): |
| 236 | 234 |
self._check_for_mam_compliance(event.room_jid, event.stanza_id)
|
| 237 | 235 |
|
| 238 | 236 |
if (app.config.should_log(self._account, event.jid) and
|
| 239 |
- event.msgtxt and event.nick):
|
|
| 237 |
+ event.msgtxt and event.properties.muc_nickname):
|
|
| 240 | 238 |
# if not event.nick, it means message comes from room itself
|
| 241 | 239 |
# usually it hold description and can be send at each connection
|
| 242 | 240 |
# so don't store it in logs
|
| 243 |
- app.logger.insert_into_logs(self._account,
|
|
| 244 |
- event.jid,
|
|
| 245 |
- event.properties.timestamp,
|
|
| 246 |
- KindConstant.GC_MSG,
|
|
| 247 |
- message=event.msgtxt,
|
|
| 248 |
- contact_name=event.nick,
|
|
| 249 |
- additional_data=event.additional_data,
|
|
| 250 |
- stanza_id=event.stanza_id,
|
|
| 251 |
- message_id=event.properties.id)
|
|
| 241 |
+ app.logger.insert_into_logs(
|
|
| 242 |
+ self._account,
|
|
| 243 |
+ event.jid,
|
|
| 244 |
+ event.properties.timestamp,
|
|
| 245 |
+ KindConstant.GC_MSG,
|
|
| 246 |
+ message=event.msgtxt,
|
|
| 247 |
+ contact_name=event.properties.muc_nickname,
|
|
| 248 |
+ additional_data=event.additional_data,
|
|
| 249 |
+ stanza_id=event.stanza_id,
|
|
| 250 |
+ message_id=event.properties.id)
|
|
| 252 | 251 |
|
| 253 | 252 |
def _check_for_mam_compliance(self, room_jid, stanza_id):
|
| 254 | 253 |
disco_info = app.logger.get_last_disco_info(room_jid)
|
| ... | ... | @@ -820,7 +820,7 @@ class GroupchatControl(ChatControlBase): |
| 820 | 820 |
if obj.archive_jid != self.room_jid:
|
| 821 | 821 |
return
|
| 822 | 822 |
self.add_message(obj.msgtxt,
|
| 823 |
- contact=obj.nick,
|
|
| 823 |
+ contact=obj.properties.muc_nickname,
|
|
| 824 | 824 |
tim=obj.properties.mam.timestamp,
|
| 825 | 825 |
correct_id=obj.correct_id,
|
| 826 | 826 |
message_id=obj.properties.id,
|
| ... | ... | @@ -828,17 +828,17 @@ class GroupchatControl(ChatControlBase): |
| 828 | 828 |
|
| 829 | 829 |
@event_filter(['account', 'room_jid'])
|
| 830 | 830 |
def _nec_gc_message_received(self, obj):
|
| 831 |
- if not obj.nick:
|
|
| 831 |
+ if obj.properties.muc_nickname is None:
|
|
| 832 | 832 |
# message from server
|
| 833 | 833 |
self.add_message(obj.msgtxt,
|
| 834 | 834 |
tim=obj.properties.timestamp,
|
| 835 | 835 |
displaymarking=obj.displaymarking,
|
| 836 | 836 |
additional_data=obj.additional_data)
|
| 837 | 837 |
else:
|
| 838 |
- if obj.nick == self.nick:
|
|
| 838 |
+ if obj.properties.muc_nickname == self.nick:
|
|
| 839 | 839 |
self.last_sent_txt = obj.msgtxt
|
| 840 | 840 |
self.add_message(obj.msgtxt,
|
| 841 |
- contact=obj.nick,
|
|
| 841 |
+ contact=obj.properties.muc_nickname,
|
|
| 842 | 842 |
tim=obj.properties.timestamp,
|
| 843 | 843 |
displaymarking=obj.displaymarking,
|
| 844 | 844 |
correct_id=obj.correct_id,
|