Philipp Hörist pushed to branch master at gajim / gajim
Commits: 40fc7271 by Philipp Hörist at 2018-12-21T13:13:08Z Remove unused code
- - - - - 4503f466 by Philipp Hörist at 2018-12-21T17:36:09Z Simplify gc-message-received event
- - - - - 0e6011c0 by Philipp Hörist at 2018-12-21T18:10:18Z Ignore bookmark updates from other jids
Because we use +notify to subscribe to the bookmarks node, we get notifications from contacts that have an open access bookmarks node
- - - - -
3 changed files:
- gajim/common/connection_handlers_events.py - gajim/common/modules/bookmarks.py - gajim/common/modules/message.py
Changes:
===================================== gajim/common/connection_handlers_events.py ===================================== @@ -369,59 +369,6 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): class OurShowEvent(nec.NetworkIncomingEvent): name = 'our-show'
-class GcMessageReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-message-received' - - def generate(self): - self.stanza = self.msg_obj.stanza - if not hasattr(self.msg_obj, 'additional_data'): - self.additional_data = AdditionalDataDict() - else: - self.additional_data = self.msg_obj.additional_data - self.id_ = self.msg_obj.stanza.getID() - self.unique_id = self.msg_obj.unique_id - self.fjid = self.msg_obj.fjid - self.msgtxt = self.msg_obj.msgtxt - self.jid = self.msg_obj.jid - self.room_jid = self.msg_obj.jid - self.nickname = self.msg_obj.resource - self.timestamp = self.msg_obj.timestamp - self.xhtml_msgtxt = self.stanza.getXHTML() - self.encrypted = self.msg_obj.encrypted - self.correct_id = None # XEP-0308 - self.delayed = self.msg_obj.delayed - - if app.config.get('ignore_incoming_xhtml'): - self.xhtml_msgtxt = None - - if self.msg_obj.resource: - # message from someone - self.nick = self.msg_obj.resource - else: - # message from server - self.nick = '' - - if not self.stanza.getTag('body'): # no <body> - return - - from gajim.common.modules.security_labels import parse_securitylabel - self.displaymarking = parse_securitylabel(self.stanza) - - from gajim.common.modules.misc import parse_correction - self.correct_id = parse_correction(self.stanza) - - return True - -class GcConfigChangedReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-config-changed-received' - - def generate(self): - self.conn = self.msg_event.conn - self.stanza = self.msg_event.stanza - self.room_jid = self.msg_event.room_jid - self.status_code = self.msg_event.status_code - return True - class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent'
@@ -942,14 +889,14 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.do_sound = True
def handle_incoming_gc_msg_event(self, msg_obj): - if not msg_obj.msg_obj.gc_control: + if not msg_obj.gc_control: # we got a message from a room we're not in? ignore it return self.jid = msg_obj.jid - sound = msg_obj.msg_obj.gc_control.highlighting_for_message( + sound = msg_obj.gc_control.highlighting_for_message( msg_obj.msgtxt, msg_obj.timestamp)[1]
- if msg_obj.nickname != msg_obj.msg_obj.gc_control.nick: + if msg_obj.nickname != msg_obj.gc_control.nick: self.do_sound = True if sound == 'received': self.sound_event = 'muc_message_received' @@ -997,7 +944,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.popup_title = i18n.ngettext( 'New message from %(nickname)s', '%(n_msgs)i unread messages in %(groupchat_name)s', - count) % {'nickname': self.base_event.nick, + count) % {'nickname': msg_obj.nick, 'n_msgs': count, 'groupchat_name': contact.get_shown_name()}
===================================== gajim/common/modules/bookmarks.py ===================================== @@ -80,6 +80,10 @@ class Bookmarks(AbstractPEPModule): log.info('Ignore update, pubsub request in progress') return
+ if not self._con.get_own_jid().bareMatch(jid): + log.warning('%s has an open access bookmarks node', jid) + return + if not self._pubsub_support() or not self.conversion: return
===================================== gajim/common/modules/message.py ===================================== @@ -36,7 +36,6 @@ from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml from gajim.common.modules.util import is_self_message from gajim.common.modules.util import is_muc_pm -from gajim.common.connection_handlers_events import GcMessageReceivedEvent
log = logging.getLogger('gajim.c.m.message') @@ -278,11 +277,16 @@ class Message: return
if groupchat: - app.nec.push_incoming_event(GcMessageReceivedEvent( - None, - conn=self._con, - msg_obj=event, - stanza_id=event.stanza_id)) + if not event.msgtxt: + return + + event.room_jid = event.jid + event.nickname = event.resource + event.xhtml_msgtxt = event.xhtml + event.nick = event.resource or '' + + app.nec.push_incoming_event(NetworkEvent('gc-message-received', + **vars(event))) return
app.nec.push_incoming_event(
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/85e79e7b279843d945230714f881f2fad4...
-
Philipp Hörist