Commits May 2017

commits@gajim.org

1 participants
28 discussions

[Git][gajim/gajim][gajim_0.16] Make default proxy always available
by Philipp Hörist 02 May '17

02 May '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 26a72485 by Philipp Hörist at 2017-05-02T16:56:44+02:00 Make default proxy always available If the user had an empty `file_transfer_proxies` config setting no proxies were used. As we discover the default server proxy ourself the user should not have to write it to his config setting to make use of it. - - - - - 1 changed file: - src/common/protocol/bytestream.py Changes: ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -513,9 +513,11 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): 'file_transfer_proxies') shall_use_proxies = gajim.config.get_per('accounts', self.name, 'use_ft_proxies') - if shall_use_proxies and configured_proxies: + if shall_use_proxies: proxyhost_dicts = [] - proxies = [item.strip() for item in configured_proxies.split(',')] + proxies = [] + if configured_proxies: + proxies = [item.strip() for item in configured_proxies.split(',')] default_proxy = gajim.proxy65_manager.get_default_for_name(self.name) if default_proxy: # add/move default proxy at top of the others View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/26a724856b8faa15a80a63207614151d51…

1 0

[Git][gajim/gajim][master] Make default proxy always available
by Philipp Hörist 02 May '17

02 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc504f90 by Philipp Hörist at 2017-05-02T16:55:39+02:00 Make default proxy always available If the user had an empty `file_transfer_proxies` config setting no proxies were used. As we discover the default server proxy ourself the user should not have to write it to his config setting to make use of it. - - - - - 1 changed file: - src/common/protocol/bytestream.py Changes: ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -519,9 +519,11 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): 'file_transfer_proxies') shall_use_proxies = gajim.config.get_per('accounts', self.name, 'use_ft_proxies') - if shall_use_proxies and configured_proxies: + if shall_use_proxies: proxyhost_dicts = [] - proxies = [item.strip() for item in configured_proxies.split(',')] + proxies = [] + if configured_proxies: + proxies = [item.strip() for item in configured_proxies.split(',')] default_proxy = gajim.proxy65_manager.get_default_for_name(self.name) if default_proxy: # add/move default proxy at top of the others View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bc504f90b1c4cfde3ebef4a822fa00a665…

1 0

[Git][gajim/gajim][master] 2 commits: network_watcher: Add support for systemd-networkd
by Philipp Hörist 02 May '17

02 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e8c9fe5 by Jörg Sommer at 2017-05-02T10:15:23+02:00 network_watcher: Add support for systemd-networkd - - - - - 30d3f0c2 by Philipp Hörist at 2017-05-02T15:32:37+02:00 Merge branch 'new' into 'master' Add support for systemd's networkd See merge request !91 - - - - - 1 changed file: - src/network_watcher.py Changes: ===================================== src/network_watcher.py ===================================== --- a/src/network_watcher.py +++ b/src/network_watcher.py @@ -2,6 +2,7 @@ ## src/network_watcher.py ## ## Copyright (C) 2017 Philipp Hoerist <philipp AT hoerist.com> +## Copyright © 2017 Jörg Sommer <joerg(a)alea.gnuu.de> ## ## This file is part of Gajim. ## @@ -47,6 +48,11 @@ def signal_received(connection, sender_name, object_path, if interface_name == 'org.freedesktop.NetworkManager': # https://people.freedesktop.org/~lkundrak/nm-docs/nm-dbus-types.html connected = parameters[0] == 70 + elif interface_name == 'org.freedesktop.DBus.Properties' and len(parameters) >= 2 \ + and parameters[0] == 'org.freedesktop.network1.Manager' \ + and 'OperationalState' in parameters[1]: + connected = parameters[1]['OperationalState'] == 'routable' + if connected is not None: GLib.timeout_add_seconds( 2, update_connection_state, @@ -67,6 +73,16 @@ def appeared(connection, name, name_owner, *user_data): Gio.DBusSignalFlags.NONE, signal_received, None) + elif name == 'org.freedesktop.network1': + connection.signal_subscribe( + 'org.freedesktop.network1', + None, + 'PropertiesChanged', + '/org/freedesktop/network1', + None, + Gio.DBusSignalFlags.NONE, + signal_received, + None) def update_connection_state(connected): @@ -82,3 +98,4 @@ def update_connection_state(connected): watch_name('org.freedesktop.NetworkManager') +watch_name('org.freedesktop.network1') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2cd6634c0e2a41e60169362daa487a5c7…

1 0

[Git][gajim/gajim][master] 2 commits: Always send message delivery receipts requests
by Philipp Hörist 01 May '17

01 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 79dc0c49 by Philipp Hörist at 2017-05-01T19:23:31+02:00 Always send message delivery receipts requests - We want to send requests also to offline contacts. - The XEP is wide spread chances are high that a contact supports it. - It gets really complicated, when we want to guess if a offline contact supports receipts - - - - - 2cd6634c by Philipp Hörist at 2017-05-01T19:42:57+02:00 Dont show warning on missing 0184 receipt https://xmpp.org/extensions/xep-0184.html#what tells us that we SHOULD NOT impute any meaning to the fact that we did not receive an ack message - - - - - 6 changed files: - src/chat_control.py - src/chat_control_base.py - src/common/caps_cache.py - src/common/connection.py - src/common/connection_handlers.py - src/conversation_textview.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -49,7 +49,7 @@ from common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from common.contacts import GC_Contact from common.logger import KindConstant from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC -from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION +from nbxmpp.protocol import NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER from nbxmpp.protocol import NS_CHATSTATES @@ -980,8 +980,7 @@ class ChatControl(ChatControlBase): id_ = msg_stanza.getID() xep0184_id = None if self.contact.jid != gajim.get_jid_from_account(self.account): - if self.contact.supports(NS_RECEIPTS) and gajim.config.get_per( - 'accounts', self.account, 'request_receipt'): + if gajim.config.get_per('accounts', self.account, 'request_receipt'): xep0184_id = id_ if label: displaymarking = label.getTag('displaymarking') ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -875,7 +875,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): correct_id=correct_id, additional_data=additional_data) if xep0184_id is not None: - textview.show_xep0184_warning(xep0184_id) + textview.add_xep0184_mark(xep0184_id) if not count_as_new: return ===================================== src/common/caps_cache.py ===================================== --- a/src/common/caps_cache.py +++ b/src/common/caps_cache.py @@ -37,11 +37,11 @@ import hashlib import logging log = logging.getLogger('gajim.c.caps_cache') -from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, +from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them -FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, +FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER] ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -469,8 +469,7 @@ class CommonConnection: # XEP-0184 if obj.jid != gajim.get_jid_from_account(self.name): if msgtxt and gajim.config.get_per('accounts', self.name, - 'request_receipt') and contact and contact.supports( - nbxmpp.NS_RECEIPTS): + 'request_receipt'): msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) if obj.forward_from: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1204,7 +1204,7 @@ class ConnectionHandlersBase: if not id_: # old XEP implementation id_ = obj.id_ - ctrl.conv_textview.hide_xep0184_warning(id_) + ctrl.conv_textview.show_xep0184_ack(id_) if obj.mtype == 'error': if not obj.msgtxt: ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -210,7 +210,6 @@ class ConversationTextview(GObject.GObject): self.images = [] self.image_cache = {} self.xep0184_marks = {} - self.xep0184_shown = {} # self.last_sent_message_id = msg_stanza_id self.last_sent_message_id = None # last_received_message_id[name] = (msg_stanza_id, line_start_mark) @@ -307,9 +306,6 @@ class ConversationTextview(GObject.GObject): buffer_.create_tag('focus-out-line', justification = Gtk.Justification.CENTER) self.displaymarking_tags = {} - tag = buffer_.create_tag('xep0184-warning') - tag.set_property('foreground', '#cc0000') - tag = buffer_.create_tag('xep0184-received') tag.set_property('foreground', '#73d216') @@ -340,15 +336,6 @@ class ConversationTextview(GObject.GObject): 'been said since the\nlast time you paid attention to this ' 'group chat')) return True - if tag_name == 'xep0184-warning': - tooltip.set_text(_( - 'This icon indicates that this message has not ' - 'yet\nbeen received by the remote ' - "end. If this icon stays\nfor a long time, it's likely the " - 'message got lost.')) - window.set_cursor(gtkgui_helpers.get_cursor('LEFT_PTR')) - self.cursor_changed = True - return True if getattr(tag, 'is_anchor', False): text = getattr(tag, 'title', False) if text: @@ -445,59 +432,32 @@ class ConversationTextview(GObject.GObject): return index, end_mark, old_txt - def show_xep0184_warning(self, id_): + def add_xep0184_mark(self, id_): if id_ in self.xep0184_marks: return buffer_ = self.tv.get_buffer() buffer_.begin_user_action() - self.xep0184_marks[id_] = buffer_.create_mark(None, - buffer_.get_end_iter(), left_gravity=True) - self.xep0184_shown[id_] = NOT_SHOWN - - def show_it(): - if (not id_ in self.xep0184_shown) or \ - self.xep0184_shown[id_] == ALREADY_RECEIVED: - return False - - end_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) - buffer_.insert_with_tags_by_name(end_iter, ' ✖', 'xep0184-warning') - - self.xep0184_shown[id_] = SHOWN - return False - GLib.timeout_add_seconds(3, show_it) + self.xep0184_marks[id_] = buffer_.create_mark( + None, buffer_.get_end_iter(), left_gravity=True) buffer_.end_user_action() - def hide_xep0184_warning(self, id_): + def show_xep0184_ack(self, id_): if id_ not in self.xep0184_marks: return buffer_ = self.tv.get_buffer() buffer_.begin_user_action() - if self.xep0184_shown[id_] != NOT_SHOWN: - begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) - - end_iter = begin_iter.copy() - # XXX: Is there a nicer way? - end_iter.forward_char() - end_iter.forward_char() - - buffer_.delete(begin_iter, end_iter) - if gajim.config.get('positive_184_ack'): begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) buffer_.insert_with_tags_by_name(begin_iter, ' ✓', 'xep0184-received') - self.xep0184_shown[id_] = ALREADY_RECEIVED - buffer_.end_user_action() - del self.xep0184_marks[id_] - del self.xep0184_shown[id_] def show_focus_out_line(self, scroll=True): if not self.allow_focus_out_line: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d346333d2ac1851fbd0d94fd106b45c95…

1 0

[Git][gajim/gajim][master] 5 commits: Extend method to return our own full jid
by Philipp Hörist 01 May '17

01 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2126d430 by Philipp Hörist at 2017-05-01T17:23:46+02:00 Extend method to return our own full jid - - - - - e02798dc by Philipp Hörist at 2017-05-01T17:52:19+02:00 Dont send chatstates to own resources - - - - - c49d13bc by Philipp Hörist at 2017-05-01T17:58:55+02:00 Use BareJID when sending message to ourself - - - - - 33a584b8 by Philipp Hörist at 2017-05-01T19:08:11+02:00 Dont use message receipts in message to ourself - - - - - d346333d by Philipp Hörist at 2017-05-01T19:08:19+02:00 Drop some message from ourself - 'received'-Carbons from ourself, because we either received the message directly or got a 'sent'-Carbon about it - Messages from our own full jid, this can happen when we send a Message to ourself and no other resource is online. - - - - - 8 changed files: - src/chat_control.py - src/chat_control_base.py - src/common/connection.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/common/gajim.py - src/message_control.py - src/roster_window.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -978,11 +978,11 @@ class ChatControl(ChatControlBase): def _on_sent(obj, msg_stanza, message, encrypted, xhtml, label): id_ = msg_stanza.getID() - if self.contact.supports(NS_RECEIPTS) and gajim.config.get_per( - 'accounts', self.account, 'request_receipt'): - xep0184_id = id_ - else: - xep0184_id = None + xep0184_id = None + if self.contact.jid != gajim.get_jid_from_account(self.account): + if self.contact.supports(NS_RECEIPTS) and gajim.config.get_per( + 'accounts', self.account, 'request_receipt'): + xep0184_id = id_ if label: displaymarking = label.getTag('displaymarking') else: @@ -1233,6 +1233,9 @@ class ChatControl(ChatControlBase): if contact and contact.sub in ('to', 'none'): return + if self.contact.jid == gajim.get_jid_from_account(self.account): + return + elif chatstate_setting == 'composing_only' and state != 'active' and\ state != 'composing': return ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -701,7 +701,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # refresh timers self.reset_kbd_mouse_timeout_vars() - if gajim.config.get('outgoing_chat_state_notifications') == 'disabled': + notifications = gajim.config.get('outgoing_chat_state_notifications') + if (self.contact.jid == gajim.get_jid_from_account(self.account) or + notifications == 'disabled'): chatstate = None label = self.get_seclabel() ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -355,7 +355,10 @@ class CommonConnection: else: msgtxt = obj.message - fjid = obj.get_full_jid() + if obj.jid == gajim.get_jid_from_account(self.name): + fjid = obj.jid + else: + fjid = obj.get_full_jid() if obj.correction_msg: id_ = obj.correction_msg.getID() @@ -464,10 +467,11 @@ class CommonConnection: namespace=nbxmpp.NS_MSG_HINTS) # XEP-0184 - if msgtxt and gajim.config.get_per('accounts', self.name, - 'request_receipt') and contact and contact.supports( - nbxmpp.NS_RECEIPTS): - msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) + if obj.jid != gajim.get_jid_from_account(self.name): + if msgtxt and gajim.config.get_per('accounts', self.name, + 'request_receipt') and contact and contact.supports( + nbxmpp.NS_RECEIPTS): + msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) if obj.forward_from: addresses = msg_iq.addChild('addresses', ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1174,17 +1174,19 @@ class ConnectionHandlersBase: jid_to = gajim.get_jid_without_resource(fjid_to) if jid_to == gajim.get_jid_from_account(self.name): reply = True - if obj.receipt_request_tag and gajim.config.get_per('accounts', - self.name, 'answer_receipts') and ((contact and contact.sub \ - not in ('to', 'none')) or gc_contact) and obj.mtype != 'error' and \ - reply: - receipt = nbxmpp.Message(to=obj.fjid, typ='chat') - receipt.setTag('received', namespace='urn:xmpp:receipts', - attrs={'id': obj.id_}) - - if obj.thread_id: - receipt.setThread(obj.thread_id) - self.connection.send(receipt) + + if obj.jid != gajim.get_jid_from_account(self.name): + if obj.receipt_request_tag and gajim.config.get_per('accounts', + self.name, 'answer_receipts') and ((contact and contact.sub \ + not in ('to', 'none')) or gc_contact) and obj.mtype != 'error' and \ + reply: + receipt = nbxmpp.Message(to=obj.fjid, typ='chat') + receipt.setTag('received', namespace='urn:xmpp:receipts', + attrs={'id': obj.id_}) + + if obj.thread_id: + receipt.setThread(obj.thread_id) + self.connection.send(receipt) # We got our message's receipt if obj.receipt_received_tag and gajim.config.get_per('accounts', ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1124,6 +1124,15 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.sent = False account = self.conn.name + our_full_jid = gajim.get_jid_from_account(account, full=True) + if self.stanza.getFrom() == our_full_jid: + # Drop messages sent from our own full jid + # It can happen that when we sent message to our own bare jid + # that the server routes that message back to us + log.info('Received message from self: %s, message is dropped' + % self.stanza.getFrom()) + return + # check if the message is a roster item exchange (XEP-0144) if self.stanza.getTag('x', namespace=nbxmpp.NS_ROSTERX): gajim.nec.push_incoming_event(RosterItemExchangeEvent(None, @@ -1179,6 +1188,17 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): to = gajim.get_jid_from_account(account) self.stanza.setFrom(to) self.sent = True + elif carbon_marker.getName() == 'received': + full_frm = str(self.stanza.getFrom()) + frm = gajim.get_jid_without_resource(full_frm) + if frm == gajim.get_jid_from_account(account): + # Drop 'received' Carbons from ourself, we already + # got the message with the 'sent' Carbon or via the + # message itself + log.info( + 'Drop "received"-Carbon from ourself: %s' + % full_frm) + return try: self.get_jid_resource() except helpers.InvalidFormat: ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -420,13 +420,16 @@ def jid_is_transport(jid): return True return False -def get_jid_from_account(account_name): +def get_jid_from_account(account_name, full=False): """ Return the jid we use in the given account """ name = config.get_per('accounts', account_name, 'name') hostname = config.get_per('accounts', account_name, 'hostname') jid = name + '@' + hostname + if full: + resource = connections[account_name].server_resource + jid += '/' + resource return jid def get_our_jids(): ===================================== src/message_control.py ===================================== --- a/src/message_control.py +++ b/src/message_control.py @@ -235,7 +235,8 @@ class MessageControl(object): conn = gajim.connections[self.account] if not self.session: - if not obj.resource: + if (not obj.resource and + obj.jid != gajim.get_jid_from_account(self.account)): if self.resource: obj.resource = self.resource else: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2734,7 +2734,8 @@ class RosterWindow: typ = 'error' if obj.forwarded and obj.sent: typ = 'out' - xep0184_id = obj.id_ + if obj.jid != gajim.get_jid_from_account(obj.conn.name): + xep0184_id = obj.id_ obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, @@ -3916,7 +3917,7 @@ class RosterWindow: contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if jid == gajim.get_jid_from_account(account): - resource = contact.resource + resource = None gajim.interface.on_open_chat_window(None, contact, account, \ resource=resource, session=session) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0eb2433c1754e4bdf967072aee6ce1b1c…

1 0

[Git][gajim/gajim][gajim_0.16] Fix mediated groupchat invites
by Philipp Hörist 01 May '17

01 May '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 48bb80b9 by Philipp Hörist at 2017-05-01T16:25:19+02:00 Fix mediated groupchat invites - Push Invitation and Decline event much earlier - Refactor Logic to decide if mediated or not Ejabbered 17.03 does add a `jabber:x:conference` namespace into mediated invites which has broken our logic - Dont add a groupchat contact on invitation, always add the inviter to the roster - - - - - 3 changed files: - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/gui_interface.py Changes: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1244,14 +1244,6 @@ class ConnectionHandlersBase: self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp) return True - elif obj.invite_tag is not None: - gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, - conn=self, msg_obj=obj)) - return True - elif obj.decline_tag is not None: - gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None, - conn=self, msg_obj=obj)) - return True elif obj.mtype == 'groupchat': gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, conn=self, msg_obj=obj)) ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1220,24 +1220,32 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return self.enc_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) - - self.invite_tag = None - self.decline_tag = None if not self.enc_tag: - # Direct invitation? - self.invite_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_CONFERENCE) # Mediated invitation? - if not self.invite_tag: - self.invite_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_MUC_USER) - if self.invite_tag and not self.invite_tag.getTag('invite'): - self.invite_tag = None - - self.decline_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_MUC_USER) - if self.decline_tag and not self.decline_tag.getTag('decline'): - self.decline_tag = None + muc_user = self.stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user: + if muc_user.getTag('decline'): + gajim.nec.push_incoming_event( + GcDeclineReceivedEvent( + None, conn=self.conn, + room_jid=self.fjid, stanza=muc_user)) + return + if muc_user.getTag('invite'): + gajim.nec.push_incoming_event( + GcInvitationReceivedEvent( + None, conn=self.conn, jid_from=self.fjid, + mediated=True, stanza=muc_user)) + return + else: + # Direct invitation? + direct = self.stanza.getTag( + 'x', namespace=nbxmpp.NS_CONFERENCE) + if direct: + gajim.nec.push_incoming_event( + GcInvitationReceivedEvent( + None, conn=self.conn, jid_from=self.fjid, + mediated=False, stanza=direct)) + return self.thread_id = self.stanza.getThread() self.mtype = self.stanza.getType() @@ -1351,46 +1359,43 @@ class GcInvitationReceivedEvent(nec.NetworkIncomingEvent): base_network_events = [] def generate(self): - invite_tag = self.msg_obj.invite_tag - if invite_tag.getNamespace() == nbxmpp.NS_CONFERENCE: + account = self.conn.name + if not self.mediated: # direct invitation try: - self.room_jid = helpers.parse_jid(invite_tag.getAttr('jid')) + self.room_jid = helpers.parse_jid(self.stanza.getAttr('jid')) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % invite_tag.getAttr( - 'jid')) + log.warning('Invalid JID: %s, ignoring it', + self.stanza.getAttr('jid')) return - self.jid_from = self.msg_obj.fjid - self.reason = invite_tag.getAttr('reason') - self.password = invite_tag.getAttr('password') + self.reason = self.stanza.getAttr('reason') + self.password = self.stanza.getAttr('password') self.is_continued = False - if invite_tag.getAttr('continue') == 'true': - self.is_continued = True + self.is_continued = self.stanza.getAttr('continue') == 'true' else: - self.room_jid = self.msg_obj.fjid - item = invite_tag.getTag('invite') + self.invite = self.stanza.getTag('invite') + self.room_jid = self.jid_from try: - self.jid_from = helpers.parse_jid(item.getAttr('from')) + self.jid_from = helpers.parse_jid(self.invite.getAttr('from')) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) - return + log.warning('Invalid JID: %s, ignoring it', + self.invite.getAttr('from')) - self.reason = item.getTagData('reason') - self.password = invite_tag.getTagData('password') + return - self.is_continued = False - if item.getTag('continue'): - self.is_continued = True + self.reason = self.invite.getTagData('reason') + self.password = self.stanza.getTagData('password') + self.is_continued = self.stanza.getTag('continue') is not None - if self.room_jid in gajim.gc_connected[self.conn.name] and \ - gajim.gc_connected[self.conn.name][self.room_jid]: + if self.room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][self.room_jid]: # We are already in groupchat. Ignore invitation return jid = gajim.get_jid_without_resource(self.jid_from) - if gajim.config.get_per('accounts', self.conn.name, - 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( - self.conn.name, jid): - return + ignore = gajim.config.get_per( + 'accounts', account, 'ignore_unknown_contacts') + if ignore and not gajim.contacts.get_contacts(account, jid): + return return True @@ -1399,20 +1404,20 @@ class GcDeclineReceivedEvent(nec.NetworkIncomingEvent): base_network_events = [] def generate(self): - self.room_jid = self.msg_obj.fjid - - item = self.msg_obj.decline_tag.getTag('decline') + account = self.conn.name + decline = self.stanza.getTag('decline') try: - self.jid_from = helpers.parse_jid(item.getAttr('from')) + self.jid_from = helpers.parse_jid(decline.getAttr('from')) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) + log.warning('Invalid JID: %s, ignoring it', + decline.getAttr('from')) return jid = gajim.get_jid_without_resource(self.jid_from) - if gajim.config.get_per('accounts', self.conn.name, - 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( - self.conn.name, jid): + ignore = gajim.config.get_per( + 'accounts', account, 'ignore_unknown_contacts') + if ignore and not gajim.contacts.get_contacts(account, jid): return - self.reason = item.getTagData('reason') + self.reason = decline.getTagData('reason') return True @@ -1427,8 +1432,6 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.fjid = self.msg_obj.fjid self.resource = self.msg_obj.resource self.mtype = self.msg_obj.mtype - self.invite_tag = self.msg_obj.invite_tag - self.decline_tag = self.msg_obj.decline_tag self.thread_id = self.msg_obj.thread_id self.msgtxt = self.msg_obj.msgtxt self.gc_control = self.msg_obj.gc_control ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -1652,16 +1652,11 @@ class Interface: gajim.events.add_event(account, jid, event) self.roster.show_title() - if no_queue: # We didn't have a queue: we change icons - if not gajim.contacts.get_contact_with_highest_priority(account, - jid): - if event.type_ == 'gc-invitation': - self.roster.add_groupchat(jid, account, status='offline') - else: - # add contact to roster ("Not In The Roster") if he is not - self.roster.add_to_not_in_the_roster(account, jid) - else: + if no_queue: # We didn't have a queue: we change icons + if gajim.contacts.get_contact_with_highest_priority(account, jid): self.roster.draw_contact(jid, account) + else: + self.roster.add_to_not_in_the_roster(account, jid) # Select the big brother contact in roster, it's visible because it has # events. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/48bb80b9695d31670cdd445990afb94ae8…

1 0

[Git][gajim/gajim][master] Fix regression from !85
by Philipp Hörist 01 May '17

01 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0eb2433c by Philipp Hörist at 2017-05-01T16:08:02+02:00 Fix regression from !85 Disabled accounts are not in gajim.connections, which leads to a key error. - - - - - 1 changed file: - src/config.py Changes: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -1716,7 +1716,8 @@ class AccountsWindow: self.remove_button.set_sensitive(True) self.rename_button.set_sensitive(True) - if account != gajim.ZEROCONF_ACC_NAME: + if (account != gajim.ZEROCONF_ACC_NAME and + account in gajim.connections): self.change_password_button.set_sensitive( gajim.connections[account].register_supported) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0eb2433c1754e4bdf967072aee6ce1b1c0…

1 0

[Git][gajim/gajim][master] 2 commits: Fix mediated groupchat invites
by Philipp Hörist 01 May '17

01 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 64ae063f by Philipp Hörist at 2017-05-01T15:33:38+02:00 Fix mediated groupchat invites - Push Invitation and Decline event much earlier - Refactor Logic to decide if mediated or not Ejabbered 17.03 does add a 'jabber:x:conference' namespace into mediated invites which has broken our logic - Dont add a groupchat contact on invitation, always add the inviter to the roster - - - - - 9be4bb3a by Philipp Hörist at 2017-05-01T15:58:10+02:00 Merge branch 'invite' into 'master' Fix mediated groupchat invites Closes #8603 and #8468 See merge request !92 - - - - - 3 changed files: - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/gui_interface.py Changes: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1210,14 +1210,6 @@ class ConnectionHandlersBase: self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp) return True - elif obj.invite_tag is not None: - gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, - conn=self, msg_obj=obj)) - return True - elif obj.decline_tag is not None: - gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None, - conn=self, msg_obj=obj)) - return True elif obj.mtype == 'groupchat': gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, conn=self, msg_obj=obj)) ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1115,7 +1115,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): def init(self): self.additional_data = {} - + def generate(self): self.conn = self.base_event.conn self.stanza = self.base_event.stanza @@ -1197,24 +1197,32 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return self.enc_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) - - self.invite_tag = None - self.decline_tag = None if not self.enc_tag: - # Direct invitation? - self.invite_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_CONFERENCE) # Mediated invitation? - if not self.invite_tag: - self.invite_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_MUC_USER) - if self.invite_tag and not self.invite_tag.getTag('invite'): - self.invite_tag = None - - self.decline_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_MUC_USER) - if self.decline_tag and not self.decline_tag.getTag('decline'): - self.decline_tag = None + muc_user = self.stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user: + if muc_user.getTag('decline'): + gajim.nec.push_incoming_event( + GcDeclineReceivedEvent( + None, conn=self.conn, + room_jid=self.fjid, stanza=muc_user)) + return + if muc_user.getTag('invite'): + gajim.nec.push_incoming_event( + GcInvitationReceivedEvent( + None, conn=self.conn, jid_from=self.fjid, + mediated=True, stanza=muc_user)) + return + else: + # Direct invitation? + direct = self.stanza.getTag( + 'x', namespace=nbxmpp.NS_CONFERENCE) + if direct: + gajim.nec.push_incoming_event( + GcInvitationReceivedEvent( + None, conn=self.conn, jid_from=self.fjid, + mediated=False, stanza=direct)) + return self.thread_id = self.stanza.getThread() self.mtype = self.stanza.getType() @@ -1329,46 +1337,42 @@ class GcInvitationReceivedEvent(nec.NetworkIncomingEvent): base_network_events = [] def generate(self): - invite_tag = self.msg_obj.invite_tag - if invite_tag.getNamespace() == nbxmpp.NS_CONFERENCE: + account = self.conn.name + if not self.mediated: # direct invitation try: - self.room_jid = helpers.parse_jid(invite_tag.getAttr('jid')) + self.room_jid = helpers.parse_jid(self.stanza.getAttr('jid')) except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', invite_tag.getAttr( - 'jid')) + log.warning('Invalid JID: %s, ignoring it', + self.stanza.getAttr('jid')) return - self.jid_from = self.msg_obj.fjid - self.reason = invite_tag.getAttr('reason') - self.password = invite_tag.getAttr('password') + self.reason = self.stanza.getAttr('reason') + self.password = self.stanza.getAttr('password') self.is_continued = False - if invite_tag.getAttr('continue') == 'true': - self.is_continued = True + self.is_continued = self.stanza.getAttr('continue') == 'true' else: - self.room_jid = self.msg_obj.fjid - item = self.msg_obj.invite_tag.getTag('invite') + self.invite = self.stanza.getTag('invite') + self.room_jid = self.jid_from try: - self.jid_from = helpers.parse_jid(item.getAttr('from')) + self.jid_from = helpers.parse_jid(self.invite.getAttr('from')) except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % item.getAttr( - 'from')) + log.warning('Invalid JID: %s, ignoring it', + self.invite.getAttr('from')) return - self.reason = item.getTagData('reason') - self.password = invite_tag.getTagData('password') - - self.is_continued = False - if item.getTag('continue'): - self.is_continued = True + self.reason = self.invite.getTagData('reason') + self.password = self.stanza.getTagData('password') + self.is_continued = self.stanza.getTag('continue') is not None - if self.room_jid in gajim.gc_connected[self.conn.name] and \ - gajim.gc_connected[self.conn.name][self.room_jid]: + if self.room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][self.room_jid]: # We are already in groupchat. Ignore invitation return jid = gajim.get_jid_without_resource(self.jid_from) - if gajim.config.get_per('accounts', self.conn.name, - 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( - self.conn.name, jid): + + ignore = gajim.config.get_per( + 'accounts', account, 'ignore_unknown_contacts') + if ignore and not gajim.contacts.get_contacts(account, jid): return return True @@ -1378,20 +1382,20 @@ class GcDeclineReceivedEvent(nec.NetworkIncomingEvent): base_network_events = [] def generate(self): - self.room_jid = self.msg_obj.fjid - - item = self.msg_obj.decline_tag.getTag('decline') + account = self.conn.name + decline = self.stanza.getTag('decline') try: - self.jid_from = helpers.parse_jid(item.getAttr('from')) + self.jid_from = helpers.parse_jid(decline.getAttr('from')) except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % item.getAttr('from')) + log.warning('Invalid JID: %s, ignoring it', + decline.getAttr('from')) return jid = gajim.get_jid_without_resource(self.jid_from) - if gajim.config.get_per('accounts', self.conn.name, - 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( - self.conn.name, jid): + ignore = gajim.config.get_per( + 'accounts', account, 'ignore_unknown_contacts') + if ignore and not gajim.contacts.get_contacts(account, jid): return - self.reason = item.getTagData('reason') + self.reason = decline.getTagData('reason') return True @@ -1408,8 +1412,6 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.fjid = self.msg_obj.fjid self.resource = self.msg_obj.resource self.mtype = self.msg_obj.mtype - self.invite_tag = self.msg_obj.invite_tag - self.decline_tag = self.msg_obj.decline_tag self.thread_id = self.msg_obj.thread_id self.msgtxt = self.msg_obj.msgtxt self.gc_control = self.msg_obj.gc_control ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -1680,16 +1680,11 @@ class Interface: gajim.events.add_event(account, jid, event) self.roster.show_title() - if no_queue: # We didn't have a queue: we change icons - if not gajim.contacts.get_contact_with_highest_priority(account, - jid): - if event.type_ == 'gc-invitation': - self.roster.add_groupchat(jid, account, status='offline') - else: - # add contact to roster ("Not In The Roster") if he is not - self.roster.add_to_not_in_the_roster(account, jid) - else: + if no_queue: # We didn't have a queue: we change icons + if gajim.contacts.get_contact_with_highest_priority(account, jid): self.roster.draw_contact(jid, account) + else: + self.roster.add_to_not_in_the_roster(account, jid) # Select the big brother contact in roster, it's visible because it has # events. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d06ba96a89c18f93cd983f06280c50dc5…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2017