Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Remove old PEP code
by Philipp Hörist 02 Jan '19

02 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 608607b7 by Philipp Hörist at 2018-12-31T09:54:51Z Remove old PEP code - - - - - a289ad5f by Philipp Hörist at 2019-01-02T01:04:42Z Refactor Presence - Remove option to hide self contacts for now. This makes the code less complicated. - Move as much code as possible into the presence module - Use nbxmpp properties - - - - - f2beea0d by Philipp Hörist at 2019-01-02T01:04:54Z Refactor Caps module - - - - - 12 changed files: - gajim/common/config.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/modules/caps.py - gajim/common/modules/pep.py - gajim/common/modules/presence.py - − gajim/common/pep.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/gui_interface.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/config.py ===================================== @@ -268,7 +268,6 @@ class Config: 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: shttp:// sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True], 'shell_like_completion': [opt_bool, False, _('If true, completion in groupchats will be like a shell auto-completion')], - 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc'], ===================================== gajim/common/connection_handlers.py ===================================== @@ -67,136 +67,13 @@ class ConnectionHandlersBase: # We decrypt GPG messages one after the other. Keep queue in mem self.gpg_messages_to_decrypt = [] - app.ged.register_event_handler('presence-received', ged.CORE, - self._nec_presence_received) app.ged.register_event_handler('gc-message-received', ged.CORE, self._nec_gc_message_received) def cleanup(self): - app.ged.remove_event_handler('presence-received', ged.CORE, - self._nec_presence_received) app.ged.remove_event_handler('gc-message-received', ged.CORE, self._nec_gc_message_received) - def _nec_presence_received(self, obj): - account = obj.conn.name - if account != self.name: - return - jid = obj.jid - resource = obj.resource or '' - - statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible'] - obj.old_show = 0 - obj.new_show = statuss.index(obj.show) - - obj.contact_list = [] - - highest = app.contacts.get_contact_with_highest_priority(account, jid) - obj.was_highest = (highest and highest.resource == resource) - - # Update contact - obj.contact_list = app.contacts.get_contacts(account, jid) - obj.contact = None - resources = [] - for c in obj.contact_list: - resources.append(c.resource) - if c.resource == resource: - obj.contact = c - break - - if obj.contact: - if obj.contact.show in statuss: - obj.old_show = statuss.index(obj.contact.show) - # nick changed - if obj.contact_nickname is not None and \ - obj.contact.contact_name != obj.contact_nickname: - obj.contact.contact_name = obj.contact_nickname - obj.need_redraw = True - - elif obj.old_show != obj.new_show or obj.contact.status != \ - obj.status: - obj.need_redraw = True - else: - obj.contact = app.contacts.get_first_contact_from_jid(account, - jid) - if not obj.contact: - # Presence of another resource of our jid - # Create self contact and add to roster - if resource == obj.conn.server_resource: - return - # Ignore offline presence of unknown self resource - if obj.new_show < 2: - return - obj.contact = app.contacts.create_self_contact(jid=jid, - account=account, show=obj.show, status=obj.status, - priority=obj.prio, keyID=obj.keyID, - resource=obj.resource) - app.contacts.add_contact(account, obj.contact) - obj.contact_list.append(obj.contact) - elif obj.contact.show in statuss: - obj.old_show = statuss.index(obj.contact.show) - if (resources != [''] and (len(obj.contact_list) != 1 or \ - obj.contact_list[0].show not in ('not in roster', 'offline'))) and \ - not app.jid_is_transport(jid): - # Another resource of an existing contact connected - obj.old_show = 0 - obj.contact = app.contacts.copy_contact(obj.contact) - obj.contact_list.append(obj.contact) - obj.contact.resource = resource - - obj.need_redraw = True - obj.need_add_in_roster = True - - if not app.jid_is_transport(jid) and len(obj.contact_list) == 1: - # It's not an agent - if obj.old_show == 0 and obj.new_show > 1: - if not jid in app.newly_added[account]: - app.newly_added[account].append(jid) - if jid in app.to_be_removed[account]: - app.to_be_removed[account].remove(jid) - elif obj.old_show > 1 and obj.new_show == 0 and \ - obj.conn.connected > 1: - if not jid in app.to_be_removed[account]: - app.to_be_removed[account].append(jid) - if jid in app.newly_added[account]: - app.newly_added[account].remove(jid) - obj.need_redraw = True - - obj.contact.show = obj.show - obj.contact.status = obj.status - obj.contact.priority = obj.prio - attached_keys = app.config.get_per('accounts', account, - 'attached_gpg_keys').split() - if jid in attached_keys: - obj.contact.keyID = attached_keys[attached_keys.index(jid) + 1] - else: - # Do not override assigned key - obj.contact.keyID = obj.keyID - obj.contact.contact_nickname = obj.contact_nickname - obj.contact.idle_time = obj.idle_time - - if app.jid_is_transport(jid): - return - - # It isn't an agent - # (when contact signs out or has errors) - if obj.show in ('offline', 'error'): - # TODO: This causes problems when another - # resource signs off! - self.stop_all_active_file_transfers(obj.contact) - - if app.config.get('log_contact_status_changes') and \ - app.config.should_log(self.name, obj.jid): - show = app.logger.convert_show_values_to_db_api_values(obj.show) - if show is not None: - app.logger.insert_into_logs(self.name, - nbxmpp.JID(obj.jid).getStripped(), - time.time(), - KindConstant.STATUS, - message=obj.status, - show=show) - def _check_for_mam_compliance(self, room_jid, stanza_id): namespace = muc_caps_cache.get_mam_namespace(room_jid) if stanza_id is None and namespace == nbxmpp.NS_MAM_2: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -33,7 +33,6 @@ from gajim.common.modules import dataforms from gajim.common.modules.misc import parse_idle from gajim.common.modules.misc import parse_delay from gajim.common.const import KindConstant, SSLError -from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp @@ -145,105 +144,8 @@ class StreamConflictReceivedEvent(nec.NetworkIncomingEvent): self.conn = self.base_event.conn return True -class PresenceHelperEvent: - def _generate_show(self): - self.show = self.stanza.getShow() - if self.show not in ('chat', 'away', 'xa', 'dnd'): - self.show = '' # We ignore unknown show - if not self.ptype and not self.show: - self.show = 'online' - elif self.ptype == 'unavailable': - self.show = 'offline' - - def _generate_ptype(self): - self.ptype = self.stanza.getType() - if self.ptype == 'available': - self.ptype = None - rfc_types = ('unavailable', 'error', 'subscribe', 'subscribed', - 'unsubscribe', 'unsubscribed') - if self.ptype and not self.ptype in rfc_types: - self.ptype = None - -class PresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent, -PresenceHelperEvent): +class PresenceReceivedEvent(nec.NetworkIncomingEvent): name = 'presence-received' - base_network_events = ['raw-pres-received'] - - def _generate_keyID(self, sig_tag): - self.keyID = '' - if sig_tag and self.conn.USE_GPG and self.ptype != 'error': - # error presences contain our own signature - # verify - sig_msg = sig_tag.getData() - self.keyID = self.conn.gpg.verify(self.status, sig_msg) - self.keyID = helpers.prepare_and_validate_gpg_keyID(self.conn.name, - self.jid, - self.keyID) - - def _generate_prio(self): - self.prio = self.stanza.getPriority() - try: - self.prio = int(self.prio) - except Exception: - self.prio = 0 - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - - self.need_add_in_roster = False - self.need_redraw = False - - self.popup = False # Do we want to open chat window ? - - if not self.conn or self.conn.connected < 2: - log.debug('account is no more connected') - return - - self._generate_ptype() - try: - self.get_jid_resource() - except Exception: - log.warning('Invalid JID: %s, ignoring it', self.stanza.getFrom()) - return - jid_list = app.contacts.get_jid_list(self.conn.name) - self.timestamp = None - self.get_id() - self.avatar_sha = None - # XEP-0172 User Nickname - self.user_nick = self.stanza.getTagData('nick') or '' - self.contact_nickname = None - self.transport_auto_auth = False - - # XEP-0203 - self.timestamp = parse_delay(self.stanza) - if self.timestamp is None: - self.timestamp = time_time() - - # XEP-0319 - self.idle_time = parse_idle(self.stanza) - - sig_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_SIGNED) - - self.status = self.stanza.getStatus() or '' - self._generate_show() - self._generate_prio() - self._generate_keyID(sig_tag) - - self.errcode = self.stanza.getErrorCode() - self.errmsg = self.stanza.getErrorMsg() - - if self.ptype == 'error': - return - - if not self.ptype or self.ptype == 'unavailable': - our_jid = app.get_jid_from_account(self.conn.name) - if self.jid == our_jid and self.resource == self.conn.server_resource: - # We got our own presence - app.nec.push_incoming_event(OurShowEvent(None, conn=self.conn, - show=self.show)) - elif self.jid in jid_list or self.jid == our_jid: - return True class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent): name = 'presence-received' @@ -255,16 +157,13 @@ class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent): self.keyID = None self.idle_time = None self.timestamp = 0 - self.contact_nickname = None self.avatar_sha = None self.need_add_in_roster = False - self.need_redraw = False if self.show == 'offline': self.ptype = 'unavailable' else: self.ptype = None self.user_nick = '' - self.transport_auto_auth = False self.errcode = None self.errmsg = '' self.popup = False # Do we want to open chat window ? @@ -429,30 +328,6 @@ class GPGPasswordRequiredEvent(nec.NetworkIncomingEvent): self.keyid = app.config.get_per('accounts', self.conn.name, 'keyid') return True -class PEPReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'pep-received' - - def generate(self): - if not self.stanza.getTag('event'): - return - if self.stanza.getTag('error'): - log.debug('PEPReceivedEvent received error stanza. Ignoring') - return - - try: - self.get_jid_resource() - except Exception: - return - - self.event_tag = self.stanza.getTag('event') - - for pep_class in SUPPORTED_PERSONAL_USER_EVENTS: - pep = pep_class.get_tag_as_PEP(self.fjid, self.conn.name, - self.event_tag) - if pep: - self.pep_type = pep.type_ - return True - class PlainConnectionEvent(nec.NetworkIncomingEvent): name = 'plain-connection' ===================================== gajim/common/contacts.py ===================================== @@ -368,6 +368,9 @@ class LegacyContactsAPI: def get_contact(self, account, jid, resource=None): return self._accounts[account].contacts.get_contact(jid, resource=resource) + def get_contact_strict(self, account, jid, resource): + return self._accounts[account].contacts.get_contact_strict(jid, resource) + def get_avatar(self, account, *args, **kwargs): return self._accounts[account].contacts.get_avatar(*args, **kwargs) @@ -553,7 +556,7 @@ class Contacts(): """ Return the list of contact instances for this jid """ - return self._contacts.get(jid, []) + return list(self._contacts.get(jid, [])) def get_contact(self, jid, resource=None): ### WARNING ### ===================================== gajim/common/modules/caps.py ===================================== @@ -1,4 +1,5 @@ # Copyright (C) 2009 Stephan Erb <steve-e AT h3c.de> +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> # # This file is part of Gajim. # @@ -19,12 +20,11 @@ import logging import nbxmpp +from nbxmpp.structs import StanzaHandler from gajim.common import caps_cache from gajim.common import app from gajim.common.nec import NetworkEvent -from gajim.common.modules.presence import parse_show -from gajim.common.modules.presence import parse_type log = logging.getLogger('gajim.c.m.caps') @@ -35,69 +35,50 @@ class Caps: self._account = con.name self.handlers = [ - ('presence', self._presence_received, '', nbxmpp.NS_CAPS) + StanzaHandler(name='presence', + callback=self._entity_caps, + ns=nbxmpp.NS_CAPS, + priority=45), ] self._capscache = caps_cache.capscache self._create_suitable_client_caps = caps_cache.create_suitable_client_caps - def _presence_received(self, _con, stanza): - if stanza.getType() in ('unavailable', 'error'): + def _entity_caps(self, _con, _stanza, properties): + if properties.type.is_error or properties.type.is_unavailable: return - from_ = stanza.getFrom() - if from_ is None: - # Presence from ourself + if properties.is_self_presence: return - full_jid = str(from_) - hash_method = node = caps_hash = None + jid = str(properties.jid) - caps = stanza.getTag('c', namespace=nbxmpp.NS_CAPS) - if caps is not None: - hash_method = caps['hash'] - node = caps['node'] - caps_hash = caps['ver'] - - show = parse_show(stanza) - type_ = parse_type(stanza) + hash_method = properties.entity_caps.hash + node = properties.entity_caps.node + caps_hash = properties.entity_caps.ver log.info('Received from %s, type: %s, method: %s, node: %s, hash: %s', - from_, stanza.getType(), hash_method, node, caps_hash) + jid, properties.type, hash_method, node, caps_hash) client_caps = self._create_suitable_client_caps( - node, caps_hash, hash_method, full_jid) + node, caps_hash, hash_method, jid) # Type is None means 'available' - if stanza.getType() is None and client_caps._hash_method == 'no': + if properties.type.is_available and client_caps._hash_method == 'no': self._capscache.forget_caps(client_caps) client_caps = self._create_suitable_client_caps( node, caps_hash, hash_method) else: self._capscache.query_client_of_jid_if_unknown( - self._con, full_jid, client_caps) + self._con, jid, client_caps) - self._update_client_caps_of_contact(from_, client_caps) + self._update_client_caps_of_contact(properties.jid, client_caps) - # Event is only used by ClientIcons Plugin app.nec.push_incoming_event( - NetworkEvent('caps-presence-received', + NetworkEvent('caps-update', conn=self._con, - fjid=full_jid, - jid=from_.getStripped(), - resource=from_.getResource(), - hash_method=hash_method, - node=node, - caps_hash=caps_hash, - client_caps=client_caps, - show=show, - ptype=type_, - stanza=stanza)) - - app.nec.push_incoming_event(NetworkEvent('caps-update', - conn=self._con, - fjid=full_jid, - jid=from_.getStripped())) + fjid=jid, + jid=properties.jid.getBare())) def _update_client_caps_of_contact(self, from_, client_caps): contact = self._get_contact_or_gc_contact_for_jid(from_) ===================================== gajim/common/modules/pep.py ===================================== @@ -93,27 +93,23 @@ class PEP: handlers = self._pep_handlers.get(namespace, None) if handlers is None: - # Old Fallback - from gajim.common.connection_handlers_events import PEPReceivedEvent as OldPEPReceivedEvent - app.nec.push_incoming_event( - OldPEPReceivedEvent(None, conn=self._con, stanza=stanza)) raise nbxmpp.NodeProcessed - else: - # Check if this is a retraction - retract = items.getTag('retract') - if retract is not None: - id_ = retract.getAttr('id') - log.info('Received retract of id: %s', id_) - raise nbxmpp.NodeProcessed - - # Check if we have items - items_ = items.getTags('item') - if items_ is None: - log.warning('Malformed PEP event received: %s', stanza) - raise nbxmpp.NodeProcessed - for handler in handlers: - handler(jid, items_[0]) - raise nbxmpp.NodeProcessed + + # Check if this is a retraction + retract = items.getTag('retract') + if retract is not None: + id_ = retract.getAttr('id') + log.info('Received retract of id: %s', id_) + raise nbxmpp.NodeProcessed + + # Check if we have items + items_ = items.getTags('item') + if items_ is None: + log.warning('Malformed PEP event received: %s', stanza) + raise nbxmpp.NodeProcessed + for handler in handlers: + handler(jid, items_[0]) + raise nbxmpp.NodeProcessed def send_stored_publish(self) -> None: for module in self._store_publish_modules: ===================================== gajim/common/modules/presence.py ===================================== @@ -15,13 +15,17 @@ # Presence handler import logging +import time import nbxmpp +from nbxmpp.structs import StanzaHandler +from nbxmpp.const import PresenceType from gajim.common import app from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent -from gajim.common.modules.user_nickname import parse_nickname +from gajim.common.const import KindConstant +from gajim.common.helpers import prepare_and_validate_gpg_keyID log = logging.getLogger('gajim.c.m.presence') @@ -32,11 +36,25 @@ class Presence: self._account = con.name self.handlers = [ - ('presence', self._presence_received), - ('presence', self._subscribe_received, 'subscribe'), - ('presence', self._subscribed_received, 'subscribed'), - ('presence', self._unsubscribe_received, 'unsubscribe'), - ('presence', self._unsubscribed_received, 'unsubscribed'), + StanzaHandler(name='presence', + callback=self._presence_received, + priority=50), + StanzaHandler(name='presence', + callback=self._subscribe_received, + typ='subscribe', + priority=49), + StanzaHandler(name='presence', + callback=self._subscribed_received, + typ='subscribed', + priority=49), + StanzaHandler(name='presence', + callback=self._unsubscribe_received, + typ='unsubscribe', + priority=49), + StanzaHandler(name='presence', + callback=self._unsubscribed_received, + typ='unsubscribed', + priority=49), ] # keep the jids we auto added (transports contacts) to not send the @@ -46,32 +64,198 @@ class Presence: # list of jid to auto-authorize self.jids_for_auto_auth = [] - def _presence_received(self, _con, stanza): - if stanza.getType() in ('subscribe', 'subscribed', - 'unsubscribe', 'unsubscribed'): - # Dont handle that here + def _presence_received(self, _con, stanza, properties): + log.info('Received from %s', properties.jid) + + if properties.type == PresenceType.ERROR: + log.info('Error: %s %s', properties.jid, properties.error) + raise nbxmpp.NodeProcessed + + if self._account == 'Local': + app.nec.push_incoming_event( + NetworkEvent('raw-pres-received', + conn=self._con, + stanza=stanza)) + raise nbxmpp.NodeProcessed + + if properties.is_self_presence: + app.nec.push_incoming_event( + NetworkEvent('our-show', + conn=self._con, + show=properties.show.value)) + raise nbxmpp.NodeProcessed + + contacts = app.contacts.get_jid_list(self._account) + if properties.jid.getBare() not in contacts and not properties.is_self_bare: + # Handle only presence from roster contacts + log.warning('Unkown presence received') + log.warning(stanza) + return + + key_id = '' + if properties.signed is not None and self._con.USE_GPG: + key_id = self._con.gpg.verify(properties.status, properties.signed) + key_id = prepare_and_validate_gpg_keyID( + self._account, properties.jid.getBare(), key_id) + + show = properties.show.value + if properties.type.is_unavailable: + show = 'offline' + + event_attrs = { + 'conn': self._con, + 'stanza': stanza, + 'keyID': key_id, + 'prio': properties.priority, + 'need_add_in_roster': False, + 'popup': False, + 'ptype': properties.type.value, + 'jid': properties.jid.getBare(), + 'resource': properties.jid.getResource(), + 'id_': properties.id, + 'fjid': str(properties.jid), + 'timestamp': properties.timestamp, + 'avatar_sha': properties.avatar_sha, + 'user_nick': properties.nickname, + 'idle_time': properties.idle_timestamp, + 'show': show, + 'new_show': show, + 'old_show': 0, + 'status': properties.status, + 'contact_list': [], + 'contact': None, + 'need_add_in_roster': False, + } + + event_ = NetworkEvent('presence-received', **event_attrs) + + # TODO: Refactor + self._update_contact(event_, properties) + + app.nec.push_incoming_event(event_) + + raise nbxmpp.NodeProcessed + + def _update_contact(self, event, properties): + jid = properties.jid.getBare() + resource = properties.jid.getResource() + + status_strings = ['offline', 'error', 'online', 'chat', 'away', + 'xa', 'dnd', 'invisible'] + + event.new_show = status_strings.index(event.show) + + # Update contact + contact_list = app.contacts.get_contacts(self._account, jid) + if not contact_list: + log.warning('No contact found') return - log.info('Received from %s', stanza.getFrom()) - if nbxmpp.isErrorNode(stanza): - log.info('Error:\n%s', stanza) + event.contact_list = contact_list + + contact = app.contacts.get_contact_strict(self._account, + properties.jid.getBare(), + properties.jid.getResource()) + if contact is None: + contact = app.contacts.get_first_contact_from_jid(self._account, jid) + if contact is None: + log.warning('First contact not found') + return + + if self._is_resource_known(contact_list) and not app.jid_is_transport(jid): + # Another resource of an existing contact connected + # Add new contact + event.old_show = 0 + contact = app.contacts.copy_contact(contact) + contact.resource = resource + app.contacts.add_contact(self._account, contact) + else: + # Convert the inital roster contact to a contact with resource + contact.resource = resource + event.old_show = status_strings.index(contact.show) + + event.need_add_in_roster = True + + elif contact.show in status_strings: + event.old_show = status_strings.index(contact.show) + + # Update contact with presence data + contact.show = event.show + contact.status = properties.status + contact.priority = properties.priority + attached_keys = app.config.get_per('accounts', self._account, + 'attached_gpg_keys').split() + if jid in attached_keys: + contact.keyID = attached_keys[attached_keys.index(jid) + 1] + else: + # Do not override assigned key + contact.keyID = event.keyID + contact.idle_time = properties.idle_timestamp + + event.contact = contact + + if not app.jid_is_transport(jid) and len(contact_list) == 1: + # It's not an agent + if event.old_show == 0 and event.new_show > 1: + if not jid in app.newly_added[self._account]: + app.newly_added[self._account].append(jid) + if jid in app.to_be_removed[self._account]: + app.to_be_removed[self._account].remove(jid) + elif event.old_show > 1 and event.new_show == 0 and \ + self._con.connected > 1: + if not jid in app.to_be_removed[self._account]: + app.to_be_removed[self._account].append(jid) + if jid in app.newly_added[self._account]: + app.newly_added[self._account].remove(jid) + + if app.jid_is_transport(jid): + return - app.nec.push_incoming_event( - NetworkEvent('raw-pres-received', - conn=self._con, - stanza=stanza)) + if properties.type.is_unavailable: + # TODO: This causes problems when another + # resource signs off! + self._con.stop_all_active_file_transfers(contact) + self._log_presence(properties) + + @staticmethod + def _is_resource_known(contact_list): + if len(contact_list) > 1: + return True + + if contact_list[0].resource == '': + return False + return contact_list[0].show not in ('not in roster', 'offline') + + def _log_presence(self, properties): + if not app.config.get('log_contact_status_changes'): + return + if not app.config.should_log(self._account, properties.jid.getBare()): + return + + # TODO: Refactor + if properties.type.is_unavailable: + show = 'offline' + else: + show = properties.show.value + + app.logger.insert_into_logs(self._account, + properties.jid.getBare(), + time.time(), + KindConstant.STATUS, + message=properties.status, + show=show) + + def _subscribe_received(self, _con, _stanza, properties): + jid = properties.jid.getBare() + fjid = str(properties.jid) - def _subscribe_received(self, _con, stanza): - from_ = stanza.getFrom() - jid = from_.getStripped() - fjid = str(from_) - status = stanza.getStatus() is_transport = app.jid_is_transport(fjid) auto_auth = app.config.get_per('accounts', self._account, 'autoauth') - user_nick = parse_nickname(stanza) - log.info('Received Subscribe: %s, transport: %s, auto_auth: %s, ' - 'user_nick: %s', from_, is_transport, auto_auth, user_nick) + log.info('Received Subscribe: %s, transport: %s, ' + 'auto_auth: %s, user_nick: %s', + properties.jid, is_transport, auto_auth, properties.nickname) + if is_transport and fjid in self._con.agent_registrations: self._con.agent_registrations[fjid]['sub_received'] = True if not self._con.agent_registrations[fjid]['roster_push']: @@ -81,8 +265,8 @@ class Presence: if auto_auth or is_transport or jid in self.jids_for_auto_auth: self.send_presence(fjid, 'subscribed') - if not status: - status = _('I would like to add you to my roster.') + status = (properties.status or + _('I would like to add you to my roster.')) app.nec.push_incoming_event(NetworkEvent( 'subscribe-presence-received', @@ -90,16 +274,15 @@ class Presence: jid=jid, fjid=fjid, status=status, - user_nick=user_nick, + user_nick=properties.nickname, is_transport=is_transport)) raise nbxmpp.NodeProcessed - def _subscribed_received(self, _con, stanza): - from_ = stanza.getFrom() - jid = from_.getStripped() - resource = from_.getResource() - log.info('Received Subscribed: %s', from_) + def _subscribed_received(self, _con, _stanza, properties): + jid = properties.jid.getBare() + resource = properties.jid.getResource() + log.info('Received Subscribed: %s', properties.jid) if jid in self.automatically_added: self.automatically_added.remove(jid) raise nbxmpp.NodeProcessed @@ -110,17 +293,15 @@ class Presence: raise nbxmpp.NodeProcessed @staticmethod - def _unsubscribe_received(_con, stanza): - log.info('Received Unsubscribe: %s', stanza.getFrom()) + def _unsubscribe_received(_con, _stanza, properties): + log.info('Received Unsubscribe: %s', properties.jid) raise nbxmpp.NodeProcessed - def _unsubscribed_received(self, _con, stanza): - from_ = stanza.getFrom() - jid = from_.getStripped() - log.info('Received Unsubscribed: %s', from_) + def _unsubscribed_received(self, _con, _stanza, properties): + log.info('Received Unsubscribed: %s', properties.jid) app.nec.push_incoming_event(NetworkEvent( 'unsubscribed-presence-received', - conn=self._con, jid=jid)) + conn=self._con, jid=properties.jid.getBare())) raise nbxmpp.NodeProcessed def subscribed(self, jid): @@ -208,34 +389,5 @@ class Presence: self._con.connection.send(presence) -def parse_show(stanza): - show = stanza.getShow() - type_ = parse_type(stanza) - if show is None and type_ is None: - return 'online' - - if type_ == 'unavailable': - return 'offline' - - if show not in (None, 'chat', 'away', 'xa', 'dnd'): - log.warning('Invalid show element: %s', stanza) - if type_ is None: - return 'online' - return 'offline' - - if show is None: - return 'online' - return show - - -def parse_type(stanza): - type_ = stanza.getType() - if type_ not in (None, 'unavailable', 'error', 'subscribe', - 'subscribed', 'unsubscribe', 'unsubscribed'): - log.warning('Invalid type: %s', stanza) - return None - return type_ - - def get_instance(*args, **kwargs): return Presence(*args, **kwargs), 'Presence' ===================================== gajim/common/pep.py deleted ===================================== @@ -1,81 +0,0 @@ -# Copyright (C) 2007 Piotr Gaczkowski <doomhammerng AT gmail.com> -# Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# Jean-Marie Traissard <jim AT lapin.org> -# Jonathan Schleifer <js-common.gajim AT webkeks.org> -# Stephan Erb <steve-e AT h3c.de> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from typing import Any # pylint: disable=unused-import -from typing import List # pylint: disable=unused-import - -import logging - -from gajim.common import app - -log = logging.getLogger('gajim.c.pep') - -class AbstractPEP: - - type_ = '' - namespace = '' - - @classmethod - def get_tag_as_PEP(cls, jid, account, event_tag): - items = event_tag.getTag('items', {'node': cls.namespace}) - if items: - log.debug('Received PEP "user %s" from %s', cls.type_, jid) - return cls(jid, account, items) - return None - - def __init__(self, jid, account, items): - self.data, self._retracted = self._extract_info(items) - - self._update_contacts(jid, account) - if jid == app.get_jid_from_account(account): - self._update_account(account) - self._on_receive(jid, account) - - def _extract_info(self, items): - '''To be implemented by subclasses''' - raise NotImplementedError - - def _update_contacts(self, jid, account): - for contact in app.contacts.get_contacts(account, jid): - if self._retracted: - if self.type_ in contact.pep: - del contact.pep[self.type_] - else: - contact.pep[self.type_] = self - - def _update_account(self, account): - acc = app.connections[account] - if self._retracted: - if self.type_ in acc.pep: - del acc.pep[self.type_] - else: - acc.pep[self.type_] = self - - def as_markup_text(self): - '''SHOULD be implemented by subclasses''' - return '' - - def _on_receive(self, jid, account): - '''SHOULD be implemented by subclasses''' - pass - - -SUPPORTED_PERSONAL_USER_EVENTS = [] # type: List[Any] ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -152,7 +152,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _on_remove_service(self, jid): self.roster.delItem(jid) # 'NOTIFY' (account, (jid, status, status message, resource, priority, - # keyID, timestamp, contact_nickname)) + # keyID, timestamp)) app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( None, conn=self, fjid=jid, show='offline', status='')) ===================================== gajim/gui_interface.py ===================================== @@ -331,7 +331,7 @@ class Interface: def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, - # priority, # keyID, timestamp, contact_nickname)) + # priority, # keyID, timestamp)) # # Contact changed show account = obj.conn.name ===================================== gajim/remote_control.py ===================================== @@ -366,8 +366,7 @@ class GajimRemote(Server): else: return self.raise_signal(event, (obj.conn.name, [obj.jid, obj.show, - obj.status, obj.resource, obj.prio, obj.keyID, obj.timestamp, - obj.contact_nickname])) + obj.status, obj.resource, obj.prio, obj.keyID, obj.timestamp])) def on_subscribe_presence_received(self, obj): self.raise_signal('Subscribe', (obj.conn.name, [obj.jid, obj.status, ===================================== gajim/roster_window.py ===================================== @@ -720,14 +720,7 @@ class RosterWindow: return if jid == app.get_jid_from_account(account): - show_self_contact = app.config.get('show_self_contact') - if show_self_contact == 'never': - return - if (contact.resource != app.connections[account].server_resource \ - and show_self_contact == 'when_other_resource') or \ - show_self_contact == 'always': - return self._add_self_contact(account) - return + return self._add_self_contact(account) is_observer = contact.is_observer() if is_observer: @@ -1871,13 +1864,13 @@ class RosterWindow: 'contacts': {}} if account not in app.groups: app.groups[account] = {} - if app.config.get('show_self_contact') == 'always': - self_jid = app.get_jid_from_account(account) - if app.connections[account].server_resource: - self_jid += '/' + app.connections[account].server_resource - array[self_jid] = {'name': app.nicks[account], - 'groups': ['self_contact'], 'subscription': 'both', - 'ask': 'none'} + + self_jid = app.get_jid_from_account(account) + if app.connections[account].server_resource: + self_jid += '/' + app.connections[account].server_resource + array[self_jid] = {'name': app.nicks[account], + 'groups': ['self_contact'], 'subscription': 'both', + 'ask': 'none'} # .keys() is needed for jid in list(array.keys()): @@ -2212,10 +2205,7 @@ class RosterWindow: elif contact.jid == app.get_jid_from_account(account) and \ show in ('offline', 'error'): - if app.config.get('show_self_contact') != 'never': - # SelfContact went offline. Remove him when last pending - # message was read - self.remove_contact(contact.jid, account, backend=True) + self.remove_contact(contact.jid, account, backend=True) uf_show = helpers.get_uf_show(show) @@ -2249,13 +2239,12 @@ class RosterWindow: if account not in app.contacts.get_accounts(): return child_iterA = self._get_account_iter(account, self.model) - if app.config.get('show_self_contact') == 'always': - self_resource = app.connections[account].server_resource - self_contact = app.contacts.get_contact(account, - app.get_jid_from_account(account), resource=self_resource) - if self_contact: - status = app.connections[account].status - self.chg_contact_status(self_contact, show, status, account) + self_resource = app.connections[account].server_resource + self_contact = app.contacts.get_contact(account, + app.get_jid_from_account(account), resource=self_resource) + if self_contact: + status = app.connections[account].status + self.chg_contact_status(self_contact, show, status, account) self.set_account_status_icon(account) if show == 'offline': if self.quit_on_next_offline > -1: @@ -2570,8 +2559,7 @@ class RosterWindow: GLib.timeout_add_seconds(5, self.remove_to_be_removed, jid, account) - if obj.need_redraw: - self.draw_contact(jid, account) + self.draw_contact(jid, account) if app.jid_is_transport(jid) and jid in jid_list: # It must be an agent @@ -2579,7 +2567,7 @@ class RosterWindow: self.draw_contact(jid, account) self.draw_group(_('Transports'), account) - if obj.contact and obj.need_redraw: + if obj.contact: self.chg_contact_status(obj.contact, obj.show, obj.status, account) if obj.popup: @@ -2598,20 +2586,20 @@ class RosterWindow: self.fire_up_unread_messages_events(obj.conn.name) else: # add self contact - if app.config.get('show_self_contact') == 'always': - account = obj.conn.name - self_jid = app.get_jid_from_account(account) - if self_jid not in app.contacts.get_jid_list(account): - resource = '' - if app.connections[account].server_resource: - resource = app.connections[account].server_resource - sha = app.config.get_per('accounts', account, 'avatar_sha') - contact = app.contacts.create_contact( - jid=self_jid, account=account, name=app.nicks[account], - groups=['self_contact'], show='offline', sub='both', - ask='none', resource=resource, avatar_sha=sha) - app.contacts.add_contact(account, contact) - self.add_contact(self_jid, account) + account = obj.conn.name + self_jid = app.get_jid_from_account(account) + if self_jid not in app.contacts.get_jid_list(account): + resource = '' + if app.connections[account].server_resource: + resource = app.connections[account].server_resource + sha = app.config.get_per('accounts', account, 'avatar_sha') + contact = app.contacts.create_contact( + jid=self_jid, account=account, name=app.nicks[account], + groups=['self_contact'], show='offline', sub='both', + ask='none', resource=resource, avatar_sha=sha) + app.contacts.add_contact(account, contact) + self.add_contact(self_jid, account) + if app.config.get('remember_opened_chat_controls'): account = obj.conn.name controls = app.config.get_per( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a7aea4cac1fc0439ad5b1d56751d8d0df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a7aea4cac1fc0439ad5b1d56751d8d0df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Add some enum propertys
by Philipp Hörist 01 Jan '19

01 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ed7bdb6c by Philipp Hörist at 2019-01-01T15:22:49Z Add some enum propertys - - - - - ecc356ec by Philipp Hörist at 2019-01-01T15:43:19Z Add EntityCaps (XEP-0115) module - - - - - da5f7ab1 by Philipp Hörist at 2019-01-01T17:24:58Z Dont fail on unknown errors - - - - - 4 changed files: - nbxmpp/const.py - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/entity_caps.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -73,6 +73,30 @@ class PresenceType(Enum): def is_unavailable(self): return self == PresenceType.UNAVAILABLE + @property + def is_error(self): + return self == PresenceType.ERROR + + @property + def is_probe(self): + return self == PresenceType.PROBE + + @property + def is_unsubscribe(self): + return self == PresenceType.UNSUBSCRIBE + + @property + def is_unsubscribed(self): + return self == PresenceType.UNSUBSCRIBED + + @property + def is_subscribe(self): + return self == PresenceType.SUBSCRIBE + + @property + def is_subscribed(self): + return self == PresenceType.SUBSCRIBED + class PresenceShow(Enum): ONLINE = 'online' @@ -81,6 +105,26 @@ class PresenceShow(Enum): XA = 'xa' DND = 'dnd' + @property + def is_online(self): + return self == PresenceShow.ONLINE + + @property + def is_chat(self): + return self == PresenceShow.CHAT + + @property + def is_away(self): + return self == PresenceShow.AWAY + + @property + def is_xa(self): + return self == PresenceShow.XA + + @property + def is_dnd(self): + return self == PresenceShow.DND + class StatusCode(Enum): NON_ANONYMOUS = '100' @@ -191,3 +235,5 @@ class Error(Enum): SUBSCRIPTION_REQUIRED = 'subscription-required' UNDEFINED_CONDITION = 'undefined-condition' UNEXPECTED_REQUEST = 'unexpected-request' + POLICY_VIOLATION = 'policy-violation' + UNKNOWN_ERROR = 'unknown-error' ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -52,6 +52,7 @@ from nbxmpp.modules.idle import Idle from nbxmpp.modules.signed import Signed from nbxmpp.modules.vcard_avatar import VCardAvatar from nbxmpp.modules.captcha import Captcha +from nbxmpp.modules.entity_caps import EntityCaps from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.util import get_properties_struct @@ -171,6 +172,7 @@ class XMPPDispatcher(PlugIn): self._modules['Idle'] = Idle(self._owner) self._modules['Signed'] = Signed(self._owner) self._modules['VCardAvatar'] = VCardAvatar(self._owner) + self._modules['EntityCaps'] = EntityCaps(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/entity_caps.py ===================================== @@ -0,0 +1,48 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_CAPS +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import EntityCapsData + +log = logging.getLogger('nbxmpp.m.entity_caps') + + +class EntityCaps: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='presence', + callback=self._process_entity_caps, + ns=NS_CAPS, + priority=15), + ] + + @staticmethod + def _process_entity_caps(_con, stanza, properties): + caps = stanza.getTag('c', namespace=NS_CAPS) + if caps is None: + properties.entity_caps = EntityCapsData() + return + + properties.entity_caps = EntityCapsData( + hash=caps.getAttr('hash'), + node=caps.getAttr('node'), + ver=caps.getAttr('ver') + ) ===================================== nbxmpp/structs.py ===================================== @@ -47,6 +47,9 @@ MucUserData.__new__.__defaults__ = (None, None, None, None, None) MucDestroyed = namedtuple('MucDestroyed', 'alternate reason password') MucDestroyed.__new__.__defaults__ = (None, None, None) +EntityCapsData = namedtuple('EntityCapsData', 'hash node ver') +EntityCapsData.__new__.__defaults__ = (None, None, None) + class Properties: pass @@ -140,6 +143,7 @@ class PresenceProperties: self.muc_user = None self.muc_nickname = None self.muc_destroyed = None + self.entity_caps = None @property def is_self_presence(self): @@ -220,7 +224,10 @@ class ErrorProperties: def __init__(self, stanza): for child in stanza.getTag('error').getChildren(): if child.getNamespace() == NS_STANZAS: - self.type = Error(child.name) + try: + self.type = Error(child.name) + except ValueError: + self.type = Error('unknown-error') break self.legacy_code = stanza.getErrorCode() self.legacy_type = stanza.getErrorType() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/0ee912a2923d897c34f462a98… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/0ee912a2923d897c34f462a98… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Fix nickname parsing
by Philipp Hörist 01 Jan '19

01 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 55e4ec4f by Philipp Hörist at 2019-01-01T11:52:27Z Fix nickname parsing - - - - - ae343483 by Philipp Hörist at 2019-01-01T11:53:26Z Add str method to ErrorProperties - - - - - 0ee912a2 by Philipp Hörist at 2019-01-01T11:53:42Z Add property for self presence - - - - - 2 changed files: - nbxmpp/modules/nickname.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/nickname.py ===================================== @@ -53,7 +53,7 @@ class Nickname: @staticmethod def _parse_nickname(stanza): - nickname = stanza.getTagData('nick', namespace=NS_NICK) - if not nickname: + nickname = stanza.getTag('nick', namespace=NS_NICK) + if nickname is None: return - return nickname + return nickname.getData() or None ===================================== nbxmpp/structs.py ===================================== @@ -141,6 +141,10 @@ class PresenceProperties: self.muc_nickname = None self.muc_destroyed = None + @property + def is_self_presence(self): + return self.self_presence + @property def is_muc_destroyed(self): return self.muc_destroyed is not None @@ -222,6 +226,9 @@ class ErrorProperties: self.legacy_type = stanza.getErrorType() self.message = stanza.getErrorMsg() + def __str__(self): + return '%s %s' % (self.type, self.message) + class BaseResult: @property View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3959f58046e4f30b417e5bcb6… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3959f58046e4f30b417e5bcb6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise version to 1.1.91.1
by Philipp Hörist 31 Dec '18

31 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a7aea4ca by Philipp Hörist at 2018-12-31T01:03:31Z Raise version to 1.1.91.1 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.91" +__version__ = "1.1.91.1" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a7aea4cac1fc0439ad5b1d56751d8d0dfa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a7aea4cac1fc0439ad5b1d56751d8d0dfa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Rename some muc events
by Philipp Hörist 31 Dec '18

31 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d06b73d7 by Philipp Hörist at 2018-12-30T20:18:17Z Rename some muc events - - - - - 73f3e01b by Philipp Hörist at 2018-12-30T20:27:07Z Update actions after affiliation/role change - - - - - 735e72c9 by Philipp Hörist at 2018-12-31T00:58:03Z Plugins: Unregister StanzaHandler correctly - - - - - 5 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/plugins/pluginmanager.py - gajim/roster_window.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -330,7 +330,7 @@ class MUC: contact.status = properties.subject app.nec.push_incoming_event( - NetworkEvent('gc-subject-received', + NetworkEvent('muc-subject', account=self._account, jid=jid, subject=properties.subject, @@ -348,7 +348,7 @@ class MUC: return app.nec.push_incoming_event( - NetworkEvent('voice-approval', + NetworkEvent('muc-voice-approval', account=self._account, jid=jid, form=properties.voice_request.form)) @@ -367,7 +367,7 @@ class MUC: store_bob_data(properties.captcha.bob_data) app.nec.push_incoming_event( - NetworkEvent('captcha-challenge', + NetworkEvent('muc-captcha-challenge', account=self._account, jid=properties.jid, form=properties.captcha.form)) @@ -380,7 +380,7 @@ class MUC: log.info('Received config change: %s %s', properties.jid, properties.muc_status_codes) app.nec.push_incoming_event( - NetworkEvent('gc-config-changed-received', + NetworkEvent('muc-config-changed', account=self._account, jid=properties.jid, status_codes=properties.muc_status_codes)) @@ -396,7 +396,7 @@ class MUC: data.from_, data.reason) app.nec.push_incoming_event( - NetworkEvent('gc-decline-received', + NetworkEvent('muc-decline', account=self._account, **data._asdict())) raise nbxmpp.NodeProcessed @@ -414,7 +414,7 @@ class MUC: raise nbxmpp.NodeProcessed app.nec.push_incoming_event( - NetworkEvent('gc-invitation-received', + NetworkEvent('muc-invitation', account=self._account, **data._asdict())) raise nbxmpp.NodeProcessed @@ -444,7 +444,7 @@ class MUC: return app.nec.push_incoming_event(NetworkEvent( - 'muc-owner-received', + 'muc-config', conn=self._con, dataform=result.form, jid=result.jid)) ===================================== gajim/groupchat_control.py ===================================== @@ -321,20 +321,20 @@ class GroupchatControl(ChatControlBase): ('muc-user-affiliation-changed', ged.GUI1, self._on_affiliation_changed), ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), ('muc-user-role-changed', ged.GUI1, self._on_role_changed), - ('muc-destroyed', ged.GUI1, self._on_muc_destroyed), - ('muc-presence-error', ged.GUI1, self._on_muc_presence_error), + ('muc-destroyed', ged.GUI1, self._on_destroyed), + ('muc-presence-error', ged.GUI1, self._on_presence_error), + ('muc-config-changed', ged.GUI1, self._on_config_changed), + ('muc-subject', ged.GUI1, self._on_subject), + ('muc-captcha-challenge', ged.GUI1, self._on_captcha_challenge), + ('muc-voice-approval', ged.GUI1, self._on_voice_approval), ('gc-message-received', ged.GUI1, self._nec_gc_message_received), ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), ('vcard-published', ged.GUI1, self._nec_vcard_published), ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), ('update-room-avatar', ged.GUI1, self._nec_update_room_avatar), - ('gc-subject-received', ged.GUI1, self._nec_gc_subject_received), - ('gc-config-changed-received', ged.GUI1, self._nec_gc_config_changed_received), ('signed-in', ged.GUI1, self._nec_signed_in), ('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received), ('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent), - ('captcha-challenge', ged.GUI1, self._on_captcha_challenge), - ('voice-approval', ged.GUI1, self._on_voice_approval), ] for handler in self._event_handlers: @@ -1441,7 +1441,7 @@ class GroupchatControl(ChatControlBase): self.subject = subject self.draw_banner_text() - def _nec_gc_subject_received(self, event): + def _on_subject(self, event): if event.account != self.account: return if event.jid != self.room_jid: @@ -1467,7 +1467,7 @@ class GroupchatControl(ChatControlBase): else: self.subject_button.show() - def _nec_gc_config_changed_received(self, event): + def _on_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify if event.account != self.account: return @@ -1883,6 +1883,7 @@ class GroupchatControl(ChatControlBase): self.print_conversation(message, graphics=False) self.draw_contact(nick) + self.update_actions() def _on_role_changed(self, event): if event.account != self.account: @@ -1914,6 +1915,7 @@ class GroupchatControl(ChatControlBase): self.print_conversation(message, graphics=False) self.remove_contact(nick) self.add_contact_to_roster(nick) + self.update_actions() def _on_self_kicked(self, event): if event.account != self.account: @@ -2060,7 +2062,7 @@ class GroupchatControl(ChatControlBase): self.print_conversation(_('%s has joined the group chat') % nick, graphics=False) - def _on_muc_presence_error(self, event): + def _on_presence_error(self, event): if event.account != self.account: return if event.room_jid != self.room_jid: @@ -2158,7 +2160,7 @@ class GroupchatControl(ChatControlBase): if self.is_continued: self.draw_banner_text() - def _on_muc_destroyed(self, event): + def _on_destroyed(self, event): if event.account != self.account: return if event.room_jid != self.room_jid: ===================================== gajim/gui_interface.py ===================================== @@ -1392,8 +1392,8 @@ class Interface: 'connection-lost': [self.handle_event_connection_lost], 'file-request-error': [self.handle_event_file_request_error], 'file-request-received': [self.handle_event_file_request], - 'gc-invitation-received': [self.handle_event_gc_invitation], - 'gc-decline-received': [self.handle_event_gc_decline], + 'muc-invitation': [self.handle_event_gc_invitation], + 'muc-decline': [self.handle_event_gc_decline], 'gpg-password-required': [self.handle_event_gpg_password_required], 'gpg-trust-key': [self.handle_event_gpg_trust_key], 'http-auth-received': [self.handle_event_http_auth], @@ -1411,7 +1411,7 @@ class Interface: 'message-not-sent': [self.handle_event_msgnotsent], 'message-sent': [self.handle_event_msgsent], 'metacontacts-received': [self.handle_event_metacontacts], - 'muc-owner-received': [self.handle_event_gc_config], + 'muc-config': [self.handle_event_gc_config], 'our-show': [self.handle_event_status], 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -431,6 +431,8 @@ class PluginManager(metaclass=Singleton): # So just unregister the plugin handlers if con.handlers_registered: for handler in instance.handlers: + if len(handler) > 4: + handler = handler[:4] con.connection.UnregisterHandler(*handler) @log_calls('PluginManager') ===================================== gajim/roster_window.py ===================================== @@ -2677,7 +2677,7 @@ class RosterWindow: app.log('avatar').debug('Draw roster avatar: %s', obj.jid) self.draw_avatar(obj.jid, obj.account) - def _nec_gc_subject_received(self, event): + def _nec_muc_subject_received(self, event): self.draw_contact(event.jid, event.account) def _nec_metacontacts_received(self, obj): @@ -5861,8 +5861,8 @@ class RosterWindow: self._nec_update_avatar) app.ged.register_event_handler('update-room-avatar', ged.GUI1, self._nec_update_avatar) - app.ged.register_event_handler('gc-subject-received', ged.GUI1, - self._nec_gc_subject_received) + app.ged.register_event_handler('muc-subject', ged.GUI1, + self._nec_muc_subject_received) app.ged.register_event_handler('metacontacts-received', ged.GUI2, self._nec_metacontacts_received) app.ged.register_event_handler('signed-in', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e1c17d752ef5de552d22c1fac8853fa1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e1c17d752ef5de552d22c1fac8853fa1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix tests
by Philipp Hörist 30 Dec '18

30 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1c17d75 by Philipp Hörist at 2018-12-30T19:51:10Z Fix tests - - - - - 1 changed file: - test/no_gui/unit/test_contacts.py Changes: ===================================== test/no_gui/unit/test_contacts.py ===================================== @@ -12,7 +12,7 @@ class TestCommonContact(unittest.TestCase): def setUp(self): self.contact = CommonContact( - jid='', account="", resource='', show='', + jid='', account="", resource='', show='', presence=None, status='', name='', chatstate=None, client_caps=None) def test_default_client_supports(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e1c17d752ef5de552d22c1fac8853fa1f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e1c17d752ef5de552d22c1fac8853fa1f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove debug code
by Philipp Hörist 30 Dec '18

30 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d203d36f by Philipp Hörist at 2018-12-30T19:44:59Z Remove debug code - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== @@ -69,8 +69,6 @@ class CommonContact(XMPPEntity): @show.setter def show(self, value): - if isinstance(value, str) and isinstance(self, GC_Contact): - breakpoint() self._show = value @property @@ -218,7 +216,7 @@ class Contact(CommonContact): from gajim.common import app try: return app.gc_connected[self.account.name][self.jid] - except Exception as error: + except Exception: return False def is_transport(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d203d36f073809386ca35846100ddd47f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d203d36f073809386ca35846100ddd47f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Correctly parse delay in groupchats
by Philipp Hörist 30 Dec '18

30 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34306921 by Philipp Hörist at 2018-12-28T10:54:54Z Correctly parse delay in groupchats - - - - - 79684d90 by Philipp Hörist at 2018-12-28T12:38:15Z Simplify vcard avatar code - Use nbxmpp properties - - - - - 5a148f16 by Philipp Hörist at 2018-12-29T22:05:29Z Preferences: Connect two missing signals - - - - - ed4a81fe by Philipp Hörist at 2018-12-30T00:37:10Z Windows: Fix build Seems we cant set an install order for pip requirements, so install precis-18n alone - - - - - 0ad369dc by Philipp Hörist at 2018-12-30T19:06:59Z Refactor MUC Presence - Use nbxmpp properties - Split into multiple events - Add new options in the group chat menu for print settings - - - - - 22 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/caps_cache.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/modules/chatstates.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/vcard_avatars.py - gajim/data/gui/preferences_window.ui - gajim/groupchat_control.py - gajim/gtk/preferences.py - gajim/gtk/tooltips.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/message_window.py - gajim/privatechat_control.py - gajim/roster_window.py - gajim/vcard.py - win/_base.sh Changes: ===================================== gajim/chat_control.py ===================================== @@ -1182,12 +1182,8 @@ class ChatControl(ChatControlBase): return scale = self.parent_win.window.get_scale_factor() - if self.TYPE_ID == message_control.TYPE_CHAT: - surface = app.contacts.get_avatar( - self.account, self.contact.jid, AvatarSize.CHAT, scale) - else: - surface = app.interface.get_avatar( - self.gc_contact.avatar_sha, AvatarSize.CHAT, scale) + surface = app.contacts.get_avatar( + self.account, self.contact.jid, AvatarSize.CHAT, scale) image = self.xml.get_object('avatar_image') if surface is None: ===================================== gajim/chat_control_base.py ===================================== @@ -512,10 +512,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): super(ChatControlBase, self).shutdown() # PluginSystem: removing GUI extension points connected with ChatControlBase # instance object - app.plugin_manager.remove_gui_extension_point('chat_control_base', - self) + app.plugin_manager.remove_gui_extension_point('chat_control_base', self) app.plugin_manager.remove_gui_extension_point( 'chat_control_base_draw_banner', self) + app.plugin_manager.remove_gui_extension_point( + 'chat_control_base_update_toolbar', self) app.ged.remove_event_handler('our-show', ged.GUI1, self._nec_our_status) app.ged.remove_event_handler('sec-catalog-received', ged.GUI1, @@ -1049,8 +1050,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gc_contact.room_jid, self.account) self_contact = app.contacts.get_gc_contact(self.account, gc_control.room_jid, gc_control.nick) - if gc_control.is_anonymous and gc_contact.affiliation not in ['admin', - 'owner'] and self_contact.affiliation in ['admin', 'owner']: + if gc_control.is_anonymous and gc_contact.affiliation.value not in ['admin', + 'owner'] and self_contact.affiliation.value in ['admin', 'owner']: contact = app.contacts.get_contact(self.account, gc_contact.jid) if not contact or contact.sub not in ('both', 'to'): prim_text = _('Really send file?') ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -379,8 +379,8 @@ class StandardGroupChatCommands(CommandContainer): for nick in nicks: contact = get_contact(nick) - role = helpers.get_uf_role(contact.role) - affiliation = helpers.get_uf_affiliation(contact.affiliation) + role = helpers.get_uf_role(contact.role.value) + affiliation = helpers.get_uf_affiliation(contact.affiliation.value) self.echo("%s - %s - %s" % (nick, role, affiliation)) @command('ignore', raw=True) ===================================== gajim/common/caps_cache.py ===================================== @@ -35,6 +35,7 @@ import logging log = logging.getLogger('gajim.c.caps_cache') import nbxmpp +from nbxmpp.const import Affiliation 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_5) @@ -485,7 +486,7 @@ class MucCapsCache: def is_subject_change_allowed(self, jid, affiliation): allowed = True - if affiliation in ('owner', 'admin'): + if affiliation in (Affiliation.OWNER, Affiliation.ADMIN): return allowed if jid in self.cache: ===================================== gajim/common/config.py ===================================== @@ -235,7 +235,6 @@ class Config: 'show_location_in_roster': [opt_bool, True, '', True], 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes their status and/or their status message.')], - 'print_status_in_muc': [opt_str, 'none', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes their status and/or their status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'restored_messages_small': [opt_bool, True, _('If true, restored messages will use a smaller font than the default one.')], @@ -440,6 +439,8 @@ class Config: 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], 'muc_restore_timeout': [opt_int, -2, _('Minutes of backlog to request when entering a groupchat. -1 means no limit, -2 means global value')], 'notify_on_all_messages': [opt_bool, False, _('State whether a notification is created for every message in this room')], + 'print_status': [opt_bool, False, _('Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], + 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -209,8 +209,6 @@ PresenceHelperEvent): jid_list = app.contacts.get_jid_list(self.conn.name) self.timestamp = None self.get_id() - self.is_gc = False # is it a GC presence ? - sig_tag = None self.avatar_sha = None # XEP-0172 User Nickname self.user_nick = self.stanza.getTagData('nick') or '' @@ -225,13 +223,7 @@ PresenceHelperEvent): # XEP-0319 self.idle_time = parse_idle(self.stanza) - xtags = self.stanza.getTags('x') - for x in xtags: - namespace = x.getNamespace() - if namespace in (nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC): - self.is_gc = True - elif namespace == nbxmpp.NS_SIGNED: - sig_tag = x + sig_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_SIGNED) self.status = self.stanza.getStatus() or '' self._generate_show() @@ -241,13 +233,6 @@ PresenceHelperEvent): self.errcode = self.stanza.getErrorCode() self.errmsg = self.stanza.getErrorMsg() - if self.is_gc: - app.nec.push_incoming_event( - GcPresenceReceivedEvent( - None, conn=self.conn, stanza=self.stanza, - presence_obj=self)) - return - if self.ptype == 'error': return @@ -278,7 +263,6 @@ class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent): self.ptype = 'unavailable' else: self.ptype = None - self.is_gc = False self.user_nick = '' self.transport_auto_auth = False self.errcode = None @@ -286,86 +270,6 @@ class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent): self.popup = False # Do we want to open chat window ? return True -class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'gc-presence-received' - - def generate(self): - self.ptype = self.presence_obj.ptype - self.fjid = self.presence_obj.fjid - self.jid = self.presence_obj.jid - self.room_jid = self.presence_obj.jid - self.nick = self.presence_obj.resource - self.show = self.presence_obj.show - self.status = self.presence_obj.status - self.avatar_sha = self.presence_obj.avatar_sha - self.errcode = self.presence_obj.errcode - self.errmsg = self.presence_obj.errmsg - self.errcon = self.stanza.getError() - self.get_gc_control() - self.gc_contact = app.contacts.get_gc_contact(self.conn.name, - self.room_jid, self.nick) - - if self.ptype == 'error': - return True - - if self.ptype and self.ptype != 'unavailable': - return - if app.config.get('log_contact_status_changes') and \ - app.config.should_log(self.conn.name, self.room_jid): - if self.gc_contact: - jid = self.gc_contact.jid - else: - jid = self.stanza.getJid() - st = self.status - if jid: - # we know real jid, save it in db - st += ' (%s)' % jid - show = app.logger.convert_show_values_to_db_api_values(self.show) - if show is not None: - fjid = nbxmpp.JID(self.fjid) - app.logger.insert_into_logs(self.conn.name, - fjid.getStripped(), - time_time(), - KindConstant.GCSTATUS, - contact_name=fjid.getResource(), - message=st, - show=show) - - - # NOTE: if it's a gc presence, don't ask vcard here. - # We may ask it to real jid in gui part. - self.status_code = [] - ns_muc_user_x = self.stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if ns_muc_user_x: - destroy = ns_muc_user_x.getTag('destroy') - else: - destroy = None - if ns_muc_user_x and destroy: - # Room has been destroyed. see - # http://www.xmpp.org/extensions/xep-0045.html#destroyroom - self.reason = _('Room has been destroyed') - r = destroy.getTagData('reason') - if r: - self.reason += ' (%s)' % r - if destroy.getAttr('jid'): - try: - jid = helpers.parse_jid(destroy.getAttr('jid')) - self.reason += '\n' + \ - _('You can join this room instead: %s') % jid - except helpers.InvalidFormat: - pass - self.status_code = ['destroyed'] - else: - self.reason = self.stanza.getReason() - self.status_code = self.stanza.getStatusCode() - - self.role = self.stanza.getRole() - self.affiliation = self.stanza.getAffiliation() - self.real_jid = self.stanza.getJid() - self.actor = self.stanza.getActor() - self.new_nick = self.stanza.getNewNick() - return True - class OurShowEvent(nec.NetworkIncomingEvent): name = 'our-show' ===================================== gajim/common/contacts.py ===================================== @@ -46,12 +46,13 @@ class XMPPEntity: class CommonContact(XMPPEntity): - def __init__(self, jid, account, resource, show, status, name, + def __init__(self, jid, account, resource, show, presence, status, name, chatstate, client_caps=None): XMPPEntity.__init__(self, jid, account, resource) - self.show = show + self._show = show + self._presence = presence self.status = status self.name = name @@ -68,10 +69,22 @@ class CommonContact(XMPPEntity): @show.setter def show(self, value): - if not isinstance(value, str): - raise TypeError('show must be a string') + if isinstance(value, str) and isinstance(self, GC_Contact): + breakpoint() self._show = value + @property + def presence(self): + return self._presence + + @presence.setter + def presence(self, value): + self._presence = value + + @property + def is_available(self): + return self._presence.is_available + @property def chatstate_enum(self): return self._chatstate @@ -130,7 +143,8 @@ class Contact(CommonContact): if groups is None: groups = [] - CommonContact.__init__(self, jid, account, resource, show, status, name, + CommonContact.__init__(self, jid, account, resource, show, + None, status, name, chatstate, client_caps=client_caps) self.contact_name = '' # nick choosen by contact @@ -199,6 +213,14 @@ class Contact(CommonContact): def is_groupchat(self): return self._is_groupchat + @property + def is_connected(self): + from gajim.common import app + try: + return app.gc_connected[self.account.name][self.jid] + except Exception as error: + return False + def is_transport(self): # if not '@' or '@' starts the jid then contact is transport return self.jid.find('@') <= 0 @@ -209,11 +231,12 @@ class GC_Contact(CommonContact): Information concerning each groupchat contact """ - def __init__(self, room_jid, account, name='', show='', status='', role='', - affiliation='', jid='', resource='', chatstate=None, avatar_sha=None): + def __init__(self, room_jid, account, name='', show='', presence=None, + status='', role='', affiliation='', jid='', resource='', + chatstate=None, avatar_sha=None): - CommonContact.__init__(self, jid, account, resource, show, status, name, - chatstate) + CommonContact.__init__(self, jid, account, resource, show, + presence, status, name, chatstate) self.room_jid = room_jid self.role = role @@ -443,11 +466,12 @@ class LegacyContactsAPI: return getattr(self._metacontact_manager, attr_name) raise AttributeError(attr_name) - def create_gc_contact(self, room_jid, account, name='', show='', status='', - role='', affiliation='', jid='', resource='', avatar_sha=None): + def create_gc_contact(self, room_jid, account, name='', show='', + presence=None, status='', role='', + affiliation='', jid='', resource='', avatar_sha=None): account = self._accounts.get(account, account) # Use Account object if available - return GC_Contact(room_jid, account, name, show, status, role, affiliation, jid, - resource, avatar_sha=avatar_sha) + return GC_Contact(room_jid, account, name, show, presence, status, + role, affiliation, jid, resource, avatar_sha=avatar_sha) def add_gc_contact(self, account, gc_contact): return self._accounts[account].gc_contacts.add_gc_contact(gc_contact) @@ -464,6 +488,9 @@ class LegacyContactsAPI: def get_nick_list(self, account, room_jid): return self._accounts[account].gc_contacts.get_nick_list(room_jid) + def get_gc_contact_list(self, account, room_jid): + return self._accounts[account].gc_contacts.get_gc_contact_list(room_jid) + def get_gc_contact(self, account, room_jid, nick): return self._accounts[account].gc_contacts.get_gc_contact(room_jid, nick) @@ -682,6 +709,12 @@ class GC_Contacts(): return [] return list(self._rooms[room_jid].keys()) + def get_gc_contact_list(self, room_jid): + try: + return list(self._rooms[room_jid].values()) + except Exception: + return [] + def get_gc_contact(self, room_jid, nick): try: return self._rooms[room_jid][nick] ===================================== gajim/common/modules/chatstates.py ===================================== @@ -220,8 +220,9 @@ class Chatstate: 'chatstate': str(State.ACTIVE)} if contact.is_groupchat(): - app.nec.push_outgoing_event( - GcMessageOutgoingEvent(None, **event_attrs)) + if contact.is_connected: + app.nec.push_outgoing_event( + GcMessageOutgoingEvent(None, **event_attrs)) else: app.nec.push_outgoing_event( MessageOutgoingEvent(None, **event_attrs)) @@ -265,8 +266,9 @@ class Chatstate: 'chatstate': str(state)} if contact.is_groupchat(): - app.nec.push_outgoing_event( - GcMessageOutgoingEvent(None, **event_attrs)) + if contact.is_connected: + app.nec.push_outgoing_event( + GcMessageOutgoingEvent(None, **event_attrs)) else: app.nec.push_outgoing_event( MessageOutgoingEvent(None, **event_attrs)) ===================================== gajim/common/modules/message.py ===================================== @@ -213,7 +213,10 @@ class Message: groupchat = event.mtype == 'groupchat' # Determine timestamps - delay_jid = self._con.get_own_jid().getDomain() + if groupchat: + delay_jid = event.jid + else: + delay_jid = self._con.get_own_jid().getDomain() timestamp = parse_delay(event.stanza, from_=delay_jid) if timestamp is None: timestamp = time.time() ===================================== gajim/common/modules/muc.py ===================================== @@ -20,11 +20,14 @@ import logging import nbxmpp from nbxmpp.const import InviteType +from nbxmpp.const import PresenceType from nbxmpp.structs import StanzaHandler from gajim.common import i18n from gajim.common import app from gajim.common import helpers +from gajim.common.const import KindConstant +from gajim.common.helpers import AdditionalDataDict from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data @@ -38,6 +41,14 @@ class MUC: self._account = con.name self.handlers = [ + StanzaHandler(name='presence', + callback=self._on_muc_user_presence, + ns=nbxmpp.NS_MUC_USER, + priority=49), + StanzaHandler(name='presence', + callback=self._on_muc_presence, + ns=nbxmpp.NS_MUC, + priority=49), StanzaHandler(name='message', callback=self._on_subject_change, typ='groupchat', @@ -79,13 +90,14 @@ class MUC: ] def __getattr__(self, key): - if key in self._nbmxpp_methods: - if not app.account_is_connected(self._account): - log.warning('Account %s not connected, cant use %s', - self._account, key) - return - module = self._con.connection.get_module('MUC') - return getattr(module, key) + if key not in self._nbmxpp_methods: + raise AttributeError + if not app.account_is_connected(self._account): + log.warning('Account %s not connected, cant use %s', + self._account, key) + return + module = self._con.connection.get_module('MUC') + return getattr(module, key) def pass_disco(self, from_, identities, features, _data, _node): for identity in identities: @@ -149,6 +161,163 @@ class MUC: if tags: muc_x.setTag('history', tags) + def _on_muc_presence(self, _con, _stanza, properties): + if properties.type == PresenceType.ERROR: + self._raise_muc_event('muc-presence-error', properties) + raise nbxmpp.NodeProcessed + + def _on_muc_user_presence(self, _con, _stanza, properties): + if properties.type == PresenceType.ERROR: + return + + if properties.is_muc_destroyed: + for contact in app.contacts.get_gc_contact_list( + self._account, properties.jid.getBare()): + contact.presence = PresenceType.UNAVAILABLE + log.info('MUC destroyed: %s', properties.jid.getBare()) + self._raise_muc_event('muc-destroyed', properties) + raise nbxmpp.NodeProcessed + + contact = app.contacts.get_gc_contact(self._account, + properties.jid.getBare(), + properties.muc_nickname) + + if properties.is_nickname_changed: + app.contacts.remove_gc_contact(self._account, contact) + contact.name = properties.muc_user.nick + app.contacts.add_gc_contact(self._account, contact) + log.info('Nickname changed: %s to %s', + properties.jid, + properties.muc_user.nick) + self._raise_muc_event('muc-nickname-changed', properties) + raise nbxmpp.NodeProcessed + + if contact is None and properties.type.is_available: + self._add_new_muc_contact(properties) + if properties.is_muc_self_presence: + log.info('Self presence: %s', properties.jid) + self._raise_muc_event('muc-self-presence', properties) + else: + log.info('User joined: %s', properties.jid) + self._raise_muc_event('muc-user-joined', properties) + raise nbxmpp.NodeProcessed + + if properties.is_muc_self_presence and properties.is_kicked: + self._raise_muc_event('muc-self-kicked', properties) + raise nbxmpp.NodeProcessed + + if properties.is_muc_self_presence and properties.type.is_unavailable: + # Its not a kick, so this is the reflection of our own + # unavailable presence, because we left the MUC + raise nbxmpp.NodeProcessed + + if properties.type.is_unavailable: + for _event in app.events.get_events(self._account, + jid=str(properties.jid), + types=['pm']): + contact.show = properties.show + contact.presence = properties.type + contact.status = properties.status + contact.affiliation = properties.affiliation + app.interface.handle_event(self._account, + str(properties.jid), + 'pm') + # Handle only the first pm event, the rest will be + # handled by the opened ChatControl + break + + # We remove the contact from the MUC, but there could be + # a PrivateChatControl open, so we update the contacts presence + contact.presence = properties.type + app.contacts.remove_gc_contact(self._account, contact) + log.info('User %s left', properties.jid) + self._raise_muc_event('muc-user-left', properties) + raise nbxmpp.NodeProcessed + + if contact.affiliation != properties.affiliation: + contact.affiliation = properties.affiliation + log.info('Affiliation changed: %s %s', + properties.jid, + properties.affiliation) + self._raise_muc_event('muc-user-affiliation-changed', properties) + + if contact.role != properties.role: + contact.role = properties.role + log.info('Role changed: %s %s', + properties.jid, + properties.role) + self._raise_muc_event('muc-user-role-changed', properties) + + if (contact.status != properties.status or + contact.show != properties.show): + contact.status = properties.status + contact.show = properties.show + log.info('Show/Status changed: %s %s %s', + properties.jid, + properties.status, + properties.show) + self._raise_muc_event('muc-user-status-show-changed', properties) + + raise nbxmpp.NodeProcessed + + def _raise_muc_event(self, event_name, properties): + app.nec.push_incoming_event( + NetworkEvent(event_name, + account=self._account, + room_jid=properties.jid.getBare(), + properties=properties)) + self._log_muc_event(event_name, properties) + + def _log_muc_event(self, event_name, properties): + if event_name not in ['muc-user-joined', + 'muc-user-left', + 'muc-user-status-show-changed']: + return + + if (not app.config.get('log_contact_status_changes') or + not app.config.should_log(self._account, properties.jid)): + return + + additional_data = AdditionalDataDict() + if properties.muc_user is not None: + if properties.muc_user.jid is not None: + additional_data.set_value( + 'gajim', 'real_jid', str(properties.muc_user.jid)) + + # TODO: Refactor + if properties.type == PresenceType.UNAVAILABLE: + show = 'offline' + else: + show = properties.show.value + show = app.logger.convert_show_values_to_db_api_values(show) + + app.logger.insert_into_logs( + self._account, + properties.jid.getBare(), + properties.timestamp, + KindConstant.GCSTATUS, + contact_name=properties.muc_nickname, + message=properties.status or None, + show=show, + additional_data=additional_data) + + def _add_new_muc_contact(self, properties): + real_jid = None + if properties.muc_user.jid is not None: + real_jid = str(properties.muc_user.jid) + contact = app.contacts.create_gc_contact( + room_jid=properties.jid.getBare(), + account=self._account, + name=properties.muc_nickname, + show=properties.show, + status=properties.status, + presence=properties.type, + role=properties.role, + affiliation=properties.affiliation, + jid=real_jid, + avatar_sha=properties.avatar_sha) + app.contacts.add_gc_contact(self._account, contact) + def _on_subject_change(self, _con, _stanza, properties): if not properties.is_muc_subject: return ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -19,6 +19,8 @@ import logging from pathlib import Path import nbxmpp +from nbxmpp.structs import StanzaHandler +from nbxmpp.const import AvatarState from gajim.common import app from gajim.common import helpers @@ -35,7 +37,10 @@ class VCardAvatars: self._requested_shas = [] self.handlers = [ - ('presence', self._presence_received, '', nbxmpp.NS_VCARD_UPDATE), + StanzaHandler(name='presence', + callback=self._presence_received, + ns=nbxmpp.NS_VCARD_UPDATE, + priority=51), ] self.avatar_advertised = False @@ -50,66 +55,53 @@ class VCardAvatars: log.info('Missing own avatar, reset sha') app.config.set_per('accounts', self._account, 'avatar_sha', '') - def _presence_received(self, _con, stanza): - if stanza.getType() in ('unavailable', 'error'): + def _presence_received(self, _con, _stanza, properties): + if properties.avatar_state in (AvatarState.IGNORE, + AvatarState.NOT_READY): return - jid = stanza.getFrom() - - update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) - if update is None: - return - - avatar_sha = update.getTagData('photo') - if avatar_sha is None: - log.info('%s is not ready to promote an avatar', jid) - # Empty update element, ignore - return - - if self._con.get_own_jid().bareMatch(jid): - if self._con.get_own_jid() == jid: + if self._con.get_own_jid().bareMatch(properties.jid): + if self._con.get_own_jid() == properties.jid: # Initial presence reflection if self._con.avatar_conversion: # XEP-0398: Tells us the current avatar sha on the # inital presence reflection - self._self_update_received(jid, avatar_sha) + self._self_update_received(properties) else: # Presence from another resource of ours - self._self_update_received(jid, avatar_sha) + self._self_update_received(properties) return - # Check if presence is from a MUC service - contact = app.contacts.get_groupchat_contact(self._account, str(jid)) - if contact is not None: - self._update_received(jid, avatar_sha, room=True) - elif stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER): - show = stanza.getShow() - type_ = stanza.getType() - self._gc_update_received(jid, avatar_sha, show, type_) + if properties.from_muc: + self._gc_update_received(properties) else: - self._update_received(jid, avatar_sha) - - def _self_update_received(self, jid, avatar_sha): - jid = jid.getStripped() - full_jid = jid - if avatar_sha == '': + # Check if presence is from a MUC service + contact = app.contacts.get_groupchat_contact(self._account, + str(properties.jid)) + self._update_received(properties, room=contact is not None) + + def _self_update_received(self, properties): + jid = properties.jid.getBare() + if properties.avatar_state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised - log.info('%s has no avatar published', full_jid) + log.info('%s has no avatar published', properties.jid) app.config.set_per('accounts', self._account, 'avatar_sha', '') app.contacts.set_avatar(self._account, jid, None) app.interface.update_avatar(self._account, jid) return - log.info('Update: %s %s', jid, avatar_sha) + log.info('Update: %s %s', jid, properties.avatar_sha) current_sha = app.config.get_per( 'accounts', self._account, 'avatar_sha') - if avatar_sha != current_sha: - path = Path(configpaths.get('AVATAR')) / avatar_sha + if properties.avatar_sha != current_sha: + path = Path(configpaths.get('AVATAR')) / properties.avatar_sha if path.exists(): - app.config.set_per( - 'accounts', self._account, 'avatar_sha', avatar_sha) - app.contacts.set_avatar(self._account, jid, avatar_sha) + app.config.set_per('accounts', self._account, + 'avatar_sha', properties.avatar_sha) + app.contacts.set_avatar(self._account, + jid, + properties.avatar_sha) app.interface.update_avatar(self._account, jid) else: log.info('Request : %s', jid) @@ -117,14 +109,13 @@ class VCardAvatars: RequestAvatar.SELF) else: log.info('Avatar already known: %s %s', - jid, avatar_sha) + jid, properties.avatar_sha) - def _update_received(self, jid, avatar_sha, room=False): - jid = jid.getStripped() - full_jid = jid - if avatar_sha == '': + def _update_received(self, properties, room=False): + jid = properties.jid.getBare() + if properties.avatar_state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised - log.info('%s has no avatar published', full_jid) + log.info('%s has no avatar published', properties.jid) # Remove avatar log.debug('Remove: %s', jid) @@ -135,65 +126,67 @@ class VCardAvatars: app.interface.update_avatar( self._account, jid, room_avatar=room) else: - log.info('Update: %s %s', full_jid, avatar_sha) + log.info('Update: %s %s', properties.jid, properties.avatar_sha) current_sha = app.contacts.get_avatar_sha(self._account, jid) - if avatar_sha == current_sha: - log.info('Avatar already known: %s %s', jid, avatar_sha) + if properties.avatar_sha == current_sha: + log.info('Avatar already known: %s %s', + jid, properties.avatar_sha) return if room: # We dont save the room avatar hash in our DB, so check # if we previously downloaded it - if app.interface.avatar_exists(avatar_sha): - app.contacts.set_avatar(self._account, jid, avatar_sha) + if app.interface.avatar_exists(properties.avatar_sha): + app.contacts.set_avatar(self._account, + jid, + properties.avatar_sha) app.interface.update_avatar( self._account, jid, room_avatar=room) return - if avatar_sha not in self._requested_shas: - self._requested_shas.append(avatar_sha) + if properties.avatar_sha not in self._requested_shas: + self._requested_shas.append(properties.avatar_sha) if room: self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.ROOM, jid, sha=avatar_sha) + RequestAvatar.ROOM, jid, sha=properties.avatar_sha) else: self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.USER, jid, sha=avatar_sha) - - def _gc_update_received(self, jid, avatar_sha, show, type_): - if show == 'offline' or type_ == 'unavailable': - return + RequestAvatar.USER, jid, sha=properties.avatar_sha) - nick = jid.getResource() + def _gc_update_received(self, properties): + nick = properties.jid.getResource() gc_contact = app.contacts.get_gc_contact( - self._account, jid.getStripped(), nick) + self._account, properties.jid.getBare(), nick) if gc_contact is None: log.error('no gc contact found: %s', nick) return - if avatar_sha == '': + if properties.avatar_state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised, remove avatar log.info('%s has no avatar published', nick) log.debug('Remove: %s', nick) gc_contact.avatar_sha = None app.interface.update_avatar(contact=gc_contact) else: - log.info('Update: %s %s', nick, avatar_sha) - path = os.path.join(configpaths.get('AVATAR'), avatar_sha) + log.info('Update: %s %s', nick, properties.avatar_sha) + path = os.path.join(configpaths.get('AVATAR'), + properties.avatar_sha) if not os.path.isfile(path): - if avatar_sha not in self._requested_shas: + if properties.avatar_sha not in self._requested_shas: app.log('avatar').info('Request: %s', nick) - self._requested_shas.append(avatar_sha) + self._requested_shas.append(properties.avatar_sha) self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.USER, str(jid), - room=True, sha=avatar_sha) + RequestAvatar.USER, str(properties.jid), + room=True, sha=properties.avatar_sha) return - if gc_contact.avatar_sha != avatar_sha: - log.info('%s changed their Avatar: %s', nick, avatar_sha) - gc_contact.avatar_sha = avatar_sha + if gc_contact.avatar_sha != properties.avatar_sha: + log.info('%s changed their Avatar: %s', + nick, properties.avatar_sha) + gc_contact.avatar_sha = properties.avatar_sha app.interface.update_avatar(contact=gc_contact) else: log.info('Avatar already known: %s', nick) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -524,6 +524,7 @@ <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -540,6 +541,7 @@ <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">True</property> @@ -700,42 +702,10 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">These status messages are displayed when a room occupant changes status (this includes entering/leaving the room)</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Displa_y status messages in group chats</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">print_status_in_muc_combobox</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> <child> - <object class="GtkComboBox" id="print_status_in_muc_combobox"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="model">print_status_in_muc_liststore</property> - <signal name="changed" handler="print_status_in_muc_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/groupchat_control.py ===================================== @@ -34,6 +34,10 @@ from enum import IntEnum, unique import nbxmpp from nbxmpp.const import StatusCode +from nbxmpp.const import Affiliation +from nbxmpp.const import Role +from nbxmpp.const import Error +from nbxmpp.const import PresenceType from gi.repository import Gtk from gi.repository import Gdk @@ -54,7 +58,6 @@ from gajim.common import helpers from gajim.common.helpers import launch_browser_mailer from gajim.common.helpers import AdditionalDataDict from gajim.common import ged -from gajim.common import i18n from gajim.common.i18n import _ from gajim.common import contacts from gajim.common.const import StyleAttr @@ -309,32 +312,34 @@ class GroupchatControl(ChatControlBase): settings_menu = self.xml.get_object('settings_menu') settings_menu.set_menu_model(self.control_menu) - app.ged.register_event_handler('gc-presence-received', ged.GUI1, - self._nec_gc_presence_received) - app.ged.register_event_handler('gc-message-received', ged.GUI1, - self._nec_gc_message_received) - app.ged.register_event_handler('mam-decrypted-message-received', - ged.GUI1, self._nec_mam_decrypted_message_received) - app.ged.register_event_handler('vcard-published', ged.GUI1, - self._nec_vcard_published) - app.ged.register_event_handler('update-gc-avatar', ged.GUI1, - self._nec_update_avatar) - app.ged.register_event_handler('update-room-avatar', ged.GUI1, - self._nec_update_room_avatar) - app.ged.register_event_handler('gc-subject-received', ged.GUI1, - self._nec_gc_subject_received) - app.ged.register_event_handler('gc-config-changed-received', ged.GUI1, - self._nec_gc_config_changed_received) - app.ged.register_event_handler('signed-in', ged.GUI1, - self._nec_signed_in) - app.ged.register_event_handler('decrypted-message-received', ged.GUI2, - self._nec_decrypted_message_received) - app.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, - self._message_sent) - app.ged.register_event_handler('captcha-challenge', ged.GUI1, - self._on_captcha_challenge) - app.ged.register_event_handler('voice-approval', ged.GUI1, - self._on_voice_approval) + self._event_handlers = [ + ('muc-user-joined', ged.GUI1, self._on_user_joined), + ('muc-user-left', ged.GUI1, self._on_user_left), + ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), + ('muc-self-presence', ged.GUI1, self._on_self_presence), + ('muc-self-kicked', ged.GUI1, self._on_self_kicked), + ('muc-user-affiliation-changed', ged.GUI1, self._on_affiliation_changed), + ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), + ('muc-user-role-changed', ged.GUI1, self._on_role_changed), + ('muc-destroyed', ged.GUI1, self._on_muc_destroyed), + ('muc-presence-error', ged.GUI1, self._on_muc_presence_error), + ('gc-message-received', ged.GUI1, self._nec_gc_message_received), + ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), + ('vcard-published', ged.GUI1, self._nec_vcard_published), + ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), + ('update-room-avatar', ged.GUI1, self._nec_update_room_avatar), + ('gc-subject-received', ged.GUI1, self._nec_gc_subject_received), + ('gc-config-changed-received', ged.GUI1, self._nec_gc_config_changed_received), + ('signed-in', ged.GUI1, self._nec_signed_in), + ('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received), + ('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent), + ('captcha-challenge', ged.GUI1, self._on_captcha_challenge), + ('voice-approval', ged.GUI1, self._on_voice_approval), + ] + + for handler in self._event_handlers: + app.ged.register_event_handler(*handler) + self.is_connected = False # disable win, we are not connected yet ChatControlBase.got_disconnected(self) @@ -392,6 +397,22 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_notify_on_all_messages) self.parent_win.window.add_action(act) + value = app.config.get_per('rooms', self.contact.jid, 'print_status') + + act = Gio.SimpleAction.new_stateful( + 'print-status-' + self.control_id, + None, GLib.Variant.new_boolean(value)) + act.connect('change-state', self._on_print_status) + self.parent_win.window.add_action(act) + + value = app.config.get_per('rooms', self.contact.jid, 'print_join_left') + + act = Gio.SimpleAction.new_stateful( + 'print-join-left-' + self.control_id, + None, GLib.Variant.new_boolean(value)) + act.connect('change-state', self._on_print_join_left) + self.parent_win.window.add_action(act) + archive_info = app.logger.get_archive_infos(self.contact.jid) threshold = helpers.get_sync_threshold(self.contact.jid, archive_info) @@ -413,11 +434,12 @@ class GroupchatControl(ChatControlBase): # Destroy Room win.lookup_action('destroy-' + self.control_id).set_enabled( - self.is_connected and contact.affiliation == 'owner') + self.is_connected and contact.affiliation.is_owner) # Configure Room win.lookup_action('configure-' + self.control_id).set_enabled( - self.is_connected and contact.affiliation in ('admin', 'owner')) + self.is_connected and contact.affiliation in (Affiliation.ADMIN, + Affiliation.OWNER)) # Bookmarks con = app.connections[self.account] @@ -428,7 +450,7 @@ class GroupchatControl(ChatControlBase): # Request Voice role = self.get_role(self.nick) win.lookup_action('request-voice-' + self.control_id).set_enabled( - self.is_connected and role == 'visitor') + self.is_connected and role.is_visitor) # Change Subject subject = False @@ -463,7 +485,7 @@ class GroupchatControl(ChatControlBase): # Upload Avatar vcard_support = muc_caps_cache.supports(self.room_jid, nbxmpp.NS_VCARD) win.lookup_action('upload-avatar-' + self.control_id).set_enabled( - self.is_connected and vcard_support and contact.affiliation == 'owner') + self.is_connected and vcard_support and contact.affiliation.is_owner) # Sync Threshold has_mam = muc_caps_cache.has_mam(self.room_jid) @@ -609,10 +631,10 @@ class GroupchatControl(ChatControlBase): def _on_configure_room(self, _action, _param): contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) - if contact.affiliation == 'owner': + if contact.affiliation.is_owner: con = app.connections[self.account] con.get_module('MUC').request_config(self.room_jid) - elif contact.affiliation == 'admin': + elif contact.affiliation.is_admin: win = app.get_app_window( 'GroupchatConfig', self.account, self.room_jid) if win is not None: @@ -620,7 +642,17 @@ class GroupchatControl(ChatControlBase): else: GroupchatConfig(self.account, self.room_jid, - contact.affiliation) + contact.affiliation.value) + + def _on_print_join_left(self, action, param): + action.set_state(param) + app.config.set_per('rooms', self.contact.jid, + 'print_join_left', param.get_boolean()) + + def _on_print_status(self, action, param): + action.set_state(param) + app.config.set_per('rooms', self.contact.jid, + 'print_status', param.get_boolean()) def _on_bookmark_room(self, action, param): """ @@ -791,10 +823,9 @@ class GroupchatControl(ChatControlBase): return 0 if type1 == 'contact' and type2 == 'contact' and \ app.config.get('sort_by_show_in_muc'): - cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4, - 'invisible': 5, 'offline': 6, 'error': 7} - show1 = cshow[gc_contact1.show] - show2 = cshow[gc_contact2.show] + cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4} + show1 = cshow[gc_contact1.show.value] + show2 = cshow[gc_contact2.show.value] if show1 < show2: return -1 if show1 > show2: @@ -1521,6 +1552,21 @@ class GroupchatControl(ChatControlBase): def is_connected(self, value: bool) -> None: app.gc_connected[self.account][self.room_jid] = value + def _disable_roster_sort(self): + self.model.set_sort_column_id(Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, + Gtk.SortType.ASCENDING) + self.list_treeview.set_model(None) + + def _enable_roster_sort(self): + self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) + self.list_treeview.set_model(self.model) + self.list_treeview.expand_all() + + def _reset_roster(self): + self._contact_refs = {} + self._role_refs = {} + self.model.clear() + def got_connected(self): self.join_time = time.time() # Make autorejoin stop. @@ -1534,14 +1580,12 @@ class GroupchatControl(ChatControlBase): con.get_module('MAM').request_archive_on_muc_join( self.room_jid) - self.is_connected = True ChatControlBase.got_connected(self) # Sort model and assign it to treeview - self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) - self.list_treeview.set_model(self.model) - self.list_treeview.expand_all() + self._enable_roster_sort() + # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() if self.parent_win: @@ -1556,30 +1600,27 @@ class GroupchatControl(ChatControlBase): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) - self.model.set_sort_column_id(Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, - Gtk.SortType.ASCENDING) - self.list_treeview.set_model(None) - self._contact_refs = {} - self._role_refs = {} - self.model.clear() - nick_list = app.contacts.get_nick_list(self.account, self.room_jid) - for nick in nick_list: - # Update pm chat window - fjid = self.room_jid + '/' + nick - gc_contact = app.contacts.get_gc_contact(self.account, - self.room_jid, nick) + self._reset_roster() + self._disable_roster_sort() - ctrl = app.interface.msg_win_mgr.get_control(fjid, self.account) + for contact in app.contacts.get_gc_contact_list( + self.account, self.room_jid): + contact.presence = PresenceType.UNAVAILABLE + ctrl = app.interface.msg_win_mgr.get_control(contact.get_full_jid, + self.account) if ctrl: - gc_contact.show = 'offline' - gc_contact.status = '' - ctrl.update_ui() - if ctrl.parent_win: - ctrl.parent_win.redraw_tab(ctrl) + ctrl.got_disconnected() + + app.contacts.remove_gc_contact(self.account, contact) - app.contacts.remove_gc_contact(self.account, gc_contact) self.is_connected = False ChatControlBase.got_disconnected(self) + + contact = app.contacts.get_groupchat_contact(self.account, + self.room_jid) + if contact is not None: + app.interface.roster.draw_contact(self.room_jid, self.account) + # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() if self.parent_win: @@ -1604,12 +1645,13 @@ class GroupchatControl(ChatControlBase): return True def draw_roster(self): - self.model.clear() + self._reset_roster() + self._disable_roster_sort() + for nick in app.contacts.get_nick_list(self.account, self.room_jid): - gc_contact = app.contacts.get_gc_contact(self.account, - self.room_jid, nick) - self.add_contact_to_roster(nick, gc_contact.show, gc_contact.role, - gc_contact.affiliation, gc_contact.status, gc_contact.jid) + self.add_contact_to_roster(nick) + + self._enable_roster_sort() self.draw_all_roles() # Recalculate column width for ellipsizin self.list_treeview.columns_autosize() @@ -1631,13 +1673,14 @@ class GroupchatControl(ChatControlBase): iter_ = self.get_contact_iter(nick) if not iter_: return + gc_contact = app.contacts.get_gc_contact( self.account, self.room_jid, nick) if app.events.get_events(self.account, self.room_jid + '/' + nick): icon_name = get_icon_name('event') else: - icon_name = get_icon_name(gc_contact.show) + icon_name = get_icon_name(gc_contact.show.value) name = GLib.markup_escape_text(gc_contact.name) @@ -1656,9 +1699,9 @@ class GroupchatControl(ChatControlBase): name += ('\n' '{}'.format(GLib.markup_escape_text(status))) - if (gc_contact.affiliation != 'none' and + if (not gc_contact.affiliation.is_none and app.config.get('show_affiliation_in_groupchat')): - icon_name += ':%s' % gc_contact.affiliation + icon_name += ':%s' % gc_contact.affiliation.value self.model[iter_][Column.IMG] = icon_name self.model[iter_][Column.TEXT] = name @@ -1694,338 +1737,449 @@ class GroupchatControl(ChatControlBase): self.nick = new_nick self._nick_completion.change_nick(new_nick) - def _nec_gc_presence_received(self, obj): - if obj.room_jid != self.room_jid or obj.conn.name != self.account: + def _on_self_presence(self, event): + if event.account != self.account: return - if obj.ptype == 'error': + if event.room_jid != self.room_jid: return - role = obj.role - if not role: - role = 'visitor' + nick = event.properties.muc_nickname + affiliation = event.properties.affiliation + jid = str(event.properties.jid) + status_codes = event.properties.muc_status_codes or [] - affiliation = obj.affiliation - if not affiliation: - affiliation = 'none' + if not self.is_connected: + # We just joined the room + self.print_conversation(_('You (%s) joined the room') % nick, + 'info', graphics=False) + self.add_contact_to_roster(nick) + self.got_connected() - newly_created = False - nick = i18n.direction_mark + obj.nick - nick_jid = nick + i18n.direction_mark + if self.room_jid in app.automatic_rooms[self.account] and \ + app.automatic_rooms[self.account][self.room_jid]['invities']: + if self.room_jid not in app.interface.instances[self.account]['gc_config']: + con = app.connections[self.account] + if affiliation.is_owner: + # We need to configure the room if it's a new one. + # We cannot know it's a new one. Status 201 is not + # sent by all servers. + con.get_module('MUC').request_config(self.room_jid) - # Set to true if role or affiliation have changed - right_changed = False + elif 'continue_tag' in app.automatic_rooms[self.account][self.room_jid]: + # We just need to invite contacts + for jid in app.automatic_rooms[self.account][self.room_jid]['invities']: + con.get_module('MUC').invite(self.room_jid, jid) + self.print_conversation( + _('%(jid)s has been ' + 'invited in this room') % {'jid': jid}, + graphics=False) - if obj.real_jid: - # delete resource - simple_jid = app.get_jid_without_resource(obj.real_jid) - nick_jid += ' (%s)' % simple_jid + if StatusCode.NON_ANONYMOUS in status_codes: + self.print_conversation( + _('Any occupant is allowed to see your full JID')) + self.is_anonymous = False - con = app.connections[self.account] - bookmarks = con.get_module('Bookmarks').bookmarks - bookmark = bookmarks.get(self.room_jid, None) - if bookmark is None or not bookmark['print_status']: - print_status = app.config.get('print_status_in_muc') + if StatusCode.CONFIG_ROOM_LOGGING in status_codes: + self.print_conversation(_('Room logging is enabled')) + + if StatusCode.NICKNAME_MODIFIED in status_codes: + self.print_conversation(\ + _('The server has assigned or modified your roomnick')) + + if event.properties.is_new_room: + app.connections[self.account].get_module('Discovery').disco_muc( + self.room_jid, self._on_room_created, update=True) + self.print_conversation(_('A new room has been created')) + con = app.connections[self.account] + con.get_module('MUC').request_config(self.room_jid) + + # Update Actions + self.update_actions() + + def _on_nickname_changed(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + nick = event.properties.muc_nickname + new_nick = event.properties.muc_user.nick + if event.properties.is_muc_self_presence: + self._change_nick(new_nick) + message = _('You are now known as %s') % new_nick else: - print_status = bookmark['print_status'] - - # status_code - # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-\ - # init - if obj.status_code and obj.nick == self.nick: - if '110' in obj.status_code: - if not self.is_connected: - # We just join the room - self.print_conversation( - _('You (%s) joined the room') % self.nick, - 'info', graphics=False) - if self.room_jid in app.automatic_rooms[self.account] and \ - app.automatic_rooms[self.account][self.room_jid]['invities']: - if self.room_jid not in app.interface.instances[ - self.account]['gc_config']: - if obj.affiliation == 'owner': - # We need to configure the room if it's a new one. - # We cannot know it's a new one. Status 201 is not - # sent by all servers. - con = app.connections[self.account] - con.get_module('MUC').request_config(self.room_jid) - elif 'continue_tag' in app.automatic_rooms[ - self.account][self.room_jid]: - # We just need to invite contacts - for jid in app.automatic_rooms[self.account][ - self.room_jid]['invities']: - obj.conn.get_module('MUC').invite(self.room_jid, jid) - self.print_conversation(_('%(jid)s has been ' - 'invited in this room') % {'jid': jid}, - graphics=False) - if '100' in obj.status_code: - # Can be a message (see handle_event_gc_config_change in - # app.py) - self.print_conversation( - _('Any occupant is allowed to see your full JID')) - self.is_anonymous = False - if '170' in obj.status_code: - # Can be a message (see handle_event_gc_config_change in - # app.py) - self.print_conversation(_('Room logging is enabled')) - if '201' in obj.status_code: - app.connections[self.account].get_module('Discovery').disco_muc( - self.room_jid, self._on_room_created, update=True) - self.print_conversation(_('A new room has been created')) - if '210' in obj.status_code: - self.print_conversation(\ - _('The server has assigned or modified your roomnick')) - - if obj.show in ('offline', 'error'): - if obj.status_code: - if '333' in obj.status_code: - # Handle 333 before 307, some MUCs add both - if print_status != 'none': - if obj.nick == self.nick: - s = _('%s kicked us due to an error' % self.room_jid) - else: - s = _('%s has left due to an error' % nick) - if obj.reason: - s += ' (%s)' % obj.reason - self.print_conversation(s, 'info', graphics=False) - elif '307' in obj.status_code: - if obj.actor is None: # do not print 'kicked by None' - s = _('%(nick)s has been kicked: %(reason)s') % { - 'nick': nick, 'reason': obj.reason} - else: - s = _('%(nick)s has been kicked by %(who)s: ' - '%(reason)s') % {'nick': nick, 'who': obj.actor, - 'reason': obj.reason} - self.print_conversation(s, 'info', graphics=False) - if obj.nick == self.nick and not app.config.get( - 'muc_autorejoin_on_kick'): - self.autorejoin = False - elif '301' in obj.status_code: - if obj.actor is None: # do not print 'banned by None' - s = _('%(nick)s has been banned: %(reason)s') % { - 'nick': nick, 'reason': obj.reason} - else: - s = _('%(nick)s has been banned by %(who)s: ' - '%(reason)s') % {'nick': nick, 'who': obj.actor, - 'reason': obj.reason} - self.print_conversation(s, 'info', graphics=False) - if obj.nick == self.nick: - self.autorejoin = False - elif '303' in obj.status_code: # Someone changed their nick - if obj.new_nick == self.new_nick or obj.nick == self.nick: - # We changed our nick - self._change_nick(obj.new_nick) - self.new_nick = '' - s = _('You are now known as %s') % self.nick - else: - s = _('%(nick)s is now known as %(new_nick)s') % { - 'nick': nick, 'new_nick': obj.new_nick} - tv = self.conv_textview - if obj.nick in tv.last_received_message_id: - tv.last_received_message_id[obj.new_nick] = \ - tv.last_received_message_id[obj.nick] - del tv.last_received_message_id[obj.nick] - # We add new nick to muc roster here, so we don't see - # that "new_nick has joined the room" when he just changed - # nick. - # add_contact_to_roster will be called a second time - # after that, but that doesn't hurt - self.add_contact_to_roster(obj.new_nick, obj.show, role, - affiliation, obj.status, obj.real_jid) - self._nick_completion.contact_renamed(nick, obj.new_nick) - # keep nickname color - if obj.nick in self.gc_custom_colors: - self.gc_custom_colors[obj.new_nick] = \ - self.gc_custom_colors[obj.nick] - self.print_conversation(s, 'info', graphics=False) - elif '321' in obj.status_code: - s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % {'nick': nick, - 'reason': _('affiliation changed')} - self.print_conversation(s, 'info', graphics=False) - elif '322' in obj.status_code: - s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % {'nick': nick, - 'reason': _('room configuration changed to ' - 'members-only')} - self.print_conversation(s, 'info', graphics=False) - elif '332' in obj.status_code: - s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % {'nick': nick, - 'reason': _('system shutdown')} - self.print_conversation(s, 'info', graphics=False) - # Room has been destroyed. - elif 'destroyed' in obj.status_code: - self.autorejoin = False - self.print_conversation(obj.reason, 'info', graphics=False) - - if not app.events.get_events( - self.account, jid=obj.fjid, types=['pm']): - self.remove_contact(obj.nick) - self.draw_all_roles() - else: - c = app.contacts.get_gc_contact(self.account, self.room_jid, - obj.nick) - c.show = obj.show - c.status = obj.status - if obj.nick == self.nick and (not obj.status_code or \ - '303' not in obj.status_code): # We became offline - self.got_disconnected() - contact = app.contacts.\ - get_contact_with_highest_priority(self.account, - self.room_jid) - if contact: - app.interface.roster.draw_contact(self.room_jid, - self.account) - if self.parent_win: - self.parent_win.redraw_tab(self) + message = _('{nick} is now known ' + 'as {new_nick}').format(nick=nick, new_nick=new_nick) + self._nick_completion.contact_renamed(nick, new_nick) + + self.print_conversation(message, 'info', graphics=False) + + tv = self.conv_textview + if nick in tv.last_received_message_id: + tv.last_received_message_id[new_nick] = \ + tv.last_received_message_id[nick] + del tv.last_received_message_id[nick] + + # keep nickname color + if nick in self.gc_custom_colors: + self.gc_custom_colors[new_nick] = self.gc_custom_colors[nick] + + self.remove_contact(nick) + self.add_contact_to_roster(new_nick) + + def _on_status_show_changed(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + nick = event.properties.muc_nickname + status = event.properties.status + status = '' if status is None else ' (%s)' % status + show = helpers.get_uf_show(event.properties.show.value) + + if event.properties.is_muc_self_presence: + message = _('You are now {show}{status}').format(show=show, + status=status) + self.print_conversation(message, 'info', graphics=False) + + elif app.config.get_per('rooms', self.room_jid, 'print_status'): + message = _('{nick} is now {show}{status}').format(nick=nick, + show=show, + status=status) + self.print_conversation(message, 'info', graphics=False) + + self.draw_contact(nick) + + def _on_affiliation_changed(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + affiliation = helpers.get_uf_affiliation( + event.properties.affiliation.value) + nick = event.properties.muc_nickname + reason = event.properties.muc_user.reason + reason = '' if reason is None else ': {reason}'.format(reason=reason) + + actor = event.properties.muc_user.actor + #Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format(actor=actor) + + if event.properties.is_muc_self_presence: + message = _('** Your Affiliation has been set to ' + '{affiliation}{actor}{reason}').format( + affiliation=affiliation, + actor=actor, + reason=reason) else: - iter_ = self.get_contact_iter(obj.nick) - if not iter_: - if '210' in obj.status_code: - # Server changed our nick - self._change_nick(obj.nick) - s = _('You are now known as %s') % nick - self.print_conversation(s, 'info', graphics=False) - iter_ = self.add_contact_to_roster(obj.nick, obj.show, role, - affiliation, obj.status, obj.real_jid, obj.avatar_sha) - newly_created = True - self.draw_all_roles() - if obj.status_code and '201' in obj.status_code: - # We just created the room - con = app.connections[self.account] - con.get_module('MUC').request_config(self.room_jid) - else: - gc_c = app.contacts.get_gc_contact(self.account, - self.room_jid, obj.nick) - if not gc_c: - log.error('%s has an iter, but no gc_contact instance', - obj.nick) - return + message = _('** Affiliation of {nick} has been set to ' + '{affiliation}{actor}{reason}').format( + nick=nick, + affiliation=affiliation, + actor=actor, + reason=reason) + + self.print_conversation(message, graphics=False) + self.draw_contact(nick) - actual_affiliation = gc_c.affiliation - if affiliation != actual_affiliation: - if obj.actor: - st = _('** Affiliation of %(nick)s has been set to ' - '%(affiliation)s by %(actor)s') % {'nick': nick_jid, - 'affiliation': affiliation, 'actor': obj.actor} - else: - st = _('** Affiliation of %(nick)s has been set to ' - '%(affiliation)s') % {'nick': nick_jid, - 'affiliation': affiliation} - if obj.reason: - st += ' (%s)' % obj.reason - self.print_conversation(st, graphics=False) - right_changed = True - actual_role = self.get_role(obj.nick) - if role != actual_role: - self.remove_contact(obj.nick) - self.add_contact_to_roster(obj.nick, obj.show, role, - affiliation, obj.status, obj.real_jid) - self.draw_role(actual_role) - self.draw_role(role) - if obj.actor: - st = _('** Role of %(nick)s has been set to %(role)s ' - 'by %(actor)s') % {'nick': nick_jid, 'role': role, - 'actor': obj.actor} - else: - st = _('** Role of %(nick)s has been set to ' - '%(role)s') % {'nick': nick_jid, 'role': role} - if obj.reason: - st += ' (%s)' % obj.reason - self.print_conversation(st, graphics=False) - right_changed = True - else: - if gc_c.show == obj.show and gc_c.status == obj.status and \ - gc_c.affiliation == affiliation: # no change - return - gc_c.show = obj.show - gc_c.affiliation = affiliation - gc_c.status = obj.status - self.draw_contact(obj.nick) - if self.is_connected and obj.nick != self.nick \ - and (not obj.status_code or '303' not in obj.status_code) and not \ - right_changed: - st = '' - - if obj.show == 'offline' and print_status in ('all', 'in_and_out') \ - and (not obj.status_code or '307' not in obj.status_code): - st = _('%s has left') % nick_jid - if obj.reason: - st += ' [%s]' % obj.reason - else: - if newly_created and print_status in ('all', 'in_and_out'): - st = _('%s has joined the group chat') % nick_jid - elif print_status == 'all': - st = _('%(nick)s is now %(status)s') % {'nick': nick_jid, - 'status': helpers.get_uf_show(obj.show)} - if st: - if obj.status: - st += ' (' + obj.status + ')' - self.print_conversation(st, graphics=False) + def _on_role_changed(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + role = helpers.get_uf_role(event.properties.role.value) + nick = event.properties.muc_nickname + reason = event.properties.muc_user.reason + reason = '' if reason is None else ': {reason}'.format(reason=reason) + + actor = event.properties.muc_user.actor + #Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format(actor=actor) + + if event.properties.is_muc_self_presence: + message = _('** Your Role has been set to ' + '{role}{actor}{reason}').format(role=role, + actor=actor, + reason=reason) + else: + message = _('** Role of {nick} has been set to ' + '{role}{actor}{reason}').format(nick=nick, + role=role, + actor=actor, + reason=reason) + + self.print_conversation(message, graphics=False) + self.remove_contact(nick) + self.add_contact_to_roster(nick) + + def _on_self_kicked(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + self.autorejoin = False + + status_codes = event.properties.muc_status_codes or [] + + reason = event.properties.muc_user.reason + reason = '' if reason is None else ': {reason}'.format(reason=reason) + + actor = event.properties.muc_user.actor + #Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format(actor=actor) + + #Group Chat: We have been removed from the room by Alice: reason + message = _('You have been removed from the room{actor}{reason}') + + if StatusCode.REMOVED_ERROR in status_codes: + # Handle 333 before 307, some MUCs add both + #Group Chat: Server kicked us because of an server error + message = _('You have left due ' + 'to an error{reason}').format(reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_KICKED in status_codes: + #Group Chat: We have been kicked by Alice: reason + message = _('You have been ' + 'kicked{actor}{reason}').format(actor=actor, + reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_BANNED in status_codes: + #Group Chat: We have been banned by Alice: reason + message = _('You have been ' + 'banned{actor}{reason}').format(actor=actor, + reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: + #Group Chat: We were removed because of an affiliation change + reason = _(': Affiliation changed') + message = message.format(actor=actor, reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: + #Group Chat: Room configuration changed + reason = _(': Room configuration changed to members-only') + message = message.format(actor=actor, reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: + #Group Chat: Kicked because of server shutdown + reason = ': System shutdown' + message = message.format(actor=actor, reason=reason) + self.print_conversation(message, 'info', graphics=False) + self.autorejoin = True + + self.got_disconnected() # Update Actions - if obj.status_code: - if '110' in obj.status_code: - self.update_actions() + self.update_actions() - def add_contact_to_roster(self, nick, show, role, affiliation, status, - jid='', avatar_sha=None): - role_name = helpers.get_uf_role(role, plural=True) + def _on_user_left(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + status_codes = event.properties.muc_status_codes or [] + nick = event.properties.muc_nickname + + reason = event.properties.muc_user.reason + reason = '' if reason is None else ': {reason}'.format(reason=reason) + + actor = event.properties.muc_user.actor + #Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format(actor=actor) + + #Group Chat: We have been removed from the room + message = _('{nick} has been removed from the room{by}{reason}') + + print_join_left = app.config.get_per( + 'rooms', self.room_jid, 'print_join_left') + + if StatusCode.REMOVED_ERROR in status_codes: + # Handle 333 before 307, some MUCs add both + if print_join_left: + #Group Chat: User was kicked because of an server error: reason + message = _('{nick} has left due to ' + 'an error{reason}').format(nick=nick, reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_KICKED in status_codes: + #Group Chat: User was kicked by Alice: reason + message = _('{nick} has been ' + 'kicked{actor}{reason}').format(nick=nick, + actor=actor, + reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_BANNED in status_codes: + #Group Chat: User was banned by Alice: reason + message = _('{nick} has been ' + 'banned{actor}{reason}').format(nick=nick, + actor=actor, + reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: + reason = _(': Affiliation changed') + message = message.format(nick=nick, actor=actor, reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: + reason = _(': Room configuration changed to members-only') + message = message.format(nick=nick, actor=actor, reason=reason) + self.print_conversation(message, 'info', graphics=False) + + elif print_join_left: + message = _('{nick} has left{reason}').format(nick=nick, + reason=reason) + self.print_conversation(message, 'info', graphics=False) + + self.remove_contact(nick) + self.draw_all_roles() + + def _on_user_joined(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + nick = event.properties.muc_nickname + print_join_left = app.config.get_per( + 'rooms', self.room_jid, 'print_join_left') + + self.add_contact_to_roster(nick) + + if self.is_connected and print_join_left: + self.print_conversation(_('%s has joined the group chat') % nick, + graphics=False) + + def _on_muc_presence_error(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + nick = event.properties.muc_nickname + error_type = event.properties.error.type + error_message = event.properties.error.message + + if error_type == Error.NOT_AUTHORIZED: + app.interface.handle_gc_password_required( + self.account, self.room_jid, nick) + + elif error_type == Error.FORBIDDEN: + # we are banned + ErrorDialog( + _('Unable to join group chat'), + _('You are banned from group chat %s.') % self.room_jid) + + elif error_type == Error.REMOTE_SERVER_NOT_FOUND: + ErrorDialog( + _('Unable to join group chat'), + _('Remote server %s does not exist.') % self.room_jid) + + elif error_type == Error.ITEM_NOT_FOUND: + ErrorDialog( + _('Unable to join group chat'), + _('Group chat %s does not exist.') % self.room_jid) + + elif error_type == Error.NOT_ALLOWED: + ErrorDialog( + _('Unable to join group chat'), + _('Group chat creation is not permitted.')) + + elif error_type == Error.NOT_ACCEPTABLE: + ErrorDialog( + _('Unable to join groupchat'), + _('You must use your registered ' + 'nickname in %s.') % self.room_jid) + + elif error_type == Error.REGISTRATION_REQUIRED: + ErrorDialog( + _('Unable to join group chat'), + _('You are not in the members ' + 'list in groupchat %s.') % self.room_jid) + + elif error_type == Error.CONFLICT: + win = None if self.parent_win is None else self.parent_win.window + app.interface.handle_ask_new_nick( + self.account, self.room_jid, win) - resource = '' - if jid: - jids = jid.split('/', 1) - j = jids[0] - if len(jids) > 1: - resource = jids[1] else: - j = '' + self.print_conversation( + 'Error %s: %s' % (error_type.value, error_message)) - name = nick + self.autorejoin = False - # Add Contact - gc_contact = app.contacts.create_gc_contact( - room_jid=self.room_jid, account=self.account, - name=nick, show=show, status=status, role=role, - affiliation=affiliation, jid=j, resource=resource, - avatar_sha=avatar_sha) - app.contacts.add_gc_contact(self.account, gc_contact) + def add_contact_to_roster(self, nick): + contact = app.contacts.get_gc_contact(self.account, + self.room_jid, + nick) + role_name = helpers.get_uf_role(contact.role.value, plural=True) # Create Role - role_iter = self.get_role_iter(role) + role_iter = self.get_role_iter(contact.role.value) if not role_iter: icon_name = get_icon_name('closed') ext_columns = [None] * self.nb_ext_renderers - row = [icon_name, role, 'role', role_name, None] + ext_columns + row = [icon_name, contact.role.value, + 'role', role_name, None] + ext_columns role_iter = self.model.append(None, row) - self._role_refs[role] = Gtk.TreeRowReference( + self._role_refs[contact.role.value] = Gtk.TreeRowReference( self.model, self.model.get_path(role_iter)) - self.draw_all_roles() # Avatar image = None if app.config.get('show_avatars_in_roster'): surface = app.interface.get_avatar( - avatar_sha, AvatarSize.ROSTER, self.scale_factor) + contact.avatar_sha, AvatarSize.ROSTER, self.scale_factor) image = Gtk.Image.new_from_surface(surface) # Add to model ext_columns = [None] * self.nb_ext_renderers - row = [None, nick, 'contact', name, image] + ext_columns + row = [None, nick, 'contact', nick, image] + ext_columns iter_ = self.model.append(role_iter, row) self._contact_refs[nick] = Gtk.TreeRowReference( self.model, self.model.get_path(iter_)) + self.draw_all_roles() self.draw_contact(nick) - if nick == self.nick: # we became online - self.got_connected() if self.list_treeview.get_model(): self.list_treeview.expand_row( (self.model.get_path(role_iter)), False) if self.is_continued: self.draw_banner_text() - return iter_ + + def _on_muc_destroyed(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + destroyed = event.properties.muc_destroyed + + reason = destroyed.reason + reason = '' if reason is None else ': %s' % reason + + message = _('Room has been destroyed') + self.print_conversation(message, 'info', graphics=False) + + alternate = destroyed.alternate + if alternate is not None: + join_message = _('You can join this room ' + 'instead: xmpp:%s?join') % alternate + self.print_conversation(join_message, 'info', graphics=False) + + self.autorejoin = False + self.got_disconnected() def get_role_iter(self, role: str) -> Optional[Gtk.TreeIter]: try: @@ -2046,10 +2200,6 @@ class GroupchatControl(ChatControlBase): iter_ = self.get_contact_iter(nick) if not iter_: return - gc_contact = app.contacts.get_gc_contact( - self.account, self.room_jid, nick) - if gc_contact: - app.contacts.remove_gc_contact(self.account, gc_contact) parent_iter = self.model.iter_parent(iter_) if parent_iter is None: @@ -2124,7 +2274,7 @@ class GroupchatControl(ChatControlBase): self.account, self.room_jid, nick) if gc_contact: return gc_contact.role - return 'visitor' + return Role.VISITOR def minimizable(self): if self.force_non_minimizable: @@ -2166,36 +2316,14 @@ class GroupchatControl(ChatControlBase): # Preventing autorejoin from being activated self.autorejoin = False - app.ged.remove_event_handler('gc-presence-received', ged.GUI1, - self._nec_gc_presence_received) - app.ged.remove_event_handler('gc-message-received', ged.GUI1, - self._nec_gc_message_received) - app.ged.remove_event_handler('vcard-published', ged.GUI1, - self._nec_vcard_published) - app.ged.remove_event_handler('update-gc-avatar', ged.GUI1, - self._nec_update_avatar) - app.ged.remove_event_handler('update-room-avatar', ged.GUI1, - self._nec_update_room_avatar) - app.ged.remove_event_handler('gc-subject-received', ged.GUI1, - self._nec_gc_subject_received) - app.ged.remove_event_handler('gc-config-changed-received', ged.GUI1, - self._nec_gc_config_changed_received) - app.ged.remove_event_handler('signed-in', ged.GUI1, - self._nec_signed_in) - app.ged.remove_event_handler('decrypted-message-received', ged.GUI2, - self._nec_decrypted_message_received) - app.ged.remove_event_handler('mam-decrypted-message-received', - ged.GUI1, self._nec_mam_decrypted_message_received) - app.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, - self._message_sent) - app.ged.remove_event_handler('captcha-challenge', ged.GUI1, - self._on_captcha_challenge) - app.ged.remove_event_handler('voice-approval', ged.GUI1, - self._on_voice_approval) + # Unregister handlers + for handler in self._event_handlers: + app.ged.remove_event_handler(*handler) if self.is_connected: app.connections[self.account].send_gc_status(self.nick, self.room_jid, show='offline', status=status) + nick_list = app.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: # Update pm chat window @@ -2209,10 +2337,12 @@ class GroupchatControl(ChatControlBase): contact.status = '' ctrl.update_ui() ctrl.parent_win.redraw_tab(ctrl) + # They can already be removed by the destroy function if self.room_jid in app.contacts.get_gc_list(self.account): app.contacts.remove_room(self.account, self.room_jid) del app.gc_connected[self.account][self.room_jid] + # Save hpaned position app.config.set('gc-hpaned-position', self.hpaned.get_position()) # remove all register handlers on wigets, created by self.xml @@ -2504,64 +2634,62 @@ class GroupchatControl(ChatControlBase): # these conditions were taken from JEP 0045 item = xml.get_object('kick_menuitem') - if user_role != 'moderator' or \ - (user_affiliation == 'admin' and target_affiliation == 'owner') or \ - (user_affiliation == 'member' and target_affiliation in ('admin', - 'owner')) or (user_affiliation == 'none' and target_affiliation != \ - 'none'): + if not user_role.is_moderator or \ + (user_affiliation.is_admin and target_affiliation.is_owner) or \ + (user_affiliation.is_member and target_affiliation in (Affiliation.ADMIN, + Affiliation.OWNER)) or (user_affiliation.is_none and not target_affiliation.is_none): item.set_sensitive(False) id_ = item.connect('activate', self.kick, nick) self.handlers[id_] = item item = xml.get_object('voice_checkmenuitem') - item.set_active(target_role != 'visitor') - if user_role != 'moderator' or \ - user_affiliation == 'none' or \ - (user_affiliation == 'member' and target_affiliation != 'none') or \ - target_affiliation in ('admin', 'owner'): + item.set_active(not target_role.is_visitor) + if not user_role.is_moderator or \ + user_affiliation.is_none or \ + (user_affiliation.is_member and not target_affiliation.is_none) or \ + target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER): item.set_sensitive(False) id_ = item.connect('activate', self.on_voice_checkmenuitem_activate, nick) self.handlers[id_] = item item = xml.get_object('moderator_checkmenuitem') - item.set_active(target_role == 'moderator') - if not user_affiliation in ('admin', 'owner') or \ - target_affiliation in ('admin', 'owner'): + item.set_active(target_role.is_moderator) + if not user_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) or \ + target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER): item.set_sensitive(False) id_ = item.connect('activate', self.on_moderator_checkmenuitem_activate, nick) self.handlers[id_] = item item = xml.get_object('ban_menuitem') - if not user_affiliation in ('admin', 'owner') or \ - (target_affiliation in ('admin', 'owner') and\ - user_affiliation != 'owner'): + if not user_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) or \ + (target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) and\ + not user_affiliation.is_owner): item.set_sensitive(False) id_ = item.connect('activate', self.ban, jid) self.handlers[id_] = item item = xml.get_object('member_checkmenuitem') - item.set_active(target_affiliation != 'none') - if not user_affiliation in ('admin', 'owner') or \ - (user_affiliation != 'owner' and target_affiliation in ('admin', - 'owner')): + item.set_active(not target_affiliation.is_none) + if not user_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) or \ + (not user_affiliation.is_owner and target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER)): item.set_sensitive(False) id_ = item.connect('activate', self.on_member_checkmenuitem_activate, jid) self.handlers[id_] = item item = xml.get_object('admin_checkmenuitem') - item.set_active(target_affiliation in ('admin', 'owner')) - if not user_affiliation == 'owner': + item.set_active(target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) + if not user_affiliation.is_owner: item.set_sensitive(False) id_ = item.connect('activate', self.on_admin_checkmenuitem_activate, jid) self.handlers[id_] = item item = xml.get_object('owner_checkmenuitem') - item.set_active(target_affiliation == 'owner') - if not user_affiliation == 'owner': + item.set_active(target_affiliation.is_owner) + if not user_affiliation.is_owner: item.set_sensitive(False) id_ = item.connect('activate', self.on_owner_checkmenuitem_activate, jid) ===================================== gajim/gtk/preferences.py ===================================== @@ -147,15 +147,6 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('show_subject_on_join') self._ui.subject_on_join_checkbutton.set_active(st) - # Print status in MUC - st = app.config.get('print_status_in_muc') - if st == 'none': - self._ui.print_status_in_muc_combobox.set_active(0) - elif st == 'all': - self._ui.print_status_in_muc_combobox.set_active(1) - else: # in_and_out - self._ui.print_status_in_muc_combobox.set_active(2) - # Displayed chat state notifications st = app.config.get('show_chatstate_in_tabs') self._ui.show_chatstate_in_tabs.set_active(st) @@ -604,15 +595,6 @@ class Preferences(Gtk.ApplicationWindow): def on_subject_on_join_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_subject_on_join') - def print_status_in_muc_combobox_changed(self, widget): - active = widget.get_active() - if active == 0: # none - app.config.set('print_status_in_muc', 'none') - elif active == 1: # all - app.config.set('print_status_in_muc', 'all') - else: # in_and_out - app.config.set('print_status_in_muc', 'in_and_out') - def on_show_chatstate_in_tabs_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_chatstate_in_tabs') ===================================== gajim/gtk/tooltips.py ===================================== @@ -203,18 +203,18 @@ class GCTooltip(): self._ui.status.show() # Status - show = helpers.get_uf_show(contact.show) + show = helpers.get_uf_show(contact.show.value) self._ui.user_show.set_markup(colorize_status(show)) self._ui.user_show.show() # JID - if contact.jid.strip(): - self._ui.jid.set_text(contact.jid) + if contact.jid is not None: + self._ui.jid.set_text(str(contact.jid)) self._ui.jid.show() # Affiliation - if contact.affiliation != 'none': - uf_affiliation = helpers.get_uf_affiliation(contact.affiliation) + if not contact.affiliation.is_none: + uf_affiliation = helpers.get_uf_affiliation(contact.affiliation.value) uf_affiliation = \ _('%(owner_or_admin_or_member)s of this group chat') \ % {'owner_or_admin_or_member': uf_affiliation} ===================================== gajim/gui_interface.py ===================================== @@ -329,57 +329,6 @@ class Interface: cancel_handler=on_cancel) gc_control.error_dialog.input_entry.set_visibility(False) - def handle_event_gc_presence(self, obj): - gc_control = obj.gc_control - parent_win = None - if gc_control and gc_control.parent_win: - parent_win = gc_control.parent_win.window - if obj.ptype == 'error': - if obj.errcode == '503': - # maximum user number reached - self.handle_gc_error(gc_control, - _('Unable to join group chat'), - _('%s is full')\ - % obj.room_jid) - elif (obj.errcode == '401') or (obj.errcon == 'not-authorized'): - # password required to join - self.handle_gc_password_required(obj.conn.name, obj.room_jid, - obj.nick) - elif (obj.errcode == '403') or (obj.errcon == 'forbidden'): - # we are banned - self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('You are banned from group chat %s.') % \ - obj.room_jid) - elif (obj.errcode == '404') or (obj.errcon in ('item-not-found', - 'remote-server-not-found')): - # remote server does not exist - if obj.errcon == 'remote-server-not-found': - self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('Remote server %s does not exist.') % obj.room_jid) - # group chat does not exist - else: - self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('Group chat %s does not exist.') % obj.room_jid) - elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'): - self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('Group chat creation is not permitted.')) - elif (obj.errcode == '406') or (obj.errcon == 'not-acceptable'): - self.handle_gc_error(gc_control, _('Unable to join groupchat'), - _('You must use your registered nickname in %s.')\ - % obj.room_jid) - elif (obj.errcode == '407') or (obj.errcon == \ - 'registration-required'): - self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('You are not in the members list in groupchat %s.') % \ - obj.room_jid) - elif (obj.errcode == '409') or (obj.errcon == 'conflict'): - self.handle_ask_new_nick(obj.conn.name, obj.room_jid, parent_win) - elif gc_control: - gc_control.print_conversation('Error %s: %s' % (obj.errcode, - obj.errmsg)) - if gc_control and gc_control.autorejoin: - gc_control.autorejoin = False - def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, # priority, # keyID, timestamp, contact_nickname)) @@ -1445,7 +1394,6 @@ class Interface: 'file-request-received': [self.handle_event_file_request], 'gc-invitation-received': [self.handle_event_gc_invitation], 'gc-decline-received': [self.handle_event_gc_decline], - 'gc-presence-received': [self.handle_event_gc_presence], 'gpg-password-required': [self.handle_event_gpg_password_required], 'gpg-trust-key': [self.handle_event_gpg_trust_key], 'http-auth-received': [self.handle_event_http_auth], @@ -1597,14 +1545,6 @@ class Interface: nick = resource gc_contact = app.contacts.get_gc_contact( account, room_jid, nick) - if gc_contact: - show = gc_contact.show - else: - show = 'offline' - gc_contact = app.contacts.create_gc_contact( - room_jid=room_jid, account=account, name=nick, - show=show) - ctrl = self.new_private_chat(gc_contact, account) w = ctrl.parent_win ===================================== gajim/gui_menu_builder.py ===================================== @@ -659,12 +659,16 @@ def get_groupchat_menu(control_id, account, jid): ('win.upload-avatar-', _('Upload Avatar…')), ('win.destroy-', _('Destroy Room')), ]), + (_('Chat Settings'), [ + ('win.print-join-left-', _('Show join/leave')), + ('win.print-status-', _('Show status changes')), + ('win.notify-on-message-', _('Notify on all messages')), + ('win.minimize-', _('Minimize on close')), + ]), (_('Sync Threshold'), []), ('win.change-nick-', _('Change Nick')), ('win.bookmark-', _('Bookmark Room')), ('win.request-voice-', _('Request Voice')), - ('win.notify-on-message-', _('Notify on all messages')), - ('win.minimize-', _('Minimize on close')), ('win.execute-command-', _('Execute command')), ('app.browse-history', _('History')), ('win.disconnect-', _('Disconnect')), ===================================== gajim/message_window.py ===================================== @@ -630,6 +630,7 @@ class MessageWindow: tab = self.notebook.get_tab_label(ctrl.widget) if not tab: return + hbox = tab.get_children()[0] status_img = hbox.get_children()[0] nick_label = hbox.get_children()[1] ===================================== gajim/privatechat_control.py ===================================== @@ -24,6 +24,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from gi.repository import Gtk + from gajim import message_control from gajim.common import app @@ -36,6 +38,7 @@ from gajim.chat_control import ChatControl from gajim.command_system.implementation.hosts import PrivateChatCommands from gajim.gtk.dialogs import ErrorDialog +from gajim.gtk.util import get_icon_name class PrivateChatControl(ChatControl): @@ -58,24 +61,38 @@ class PrivateChatControl(ChatControl): self.gc_contact = gc_contact ChatControl.__init__(self, parent_win, contact, account, session) self.TYPE_ID = 'pm' - app.ged.register_event_handler('update-gc-avatar', ged.GUI1, - self._nec_update_avatar) - app.ged.register_event_handler('caps-update', ged.GUI1, - self._nec_caps_received_pm) - app.ged.register_event_handler('gc-presence-received', ged.GUI1, - self._nec_gc_presence_received) + + self.__event_handlers = [ + ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), + ('caps-update', ged.GUI1, self._nec_caps_received_pm), + ('muc-user-joined', ged.GUI1, self._on_user_joined), + ('muc-user-left', ged.GUI1, self._on_user_left), + ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), + ('muc-self-presence', ged.GUI1, self._on_self_presence), + ('muc-self-kicked', ged.GUI1, self._on_diconnected), + ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), + ('muc-destroyed', ged.GUI1, self._on_diconnected), + ] + + for handler in self.__event_handlers: + app.ged.register_event_handler(*handler) + + @property + def contact(self): + return self.gc_contact.as_contact() + + @contact.setter + def contact(self, _value): + # TODO: remove all code that sets the contact here + return def get_our_nick(self): return self.room_ctrl.nick def shutdown(self): super(PrivateChatControl, self).shutdown() - app.ged.remove_event_handler('update-gc-avatar', ged.GUI1, - self._nec_update_avatar) - app.ged.remove_event_handler('caps-update', ged.GUI1, - self._nec_caps_received_pm) - app.ged.remove_event_handler('gc-presence-received', ged.GUI1, - self._nec_gc_presence_received) + for handler in self.__event_handlers: + app.ged.remove_event_handler(*handler) def _nec_caps_received_pm(self, obj): if obj.conn.name != self.account or \ @@ -83,43 +100,90 @@ class PrivateChatControl(ChatControl): return self.update_contact() - def _nec_gc_presence_received(self, obj): - if obj.conn.name != self.account: - return - if obj.fjid != self.full_jid: - return - if '303' in obj.status_code: - self.print_conversation( - _('%(nick)s is now known as %(new_nick)s') % { - 'nick': obj.nick, 'new_nick': obj.new_nick}, - 'status') - gc_c = app.contacts.get_gc_contact(obj.conn.name, obj.room_jid, - obj.new_nick) - c = gc_c.as_contact() - self.gc_contact = gc_c - self.contact = c - self.draw_banner() - old_jid = obj.room_jid + '/' + obj.nick - new_jid = obj.room_jid + '/' + obj.new_nick - app.interface.msg_win_mgr.change_key( - old_jid, new_jid, obj.conn.name) + def _on_nickname_changed(self, event): + if event.account != self.account: + return + if event.properties.new_jid != self.gc_contact.get_full_jid(): + return + + nick = event.properties.muc_nickname + new_nick = event.properties.muc_user.nick + if event.properties.is_muc_self_presence: + message = _('You are now known as %s') % new_nick else: - self.contact.show = obj.show - self.contact.status = obj.status - self.gc_contact.show = obj.show - self.gc_contact.status = obj.status - uf_show = helpers.get_uf_show(obj.show) - self.print_conversation( - _('%(nick)s is now %(status)s') % {'nick': obj.nick, - 'status': uf_show}, - 'status') - if obj.status: - self.print_conversation(' (', 'status', simple=True) - self.print_conversation( - '%s' % (obj.status), 'status', simple=True) - self.print_conversation(')', 'status', simple=True) - self.parent_win.redraw_tab(self) - self.update_ui() + message = _('{nick} is now known ' + 'as {new_nick}').format(nick=nick, new_nick=new_nick) + + self.print_conversation(message, 'info') + + self.draw_banner() + app.interface.msg_win_mgr.change_key(str(event.properties.jid), + str(event.properties.new_jid), + self.account) + + self.parent_win.redraw_tab(self) + self.update_ui() + + def _on_status_show_changed(self, event): + if event.account != self.account: + return + if event.properties.jid != self.gc_contact.get_full_jid(): + return + + nick = event.properties.muc_nickname + status = event.properties.status + status = '' if status is None else ' (%s)' % status + show = helpers.get_uf_show(event.properties.show.value) + + if event.properties.is_muc_self_presence: + message = _('You are now {show}{status}').format(show=show, + status=status) + self.print_conversation(message, 'info') + + elif app.config.get_per('rooms', self.room_name, 'print_status'): + message = _('{nick} is now {show}{status}').format(nick=nick, + show=show, + status=status) + self.print_conversation(message, 'info') + + self.parent_win.redraw_tab(self) + self.update_ui() + + def _on_diconnected(self, event): + if event.account != self.account: + return + if event.properties.jid != self.gc_contact.get_full_jid(): + return + + self.got_disconnected() + + def _on_user_left(self, event): + if event.account != self.account: + return + if event.properties.jid != self.gc_contact.get_full_jid(): + return + + self.got_disconnected() + + def _on_user_joined(self, event): + if event.account != self.account: + return + if event.properties.jid != self.gc_contact.get_full_jid(): + return + + self.gc_contact = app.contacts.get_gc_contact( + self.account, self.gc_contact.room_jid, self.gc_contact.name) + self.parent_win.redraw_tab(self) + self.got_connected() + + def _on_self_presence(self, event): + if event.account != self.account: + return + if event.properties.jid != self.gc_contact.get_full_jid(): + return + + self.parent_win.redraw_tab(self) + self.got_connected() def send_message(self, message, xhtml=None, process_commands=True, attention=False): @@ -132,21 +196,15 @@ class PrivateChatControl(ChatControl): # We need to make sure that we can still send through the room and that # the recipient did not go away - contact = app.contacts.get_first_contact_from_jid( - self.account, self.contact.jid) - if not contact: - # contact was from pm in MUC - room, nick = app.get_room_and_nick_from_fjid(self.contact.jid) - gc_contact = app.contacts.get_gc_contact(self.account, room, nick) - if not gc_contact: - ErrorDialog( - _('Sending private message failed'), - #in second %s code replaces with nickname - _('You are no longer in group chat "%(room)s" or ' - '"%(nick)s" has left.') % { - 'room': '\u200E' + room, 'nick': nick}, - transient_for=self.parent_win.window) - return + if self.gc_contact.presence.is_unavailable: + ErrorDialog( + _('Sending private message failed'), + #in second %s code replaces with nickname + _('You are no longer in group chat "%(room)s" or ' + '"%(nick)s" has left.') % { + 'room': self.room_name, 'nick': self.gc_contact.name}, + transient_for=self.parent_win.window) + return ChatControl.send_message(self, message, xhtml=xhtml, @@ -154,11 +212,10 @@ class PrivateChatControl(ChatControl): attention=attention) def update_ui(self): - if self.contact.show == 'offline': + if self.gc_contact.presence.is_unavailable: self.got_disconnected() else: self.got_connected() - ChatControl.update_ui(self) def _nec_update_avatar(self, obj): if obj.contact != self.gc_contact: @@ -173,10 +230,59 @@ class PrivateChatControl(ChatControl): surface = app.interface.get_avatar( self.gc_contact.avatar_sha, AvatarSize.CHAT, scale) image = self.xml.get_object('avatar_image') - image.set_from_surface(surface) + if surface is None: + image.set_from_icon_name('avatar-default', Gtk.IconSize.DIALOG) + else: + image.set_from_surface(surface) + + def _update_banner_state_image(self): + # Set banner image + if self.gc_contact.presence.is_unavailable: + icon = get_icon_name('offline') + else: + icon = get_icon_name(self.gc_contact.show.value) + banner_status_img = self.xml.get_object('banner_status_image') + banner_status_img.set_from_icon_name(icon, Gtk.IconSize.DND) + + def get_tab_image(self, count_unread=True): + jid = self.gc_contact.get_full_jid() + if app.config.get('show_avatar_in_tabs'): + scale = self.parent_win.window.get_scale_factor() + surface = app.contacts.get_avatar( + self.account, jid, AvatarSize.TAB, scale) + if surface is not None: + return surface + + if count_unread: + num_unread = len(app.events.get_events( + self.account, jid, ['printed_' + self.type_id, self.type_id])) + else: + num_unread = 0 + + transport = None + if app.jid_is_transport(jid): + transport = app.get_transport_name_from_jid(jid) + + if self.gc_contact.presence.is_unavailable: + show = 'offline' + else: + show = self.gc_contact.show.value + + if num_unread and app.config.get('show_unread_tab_icon'): + icon_name = get_icon_name('event', transport=transport) + else: + icon_name = get_icon_name(show, transport=transport) + + return icon_name def update_contact(self): self.contact = self.gc_contact.as_contact() def got_disconnected(self): ChatControl.got_disconnected(self) + self.parent_win.redraw_tab(self) + ChatControl.update_ui(self) + + def got_connected(self): + ChatControl.got_connected(self) + ChatControl.update_ui(self) ===================================== gajim/roster_window.py ===================================== @@ -2591,21 +2591,6 @@ class RosterWindow: if app.events.get_events(account, obj.jid): ctrl.read_queue() - def _nec_gc_presence_received(self, obj): - account = obj.conn.name - if obj.room_jid in app.interface.minimized_controls[account]: - gc_ctrl = app.interface.minimized_controls[account][obj.room_jid] - else: - return - - if obj.nick == gc_ctrl.nick: - contact = app.contacts.get_contact_with_highest_priority( - account, obj.room_jid) - if contact: - contact.show = obj.show - self.draw_contact(obj.room_jid, account) - self.draw_group(_('Groupchats'), account) - def _nec_roster_received(self, obj): if obj.received_from_server: self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) @@ -5860,10 +5845,6 @@ class RosterWindow: app.ged.register_event_handler('presence-received', ged.GUI1, self._nec_presence_received) - # presence has to be fully handled so that contact is added to occupant - # list before roster can be correctly updated - app.ged.register_event_handler('gc-presence-received', ged.GUI2, - self._nec_gc_presence_received) app.ged.register_event_handler('roster-received', ged.GUI1, self._nec_roster_received) app.ged.register_event_handler('anonymous-auth', ged.GUI1, ===================================== gajim/vcard.py ===================================== @@ -372,11 +372,11 @@ class VcardWindow: ask_label = self.xml.get_object('ask_label') if self.gc_contact: self.xml.get_object('subscription_title_label').set_markup(Q_("?Role in Group Chat:Role:")) - uf_role = helpers.get_uf_role(self.gc_contact.role) + uf_role = helpers.get_uf_role(self.gc_contact.role.value) subscription_label.set_text(uf_role) self.xml.get_object('ask_title_label').set_markup(_("Affiliation:")) - uf_affiliation = helpers.get_uf_affiliation(self.gc_contact.affiliation) + uf_affiliation = helpers.get_uf_affiliation(self.gc_contact.affiliation.value) ask_label.set_text(uf_affiliation) else: uf_sub = helpers.get_uf_sub(self.contact.sub) ===================================== win/_base.sh ===================================== @@ -92,8 +92,9 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six + build_pip install precis-i18n + PIP_REQUIREMENTS="\ -precis-i18n git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8094cadbead2bdb5638cb79beb2064a5f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8094cadbead2bdb5638cb79beb2064a5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 5 commits: Add Idle (XEP-0319) module
by Philipp Hörist 30 Dec '18

30 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 58ad3a9b by Philipp Hörist at 2018-12-27T23:29:56Z Add Idle (XEP-0319) module - - - - - 4b4476d2 by Philipp Hörist at 2018-12-30T18:49:03Z Add Signed (XEP-0027) module - - - - - a6f414a3 by Philipp Hörist at 2018-12-30T18:49:08Z Parse presence delays - - - - - 5e78d092 by Philipp Hörist at 2018-12-30T18:49:08Z Add VCardAvatar (XEP-0153) module - - - - - 3959f580 by Philipp Hörist at 2018-12-30T18:49:08Z Extend MUC module - Parse more MUC features - - - - - 10 changed files: - nbxmpp/const.py - nbxmpp/dispatcher_nb.py - nbxmpp/modules/delay.py - + nbxmpp/modules/idle.py - nbxmpp/modules/muc.py - nbxmpp/modules/presence.py - + nbxmpp/modules/signed.py - + nbxmpp/modules/vcard_avatar.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -65,9 +65,17 @@ class PresenceType(Enum): UNSUBSCRIBED = 'unsubscribed' ERROR = 'error' + @property + def is_available(self): + return self == PresenceType.AVAILABLE + + @property + def is_unavailable(self): + return self == PresenceType.UNAVAILABLE + class PresenceShow(Enum): - ONLINE = None + ONLINE = 'online' CHAT = 'chat' AWAY = 'away' XA = 'xa' @@ -87,6 +95,7 @@ class StatusCode(Enum): CONFIG_SEMI_ANONYMOUS = '173' CONFIG_FULL_ANONYMOUS = '174' CREATED = '201' + NICKNAME_MODIFIED = '210' REMOVED_BANNED = '301' NICKNAME_CHANGE = '303' REMOVED_KICKED = '307' @@ -99,3 +108,86 @@ class StatusCode(Enum): class InviteType(Enum): MEDIATED = 'mediated' DIRECT = 'direct' + + +class AvatarState(Enum): + IGNORE = 'ignore' + NOT_READY = 'not ready' + EMPTY = 'empty' + ADVERTISED = 'advertised' + + +class Affiliation(Enum): + OWNER = 'owner' + ADMIN = 'admin' + MEMBER = 'member' + OUTCAST = 'outcast' + NONE = 'none' + + @property + def is_owner(self): + return self == Affiliation.OWNER + + @property + def is_admin(self): + return self == Affiliation.ADMIN + + @property + def is_member(self): + return self == Affiliation.MEMBER + + @property + def is_outcast(self): + return self == Affiliation.OUTCAST + + @property + def is_none(self): + return self == Affiliation.NONE + + +class Role(Enum): + MODERATOR = 'moderator' + PARTICIPANT = 'participant' + VISITOR = 'visitor' + NONE = 'none' + + @property + def is_moderator(self): + return self == Role.MODERATOR + + @property + def is_participant(self): + return self == Role.PARTICIPANT + + @property + def is_visitor(self): + return self == Role.VISITOR + + @property + def is_none(self): + return self == Role.NONE + + +class Error(Enum): + BAD_REQUEST = 'bad-request' + CONFLICT = 'conflict' + FEATURE_NOT_IMPLEMENTED = 'feature-not-implemented' + FORBIDDEN = 'forbidden' + GONE = 'gone' + INTERNAL_SERVER_ERROR = 'internal-server-error' + ITEM_NOT_FOUND = 'item-not-found' + JID_MALFORMED = 'jid-malformed' + NOT_ACCEPTABLE = 'not-acceptable' + NOT_ALLOWED = 'not-allowed' + NOT_AUTHORIZED = 'not-authorized' + PAYMENT_REQUIRED = 'payment-required' + RECIPIENT_UNAVAILABLE = 'recipient-unavailable' + REDIRECT = 'redirect' + REGISTRATION_REQUIRED = 'registration-required' + REMOTE_SERVER_NOT_FOUND = 'remote-server-not-found' + REMOTE_SERVER_TIMEOUT = 'remote-server-timeout' + RESOURCE_CONSTRAINT = 'resource-constraint' + SERVICE_UNAVAILABLE = 'service-unavailable' + SUBSCRIPTION_REQUIRED = 'subscription-required' + UNDEFINED_CONDITION = 'undefined-condition' + UNEXPECTED_REQUEST = 'unexpected-request' ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -48,6 +48,9 @@ from nbxmpp.modules.message import BaseMessage from nbxmpp.modules.nickname import Nickname from nbxmpp.modules.delay import Delay from nbxmpp.modules.muc import MUC +from nbxmpp.modules.idle import Idle +from nbxmpp.modules.signed import Signed +from nbxmpp.modules.vcard_avatar import VCardAvatar from nbxmpp.modules.captcha import Captcha from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.util import get_properties_struct @@ -165,6 +168,9 @@ class XMPPDispatcher(PlugIn): self._modules['MUC'] = MUC(self._owner) self._modules['Delay'] = Delay(self._owner) self._modules['Captcha'] = Captcha(self._owner) + self._modules['Idle'] = Idle(self._owner) + self._modules['Signed'] = Signed(self._owner) + self._modules['VCardAvatar'] = VCardAvatar(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/delay.py ===================================== @@ -29,12 +29,16 @@ class Delay: self._client = client self.handlers = [ StanzaHandler(name='message', - callback=self._process_delay, + callback=self._process_message_delay, + ns=NS_DELAY2, + priority=15), + StanzaHandler(name='presence', + callback=self._process_presence_delay, ns=NS_DELAY2, priority=15) ] - def _process_delay(self, _con, stanza, properties): + def _process_message_delay(self, _con, stanza, properties): if properties.is_muc_subject: # MUC Subjects can have a delay timestamp # to indicate when the user has set the subject, @@ -51,6 +55,10 @@ class Delay: properties.user_timestamp = parse_delay(stanza, not_from=[jid]) + @staticmethod + def _process_presence_delay(_con, stanza, properties): + properties.user_timestamp = parse_delay(stanza) + def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): ''' ===================================== nbxmpp/modules/idle.py ===================================== @@ -0,0 +1,54 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_IDLE +from nbxmpp.structs import StanzaHandler +from nbxmpp.modules.date_and_time import parse_datetime + +log = logging.getLogger('nbxmpp.m.idle') + + +class Idle: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='presence', + callback=self._process_idle, + ns=NS_IDLE, + priority=15) + ] + + @staticmethod + def _process_idle(_con, stanza, properties): + idle_tag = stanza.getTag('idle', namespace=NS_IDLE) + if idle_tag is None: + return + + since = idle_tag.getAttr('since') + if since is None: + log.warning('No since attr in idle node') + log.warning(stanza) + return + + timestamp = parse_datetime(since, convert='utc', epoch=True) + if timestamp is None: + log.warning('Invalid timestamp received: %s', since) + log.warning(stanza) + + properties.idle_timestamp = timestamp ===================================== nbxmpp/modules/muc.py ===================================== @@ -37,12 +37,16 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.const import InviteType from nbxmpp.const import MessageType from nbxmpp.const import StatusCode +from nbxmpp.const import Affiliation +from nbxmpp.const import Role from nbxmpp.structs import DeclineData from nbxmpp.structs import InviteData from nbxmpp.structs import VoiceRequest from nbxmpp.structs import AffiliationResult from nbxmpp.structs import CommonResult from nbxmpp.structs import MucConfigResult +from nbxmpp.structs import MucUserData +from nbxmpp.structs import MucDestroyed from nbxmpp.util import validate_jid from nbxmpp.util import call_on_response from nbxmpp.util import callback @@ -93,14 +97,77 @@ class MUC: if muc is None: return properties.from_muc = True + properties.muc_nickname = properties.jid.getResource() @staticmethod def _process_muc_user_presence(_con, stanza, properties): - muc = stanza.getTag('x', namespace=NS_MUC_USER) - if muc is None: + muc_user = stanza.getTag('x', namespace=NS_MUC_USER) + if muc_user is None: return properties.from_muc = True + destroy = muc_user.getTag('destroy') + if destroy is not None: + alternate = destroy.getAttr('jid') + if alternate is not None: + try: + alternate = JID(validate_jid(alternate)) + except InvalidJid as error: + log.warning('Invalid alternate JID provided') + log.warning(stanza) + alternate = None + properties.muc_destroyed = MucDestroyed( + alternate=alternate, + reason=muc_user.getTagData('reason'), + password=muc_user.getTagData('password')) + return + + properties.muc_nickname = properties.jid.getResource() + + # https://xmpp.org/extensions/xep-0045.html#registrar-statuscodes + message_status_codes = [ + StatusCode.NON_ANONYMOUS, + StatusCode.SELF, + StatusCode.CONFIG_ROOM_LOGGING, + StatusCode.CREATED, + StatusCode.NICKNAME_MODIFIED, + StatusCode.REMOVED_BANNED, + StatusCode.NICKNAME_CHANGE, + StatusCode.REMOVED_KICKED, + StatusCode.REMOVED_AFFILIATION_CHANGE, + StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY, + StatusCode.REMOVED_SERVICE_SHUTDOWN, + StatusCode.REMOVED_ERROR, + ] + + codes = set() + for status in muc_user.getTags('status'): + try: + code = StatusCode(status.getAttr('code')) + except ValueError: + log.warning('Received invalid status code: %s', + status.getAttr('code')) + log.warning(stanza) + continue + if code in message_status_codes: + codes.add(code) + + if codes: + properties.muc_status_codes = codes + + item = muc_user.getTag('item') + if item is not None: + item_dict = item.getAttrs() + if 'role' in item_dict: + item_dict['role'] = Role(item_dict['role']) + if 'affiliation' in item_dict: + item_dict['affiliation'] = Affiliation(item_dict['affiliation']) + if 'jid' in item_dict: + item_dict['jid'] = JID(item_dict['jid']) + item_dict['actor'] = item.getTagAttr('actor', 'nick') + item_dict['reason'] = item.getTagData('reason') + properties.muc_user = MucUserData(**item_dict) + @staticmethod def _process_groupchat_message(_con, _stanza, properties): properties.from_muc = True ===================================== nbxmpp/modules/presence.py ===================================== @@ -17,10 +17,11 @@ import logging -from nbxmpp.protocol import Error +from nbxmpp.protocol import Error as ErrorStanza from nbxmpp.protocol import ERR_BAD_REQUEST from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import ErrorProperties from nbxmpp.const import PresenceType from nbxmpp.const import PresenceShow @@ -45,8 +46,7 @@ class BasePresence: properties.status = stanza.getStatus() if properties.type == PresenceType.ERROR: - properties.error_code = stanza.getErrorCode() - properties.error_message = stanza.getErrorMsg() + properties.error = ErrorProperties(stanza) own_jid = self._client.get_bound_jid() if own_jid == stanza.getFrom(): @@ -79,12 +79,14 @@ class BasePresence: except ValueError: log.warning('Presence with invalid type received') log.warning(stanza) - self._client.send(Error(stanza, ERR_BAD_REQUEST)) + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) raise NodeProcessed @staticmethod def _parse_show(stanza): show = stanza.getShow() + if show is None: + return PresenceShow.ONLINE try: return PresenceShow(show) except ValueError: ===================================== nbxmpp/modules/signed.py ===================================== @@ -0,0 +1,42 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_SIGNED +from nbxmpp.structs import StanzaHandler + +log = logging.getLogger('nbxmpp.m.signed') + + +class Signed: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='presence', + callback=self._process_signed, + ns=NS_SIGNED, + priority=15) + ] + + @staticmethod + def _process_signed(_con, stanza, properties): + signed = stanza.getTag('x', namespace=NS_SIGNED) + if signed is None: + return + + properties.signed = signed.getData() ===================================== nbxmpp/modules/vcard_avatar.py ===================================== @@ -0,0 +1,61 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_VCARD_UPDATE +from nbxmpp.structs import StanzaHandler +from nbxmpp.const import PresenceType +from nbxmpp.const import AvatarState + +log = logging.getLogger('nbxmpp.m.vcard_avatar') + + +class VCardAvatar: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='presence', + callback=self._process_avatar, + ns=NS_VCARD_UPDATE, + priority=15) + ] + + @staticmethod + def _process_avatar(_con, stanza, properties): + if properties.type != PresenceType.AVAILABLE: + return + + update = stanza.getTag('x', namespace=NS_VCARD_UPDATE) + if update is None: + return + + avatar_sha = update.getTagData('photo') + if avatar_sha is None: + properties.avatar_state = AvatarState.NOT_READY + log.info('%s is not ready to promote an avatar', stanza.getFrom()) + # Empty update element, ignore + return + + if avatar_sha == '': + properties.avatar_state = AvatarState.EMPTY + log.info('%s empty avatar advertised', stanza.getFrom()) + return + + properties.avatar_sha = avatar_sha + properties.avatar_state = AvatarState.ADVERTISED + log.info('%s advertises %s', stanza.getFrom(), avatar_sha) ===================================== nbxmpp/protocol.py ===================================== @@ -979,6 +979,12 @@ class Protocol(Node): """ return self.getTagAttr('error', 'code') + def getErrorType(self): + """ + Return the error code. Obsolete. + """ + return self.getTagAttr('error', 'type') + def getStatusConditions(self, as_code=False): """ Return the status conditions list as defined in XEP-0306. ===================================== nbxmpp/structs.py ===================================== @@ -18,7 +18,13 @@ import time from collections import namedtuple +from nbxmpp.protocol import JID +from nbxmpp.protocol import NS_STANZAS from nbxmpp.const import MessageType +from nbxmpp.const import AvatarState +from nbxmpp.const import StatusCode +from nbxmpp.const import PresenceType +from nbxmpp.const import Error StanzaHandler = namedtuple('StanzaHandler', 'name callback typ ns xmlns system priority') @@ -35,6 +41,11 @@ BobData = namedtuple('BobData', 'algo hash_ max_age data cid type') VoiceRequest = namedtuple('VoiceRequest', 'form') +MucUserData = namedtuple('MucUserData', 'affiliation jid nick role actor reason') +MucUserData.__new__.__defaults__ = (None, None, None, None, None) + +MucDestroyed = namedtuple('MucDestroyed', 'alternate reason password') +MucDestroyed.__new__.__defaults__ = (None, None, None) class Properties: pass @@ -118,8 +129,98 @@ class PresenceProperties: self.self_presence = False self.from_muc = False self.status = '' - self.error_message = '' - self.error_code = '' + self.timestamp = time.time() + self.user_timestamp = None + self.idle_timestamp = None + self.signed = None + self.error = None + self.avatar_sha = None + self.avatar_state = AvatarState.IGNORE + self.muc_status_codes = None + self.muc_user = None + self.muc_nickname = None + self.muc_destroyed = None + + @property + def is_muc_destroyed(self): + return self.muc_destroyed is not None + + @property + def is_muc_self_presence(self): + return (self.from_muc and + self.muc_status_codes is not None and + StatusCode.SELF in self.muc_status_codes) + + @property + def is_nickname_changed(self): + return (self.from_muc and + self.muc_status_codes is not None and + self.muc_user.nick is not None and + StatusCode.NICKNAME_CHANGE in self.muc_status_codes and + self.type == PresenceType.UNAVAILABLE) + + @property + def new_jid(self): + if not self.is_nickname_changed: + raise ValueError('This is not a nickname change') + jid = JID(self.jid) + jid.setResource(self.muc_user.nick) + return jid + + @property + def is_kicked(self): + status_codes = { + StatusCode.REMOVED_BANNED, + StatusCode.REMOVED_KICKED, + StatusCode.REMOVED_AFFILIATION_CHANGE, + StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY, + StatusCode.REMOVED_ERROR + } + return (self.from_muc and + self.muc_status_codes is not None and + status_codes.intersection(self.muc_status_codes) and + self.type == PresenceType.UNAVAILABLE) + + @property + def is_muc_shutdown(self): + return (self.from_muc and + self.muc_status_codes is not None and + StatusCode.REMOVED_SERVICE_SHUTDOWN in self.muc_status_codes) + + @property + def is_new_room(self): + status_codes = { + StatusCode.CREATED, + StatusCode.SELF + } + return (self.from_muc and + self.muc_status_codes is not None and + status_codes.issubset(self.muc_status_codes)) + + @property + def affiliation(self): + try: + return self.muc_user.affiliation + except Exception: + return None + + @property + def role(self): + try: + return self.muc_user.role + except Exception: + return None + + +class ErrorProperties: + def __init__(self, stanza): + for child in stanza.getTag('error').getChildren(): + if child.getNamespace() == NS_STANZAS: + self.type = Error(child.name) + break + self.legacy_code = stanza.getErrorCode() + self.legacy_type = stanza.getErrorType() + self.message = stanza.getErrorMsg() class BaseResult: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f80bbaa61e97666291795eb5c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f80bbaa61e97666291795eb5c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor MUC module
by Philipp Hörist 27 Dec '18

27 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8094cadb by Philipp Hörist at 2018-12-27T21:13:35Z Refactor MUC module - nbxmpp provides now most of the MUC code - - - - - 14 changed files: - gajim/chat_control.py - gajim/common/app.py - gajim/common/contacts.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/groupchat_config.py - gajim/gtk/notification.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1482,12 +1482,12 @@ class ChatControl(ChatControlBase): self._add_info_bar_message(markup, [b], file_props, Gtk.MessageType.ERROR) def _on_accept_gc_invitation(self, widget, event): - if event.is_continued: - app.interface.join_gc_room(self.account, event.room_jid, + if event.continued: + app.interface.join_gc_room(self.account, str(event.muc), app.nicks[self.account], event.password, is_continued=True) else: - app.interface.join_gc_minimal(self.account, event.room_jid) + app.interface.join_gc_minimal(self.account, str(event.muc)) app.events.remove_events(self.account, self.contact.jid, event=event) @@ -1495,14 +1495,14 @@ class ChatControl(ChatControlBase): app.events.remove_events(self.account, self.contact.jid, event=event) def _get_gc_invitation(self, event): - markup = '%s: %s' % (_('Groupchat Invitation'), event.room_jid) + markup = '%s: %s' % (_('Groupchat Invitation'), event.muc) if event.reason: markup += ' (%s)' % event.reason b1 = Gtk.Button.new_with_mnemonic(_('_Join')) b1.connect('clicked', self._on_accept_gc_invitation, event) b2 = Gtk.Button(stock=Gtk.STOCK_CANCEL) b2.connect('clicked', self._on_cancel_gc_invitation, event) - self._add_info_bar_message(markup, [b1, b2], (event.room_jid, + self._add_info_bar_message(markup, [b1, b2], (event.muc, event.reason), Gtk.MessageType.QUESTION) def on_event_added(self, event): @@ -1546,7 +1546,7 @@ class ChatControl(ChatControlBase): removed = False for ib_msg in self.info_bar_queue: if ev.type_ == 'gc-invitation': - if ev.room_jid == ib_msg[2][0]: + if ev.muc == ib_msg[2][0]: self.info_bar_queue.remove(ib_msg) removed = True else: # file-* ===================================== gajim/common/app.py ===================================== @@ -480,6 +480,7 @@ def zeroconf_is_connected(): config.get_per('accounts', ZEROCONF_ACC_NAME, 'is_zeroconf') def in_groupchat(account, room_jid): + room_jid = str(room_jid) if room_jid not in gc_connected[account]: return False return gc_connected[account][room_jid] ===================================== gajim/common/contacts.py ===================================== @@ -307,12 +307,12 @@ class LegacyContactsAPI: return self_contact def create_not_in_roster_contact(self, jid, account, resource='', name='', - keyID=''): + keyID='', groupchat=False): # Use Account object if available account = self._accounts.get(account, account) return self.create_contact(jid=jid, account=account, resource=resource, name=name, groups=[_('Not in Roster')], show='not in roster', - status='', sub='none', keyID=keyID) + status='', sub='none', keyID=keyID, groupchat=groupchat) def copy_contact(self, contact): return self.create_contact(contact.jid, contact.account, ===================================== gajim/common/events.py ===================================== @@ -130,15 +130,10 @@ class UnsubscribedEvent(Event): class GcInvitationtEvent(Event): type_ = 'gc-invitation' - def __init__(self, room_jid, reason, password, is_continued, jid_from, - time_=None, show_in_roster=False, show_in_systray=True): - Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) - self.room_jid = room_jid - self.reason = reason - self.password = password - self.is_continued = is_continued - self.jid_from = jid_from + def __init__(self, event): + Event.__init__(self, None, show_in_roster=False, show_in_systray=True) + for key, value in vars(event).items(): + setattr(self, key, value) class FileRequestEvent(Event): type_ = 'file-request' ===================================== gajim/common/helpers.py ===================================== @@ -1462,6 +1462,15 @@ def load_json(path, key=None, default=None): return json_dict return json_dict.get(key, default) +def ignore_contact(account, jid): + jid = str(jid) + known_contact = app.contacts.get_contacts(account, jid) + ignore = app.config.get_per('accounts', account, 'ignore_unknown_contacts') + if ignore and not known_contact: + log.info('Ignore unknown contact %s', jid) + return True + return False + class AdditionalDataDict(collections.UserDict): def __init__(self, initialdata=None): collections.UserDict.__init__(self, initialdata) ===================================== gajim/common/modules/bits_of_binary.py ===================================== @@ -170,5 +170,29 @@ def parse_bob_data(stanza): return filepath +def store_bob_data(bob_data): + if bob_data is None: + return + + algo_hash = '%s+%s' % (bob_data.algo, bob_data.hash_) + + filepath = Path(configpaths.get('BOB')) / algo_hash + if algo_hash in app.bob_cache or filepath.exists(): + log.info('BoB data already cached') + return + + if bob_data.max_age == 0: + app.bob_cache[algo_hash] = bob_data.data + else: + try: + with open(str(filepath), 'w+b') as file: + file.write(bob_data.data) + except Exception: + log.exception('Unable to save data') + return + log.info('BoB data stored: %s', algo_hash) + return filepath + + def get_instance(*args, **kwargs): return BitsOfBinary(*args, **kwargs), 'BitsOfBinary' ===================================== gajim/common/modules/message.py ===================================== @@ -212,31 +212,14 @@ class Message: subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' - # XEP-0045: only a message that contains a <subject/> but no <body/> - # element shall be considered a subject change for MUC purposes. - muc_subject = subject and groupchat and not event.msgtxt - # Determine timestamps - if groupchat: - delay_entity_jid = event.jid - else: - delay_entity_jid = self._con.get_own_jid().getDomain() - - if muc_subject: - # MUC Subjects can have a delay timestamp - # to indicate when the user has set the subject, - # the 'from' attr on these delays is the MUC server - # but we treat it as user timestamp + delay_jid = self._con.get_own_jid().getDomain() + timestamp = parse_delay(event.stanza, from_=delay_jid) + if timestamp is None: timestamp = time.time() - user_timestamp = parse_delay(event.stanza, from_=delay_entity_jid) - - else: - timestamp = parse_delay(event.stanza, from_=delay_entity_jid) - if timestamp is None: - timestamp = time.time() - user_timestamp = parse_delay(event.stanza, - not_from=[delay_entity_jid]) + user_timestamp = parse_delay(event.stanza, + not_from=[delay_jid]) if user_timestamp is not None: event.additional_data.set_value( @@ -271,11 +254,6 @@ class Message: event.session, event.fjid, timestamp) return - if muc_subject: - app.nec.push_incoming_event(NetworkEvent('gc-subject-received', - **vars(event))) - return - if groupchat: if not event.msgtxt: return ===================================== gajim/common/modules/muc.py ===================================== @@ -17,18 +17,17 @@ import time import logging -import weakref import nbxmpp +from nbxmpp.const import InviteType +from nbxmpp.structs import StanzaHandler from gajim.common import i18n from gajim.common import app from gajim.common import helpers from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent -from gajim.common.nec import NetworkIncomingEvent -from gajim.common.modules import dataforms -from gajim.common.modules.bits_of_binary import parse_bob_data +from gajim.common.modules.bits_of_binary import store_bob_data log = logging.getLogger('gajim.c.m.muc') @@ -39,13 +38,55 @@ class MUC: self._account = con.name self.handlers = [ - ('message', self._on_config_change, '', nbxmpp.NS_MUC_USER), - ('message', self._mediated_invite, 'normal', nbxmpp.NS_MUC_USER), - ('message', self._direct_invite, '', nbxmpp.NS_CONFERENCE), - ('message', self._on_captcha_challenge, '', nbxmpp.NS_CAPTCHA), - ('message', self._on_voice_request, '', nbxmpp.NS_DATA, 45), + StanzaHandler(name='message', + callback=self._on_subject_change, + typ='groupchat', + priority=49), + StanzaHandler(name='message', + callback=self._on_config_change, + ns=nbxmpp.NS_MUC_USER, + priority=49), + StanzaHandler(name='message', + callback=self._on_invite_or_decline, + typ='normal', + ns=nbxmpp.NS_MUC_USER, + priority=49), + StanzaHandler(name='message', + callback=self._on_invite_or_decline, + ns=nbxmpp.NS_CONFERENCE, + priority=49), + StanzaHandler(name='message', + callback=self._on_captcha_challenge, + ns=nbxmpp.NS_CAPTCHA, + priority=49), + StanzaHandler(name='message', + callback=self._on_voice_request, + ns=nbxmpp.NS_DATA, + priority=49) ] + self._nbmxpp_methods = [ + 'get_affiliation', + 'set_role', + 'set_affiliation', + 'set_config', + 'set_subject', + 'cancel_config', + 'send_captcha', + 'decline', + 'request_voice' + 'destroy', + ] + + def __getattr__(self, key): + if key in self._nbmxpp_methods: + if not app.account_is_connected(self._account): + log.warning('Account %s not connected, cant use %s', + self._account, key) + return + module = self._con.connection.get_module('MUC') + return getattr(module, key) + def pass_disco(self, from_, identities, features, _data, _node): for identity in identities: if identity.get('category') != 'conference': @@ -108,438 +149,136 @@ class MUC: if tags: muc_x.setTag('history', tags) - def set_subject(self, room_jid, subject): - if not app.account_is_connected(self._account): + def _on_subject_change(self, _con, _stanza, properties): + if not properties.is_muc_subject: return - message = nbxmpp.Message(room_jid, typ='groupchat', subject=subject) - log.info('Set subject for %s', room_jid) - self._con.connection.send(message) - def _on_voice_request(self, _con, stanza): - data_form = stanza.getTag('x', namespace=nbxmpp.NS_DATA) - if data_form is None: - return - - if stanza.getBody(): - return - - room_jid = str(stanza.getFrom()) - contact = app.contacts.get_groupchat_contact(self._account, room_jid) + jid = properties.jid.getBare() + contact = app.contacts.get_groupchat_contact(self._account, jid) if contact is None: return - data_form = dataforms.extend_form(data_form) - try: - if data_form['FORM_TYPE'].value != nbxmpp.NS_MUC_REQUEST: - return - except KeyError: - return + contact.status = properties.subject app.nec.push_incoming_event( - NetworkEvent('voice-approval', + NetworkEvent('gc-subject-received', account=self._account, - room_jid=room_jid, - form=data_form)) + jid=jid, + subject=properties.subject, + nickname=properties.muc_nickname, + user_timestamp=properties.user_timestamp)) raise nbxmpp.NodeProcessed - def _on_captcha_challenge(self, _con, stanza): - captcha = stanza.getTag('captcha', namespace=nbxmpp.NS_CAPTCHA) - if captcha is None: + def _on_voice_request(self, _con, _stanza, properties): + if not properties.is_voice_request: return - parse_bob_data(stanza) - room_jid = str(stanza.getFrom()) - contact = app.contacts.get_groupchat_contact(self._account, room_jid) + jid = str(properties.jid) + contact = app.contacts.get_groupchat_contact(self._account, jid) if contact is None: return - log.info('Captcha challenge received from %s', room_jid) - data_form = captcha.getTag('x', namespace=nbxmpp.NS_DATA) - data_form = dataforms.extend_form(node=data_form) app.nec.push_incoming_event( - NetworkEvent('captcha-challenge', + NetworkEvent('voice-approval', account=self._account, - room_jid=room_jid, - form=data_form)) + jid=jid, + form=properties.voice_request.form)) raise nbxmpp.NodeProcessed - def send_captcha(self, room_jid, form_node): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='set', to=room_jid) - captcha = iq.addChild(name='captcha', namespace=nbxmpp.NS_CAPTCHA) - captcha.addChild(node=form_node) - self._con.connection.send(iq) - - def request_config(self, room_jid): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='get', - queryNS=nbxmpp.NS_MUC_OWNER, - to=room_jid) - iq.setAttr('xml:lang', i18n.LANG) - log.info('Request config for %s', room_jid) - self._con.connection.SendAndCallForResponse( - iq, self._config_received) - - def _config_received(self, stanza): - if not nbxmpp.isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return - - room_jid = stanza.getFrom().getStripped() - payload = stanza.getQueryPayload() - - for form in payload: - if form.getNamespace() == nbxmpp.NS_DATA: - dataform = dataforms.extend_form(node=form) - log.info('Config form received for %s', room_jid) - app.nec.push_incoming_event(MucOwnerReceivedEvent( - None, - conn=self._con, - form_node=form, - dataform=dataform, - jid=room_jid)) - break - - def cancel_config(self, room_jid): - if not app.account_is_connected(self._account): - return - cancel = nbxmpp.Node(tag='x', attrs={'xmlns': nbxmpp.NS_DATA, - 'type': 'cancel'}) - iq = nbxmpp.Iq(typ='set', - queryNS=nbxmpp.NS_MUC_OWNER, - payload=cancel, - to=room_jid) - log.info('Cancel config for %s', room_jid) - self._con.connection.SendAndCallForResponse( - iq, self._default_response, {}) - - def _on_config_change(self, _con, stanza): - muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is None: - return - - if stanza.getBody(): + def _on_captcha_challenge(self, _con, _stanza, properties): + if not properties.is_captcha_challenge: return - room_list = app.contacts.get_gc_list(self._account) - room_jid = str(stanza.getFrom()) - if room_jid not in room_list: - # Message not from a group chat + contact = app.contacts.get_groupchat_contact(self._account, + str(properties.jid)) + if contact is None: return - # https://xmpp.org/extensions/xep-0045.html#registrar-statuscodes - change_codes = ['100', '102', '103', '104', - '170', '171', '172', '173', '174'] + log.info('Captcha challenge received from %s', properties.jid) + store_bob_data(properties.captcha.bob_data) - codes = set() - for status in muc_user.getTags('status'): - code = status.getAttr('code') - if code in change_codes: - codes.add(code) + app.nec.push_incoming_event( + NetworkEvent('captcha-challenge', + account=self._account, + jid=properties.jid, + form=properties.captcha.form)) + raise nbxmpp.NodeProcessed - if not codes: + def _on_config_change(self, _con, _stanza, properties): + if not properties.is_muc_config_change: return - log.info('Received config change: %s', codes) + log.info('Received config change: %s %s', + properties.jid, properties.muc_status_codes) app.nec.push_incoming_event( NetworkEvent('gc-config-changed-received', account=self._account, - room_jid=room_jid, - status_codes=codes)) + jid=properties.jid, + status_codes=properties.muc_status_codes)) raise nbxmpp.NodeProcessed - def destroy(self, room_jid, reason='', jid=''): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='set', - queryNS=nbxmpp.NS_MUC_OWNER, - to=room_jid) - destroy = iq.setQuery().setTag('destroy') - if reason: - destroy.setTagData('reason', reason) - if jid: - destroy.setAttr('jid', jid) - log.info('Destroy room: %s, reason: %s, alternate: %s', - room_jid, reason, jid) - self._con.connection.SendAndCallForResponse( - iq, self._default_response, {}) - - def set_config(self, room_jid, form): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='set', to=room_jid, queryNS=nbxmpp.NS_MUC_OWNER) - query = iq.setQuery() - form.setAttr('type', 'submit') - query.addChild(node=form) - log.info('Set config for %s', room_jid) - self._con.connection.SendAndCallForResponse( - iq, self._default_response, {}) - - def set_affiliation(self, room_jid, users_dict): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='set', to=room_jid, queryNS=nbxmpp.NS_MUC_ADMIN) - item = iq.setQuery() - for jid in users_dict: - affiliation = users_dict[jid].get('affiliation') - reason = users_dict[jid].get('reason') - nick = users_dict[jid].get('nick') - item_tag = item.addChild('item', {'jid': jid, - 'affiliation': affiliation}) - if reason is not None: - item_tag.setTagData('reason', reason) - - if nick is not None: - item_tag.setAttr('nick', nick) - log.info('Set affiliation for %s: %s', room_jid, users_dict) - self._con.connection.SendAndCallForResponse( - iq, self._default_response, {}) - - def get_affiliation(self, room_jid, affiliation, success_cb, error_cb): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='get', to=room_jid, queryNS=nbxmpp.NS_MUC_ADMIN) - item = iq.setQuery().setTag('item') - item.setAttr('affiliation', affiliation) - log.info('Get affiliation %s for %s', affiliation, room_jid) - - weak_success_cb = weakref.WeakMethod(success_cb) - weak_error_cb = weakref.WeakMethod(error_cb) - - self._con.connection.SendAndCallForResponse( - iq, self._affiliation_received, {'affiliation': affiliation, - 'success_cb': weak_success_cb, - 'error_cb': weak_error_cb}) - - def _affiliation_received(self, _con, stanza, affiliation, - success_cb, error_cb): - if not nbxmpp.isResultNode(stanza): - if error_cb() is not None: - error_cb()(affiliation, stanza.getError()) - return - - room_jid = stanza.getFrom().getStripped() - query = stanza.getTag('query', namespace=nbxmpp.NS_MUC_ADMIN) - items = query.getTags('item') - users_dict = {} - for item in items: - try: - jid = helpers.parse_jid(item.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - item.getAttr('jid')) - continue - - users_dict[jid] = {} - if item.has_attr('nick'): - users_dict[jid]['nick'] = item.getAttr('nick') - if item.has_attr('role'): - users_dict[jid]['role'] = item.getAttr('role') - reason = item.getTagData('reason') - if reason: - users_dict[jid]['reason'] = reason - - log.info('%s affiliations received from %s: %s', - affiliation, room_jid, users_dict) - - if success_cb() is not None: - success_cb()(self._account, room_jid, affiliation, users_dict) - - def set_role(self, room_jid, nick, role, reason=''): - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='set', to=room_jid, queryNS=nbxmpp.NS_MUC_ADMIN) - item = iq.setQuery().setTag('item') - item.setAttr('nick', nick) - item.setAttr('role', role) - if reason: - item.addChild(name='reason', payload=reason) - log.info('Set role for %s: %s %s %s', room_jid, nick, role, reason) - self._con.connection.SendAndCallForResponse( - iq, self._default_response, {}) - - def _mediated_invite(self, _con, stanza): - muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is None: - return - - if stanza.getType() == 'error': - return - - if stanza.getBody(): - return - - decline = muc_user.getTag('decline') - if decline is not None: + def _on_invite_or_decline(self, _con, _stanza, properties): + if properties.muc_decline is not None: + data = properties.muc_decline + if helpers.ignore_contact(self._account, data.from_): + raise nbxmpp.NodeProcessed - room_jid = stanza.getFrom().getStripped() - from_ = self._get_from(room_jid, decline) + log.info('Invite declined from: %s, reason: %s', + data.from_, data.reason) - reason = decline.getTagData('reason') - log.info('Invite declined: %s, %s', reason, from_) app.nec.push_incoming_event( - GcDeclineReceived(None, - account=self._account, - from_=from_, - room_jid=room_jid, - reason=reason)) + NetworkEvent('gc-decline-received', + account=self._account, + **data._asdict())) raise nbxmpp.NodeProcessed - invite = muc_user.getTag('invite') - if invite is not None: + if properties.muc_invite is not None: + data = properties.muc_invite + if helpers.ignore_contact(self._account, data.from_): + raise nbxmpp.NodeProcessed - room_jid = stanza.getFrom().getStripped() - from_ = self._get_from(room_jid, invite) + log.info('Invite from: %s, to: %s', data.from_, data.muc) - reason = invite.getTagData('reason') - password = muc_user.getTagData('password') - is_continued = invite.getTag('continue') is not None - log.info('Mediated invite: continued: %s, reason: %s, from: %s', - is_continued, reason, from_) - if room_jid in app.gc_connected[self._account] and \ - app.gc_connected[self._account][room_jid]: + if app.in_groupchat(self._account, data.muc): # We are already in groupchat. Ignore invitation log.info('We are already in this room') raise nbxmpp.NodeProcessed app.nec.push_incoming_event( - GcInvitationReceived(None, - account=self._account, - from_=from_, - room_jid=room_jid, - reason=reason, - password=password, - is_continued=is_continued)) - raise nbxmpp.NodeProcessed - - def _get_from(self, room_jid, stanza): - try: - from_ = nbxmpp.JID(helpers.parse_jid(stanza.getAttr('from'))) - except helpers.InvalidFormat: - log.warning('Invalid JID on invite: %s, ignoring it', - stanza.getAttr('from')) + NetworkEvent('gc-invitation-received', + account=self._account, + **data._asdict())) raise nbxmpp.NodeProcessed - known_contact = app.contacts.get_contacts(self._account, room_jid) - ignore = app.config.get_per( - 'accounts', self._account, 'ignore_unknown_contacts') - if ignore and not known_contact: - log.info('Ignore invite from unknown contact %s', from_) - raise nbxmpp.NodeProcessed - - return from_ - - def _direct_invite(self, _con, stanza): - direct = stanza.getTag('x', namespace=nbxmpp.NS_CONFERENCE) - if direct is None: - return - - from_ = stanza.getFrom() - - try: - room_jid = helpers.parse_jid(direct.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID on invite: %s, ignoring it', - direct.getAttr('jid')) - raise nbxmpp.NodeProcessed - - reason = direct.getAttr('reason') - password = direct.getAttr('password') - is_continued = direct.getAttr('continue') == 'true' - - log.info('Direct invite: continued: %s, reason: %s, from: %s', - is_continued, reason, from_) - - app.nec.push_incoming_event( - GcInvitationReceived(None, - account=self._account, - from_=from_, - room_jid=room_jid, - reason=reason, - password=password, - is_continued=is_continued)) - raise nbxmpp.NodeProcessed - def invite(self, room, to, reason=None, continue_=False): if not app.account_is_connected(self._account): return + + type_ = InviteType.MEDIATED contact = app.contacts.get_contact_from_full_jid(self._account, to) if contact and contact.supports(nbxmpp.NS_CONFERENCE): - invite = self._build_direct_invite(room, to, reason, continue_) - else: - invite = self._build_mediated_invite(room, to, reason, continue_) - self._con.connection.send(invite) - - @staticmethod - def _build_direct_invite(room, to, reason, continue_): - message = nbxmpp.Message(to=to) - attrs = {'jid': room} - if reason: - attrs['reason'] = reason - if continue_: - attrs['continue'] = 'true' - password = app.gc_passwords.get(room, None) - if password: - attrs['password'] = password - message.addChild(name='x', attrs=attrs, - namespace=nbxmpp.NS_CONFERENCE) - return message - - @staticmethod - def _build_mediated_invite(room, to, reason, continue_): - message = nbxmpp.Message(to=room) - muc_user = message.addChild('x', namespace=nbxmpp.NS_MUC_USER) - invite = muc_user.addChild('invite', attrs={'to': to}) - if continue_: - invite.addChild(name='continue') - if reason: - invite.setTagData('reason', reason) + type_ = InviteType.DIRECT + password = app.gc_passwords.get(room, None) - if password: - muc_user.setTagData('password', password) - return message + self._con.connection.get_module('MUC').invite( + room, to, reason, password, continue_, type_) - def decline(self, room, to, reason=None): - if not app.account_is_connected(self._account): - return - message = nbxmpp.Message(to=room) - muc_user = message.addChild('x', namespace=nbxmpp.NS_MUC_USER) - decline = muc_user.addChild('decline', attrs={'to': to}) - if reason: - decline.setTagData('reason', reason) - self._con.connection.send(message) - - def request_voice(self, room): + def request_config(self, room_jid): if not app.account_is_connected(self._account): return - message = nbxmpp.Message(to=room) - xdata = nbxmpp.DataForm(typ='submit') - xdata.addChild(node=nbxmpp.DataField(name='FORM_TYPE', - value=nbxmpp.NS_MUC + '#request')) - xdata.addChild(node=nbxmpp.DataField(name='muc#role', - value='participant', - typ='text-single')) - message.addChild(node=xdata) - self._con.connection.send(message) - @staticmethod - def _default_response(_con, stanza, **kwargs): - if not nbxmpp.isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - - -class GcInvitationReceived(NetworkIncomingEvent): - name = 'gc-invitation-received' - - -class GcDeclineReceived(NetworkIncomingEvent): - name = 'gc-decline-received' + self._con.connection.get_module('MUC').request_config( + room_jid, i18n.LANG, callback=self._config_received) + def _config_received(self, result): + if result.is_error: + return -class MucOwnerReceivedEvent(NetworkIncomingEvent): - name = 'muc-owner-received' + app.nec.push_incoming_event(NetworkEvent( + 'muc-owner-received', + conn=self._con, + dataform=result.form, + jid=result.jid)) def get_instance(*args, **kwargs): ===================================== gajim/dialogs.py ===================================== @@ -1291,51 +1291,60 @@ class RosterItemExchangeWindow: class InvitationReceivedDialog: - def __init__(self, account, room_jid, contact_fjid, password=None, - comment=None, is_continued=False): - - self.room_jid = room_jid + def __init__(self, account, event): self.account = account - self.password = password - self.is_continued = is_continued - self.contact_fjid = contact_fjid + self.room_jid = str(event.muc) + self.from_ = str(event.from_) + self.password = event.password + self.is_continued = event.continued - jid = app.get_jid_without_resource(contact_fjid) + if event.from_.bareMatch(event.muc): + contact_text = event.from_.getResource() + else: + contact = app.contacts.get_first_contact_from_jid( + account, event.from_.getBare()) + if contact is None: + contact_text = str(event.from_) + else: + contact_text = contact.get_shown_name() pritext = _('''You are invited to a groupchat''') #Don't translate $Contact - if is_continued: + if self.is_continued: sectext = _('$Contact has invited you to join a discussion') else: sectext = _('$Contact has invited you to group chat %(room_jid)s')\ - % {'room_jid': room_jid} - contact = app.contacts.get_first_contact_from_jid(account, jid) - contact_text = contact and contact.name or jid - sectext = i18n.direction_mark + sectext.replace('$Contact', - contact_text) + % {'room_jid': self.room_jid} + + sectext = sectext.replace('$Contact', contact_text) - if comment: # only if not None and not '' - comment = GLib.markup_escape_text(comment) + if event.reason: + comment = GLib.markup_escape_text(event.reason) comment = _('Comment: %s') % comment sectext += '\n\n%s' % comment sectext += '\n\n' + _('Do you want to accept the invitation?') - def on_yes(checked, text): + def on_yes(_checked, _text): if self.is_continued: - app.interface.join_gc_room(self.account, self.room_jid, - app.nicks[self.account], self.password, - is_continued=True) + app.interface.join_gc_room(self.account, + self.room_jid, + app.nicks[self.account], + self.password, + is_continued=True) else: - app.interface.join_gc_minimal( - self.account, self.room_jid, password=self.password) + app.interface.join_gc_minimal(self.account, + self.room_jid, + password=self.password) def on_no(text): app.connections[account].get_module('MUC').decline( - self.room_jid, self.contact_fjid, text) + self.room_jid, self.from_, text) - dlg = YesNoDialog(pritext, sectext, - text_label=_('Reason (if you decline):'), on_response_yes=on_yes, - on_response_no=on_no) + dlg = YesNoDialog(pritext, + sectext, + text_label=_('Reason (if you decline):'), + on_response_yes=on_yes, + on_response_no=on_no) dlg.set_title(_('Groupchat Invitation')) class ProgressDialog: ===================================== gajim/groupchat_control.py ===================================== @@ -33,6 +33,7 @@ import logging from enum import IntEnum, unique import nbxmpp +from nbxmpp.const import StatusCode from gi.repository import Gtk from gi.repository import Gdk @@ -1080,7 +1081,7 @@ class GroupchatControl(ChatControlBase): def _on_voice_approval(self, event): if event.account != self.account: return - if event.room_jid != self.room_jid: + if event.jid != self.room_jid: return SingleMessageWindow(self.account, self.room_jid, @@ -1091,7 +1092,7 @@ class GroupchatControl(ChatControlBase): def _on_captcha_challenge(self, event): if event.account != self.account: return - if event.room_jid != self.room_jid: + if event.jid != self.room_jid: return if self.form_widget: @@ -1419,11 +1420,11 @@ class GroupchatControl(ChatControlBase): return self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': event.resource, 'subject': event.subject} + 'nick': event.nickname, 'subject': event.subject} - if event.delayed: + if event.user_timestamp: date = time.strftime('%d-%m-%Y %H:%M:%S', - time.localtime(event.timestamp)) + time.localtime(event.user_timestamp)) text = '%s - %s' % (text, date) just_joined = self.join_time > time.time() - 10 @@ -1440,35 +1441,31 @@ class GroupchatControl(ChatControlBase): if event.account != self.account: return - if event.room_jid != self.room_jid: + if event.jid != self.room_jid: return changes = [] - if '100' in event.status_codes: - # Can be a presence (see chg_contact_status in groupchat_control.py) - changes.append(_('Any occupant is allowed to see your full JID')) - self.is_anonymous = False - if '102' in event.status_codes: + if StatusCode.SHOWING_UNAVAILABLE in event.status_codes: changes.append(_('Room now shows unavailable members')) - if '103' in event.status_codes: + if StatusCode.NOT_SHOWING_UNAVAILABLE in event.status_codes: changes.append(_('Room now does not show unavailable members')) - if '104' in event.status_codes: + if StatusCode.CONFIG_NON_PRIVACY_RELATED in event.status_codes: changes.append(_('A setting not related to privacy has been ' 'changed')) app.connections[self.account].get_module('Discovery').disco_muc( self.room_jid, self.update_actions, update=True) - if '170' in event.status_codes: + if StatusCode.CONFIG_ROOM_LOGGING in event.status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) changes.append(_('Room logging is now enabled')) - if '171' in event.status_codes: + if StatusCode.CONFIG_NO_ROOM_LOGGING in event.status_codes: changes.append(_('Room logging is now disabled')) - if '172' in event.status_codes: + if StatusCode.CONFIG_NON_ANONYMOUS in event.status_codes: changes.append(_('Room is now non-anonymous')) self.is_anonymous = False - if '173' in event.status_codes: + if StatusCode.CONFIG_SEMI_ANONYMOUS in event.status_codes: changes.append(_('Room is now semi-anonymous')) self.is_anonymous = True - if '174' in event.status_codes: + if StatusCode.CONFIG_FULL_ANONYMOUS in event.status_codes: changes.append(_('Room is now fully anonymous')) self.is_anonymous = True ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -62,8 +62,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): con.get_module('MUC').get_affiliation( self.jid, affiliation, - self._on_affiliations_received, - self._on_affiliations_error) + callback=self._on_affiliations_received) if form is not None: self._ui.stack.set_visible_child_name('config') @@ -340,29 +339,28 @@ class GroupchatConfig(Gtk.ApplicationWindow): con = app.connections[self.account] con.get_module('MUC').set_affiliation(self.jid, diff_dict) - def _on_affiliations_error(self, affiliation, error): - log.info('Error while requesting %s affiliations: %s', - affiliation, error) - - def _on_affiliations_received(self, _account, _room_jid, - affiliation, users): + def _on_affiliations_received(self, result): + if result.is_error: + log.info('Error while requesting %s affiliations: %s', + result.affiliation, result.error) + return - if affiliation == 'outcast': + if result.affiliation == 'outcast': self._ui.stack.get_child_by_name('outcast').show() - for jid, attrs in users.items(): - affiliation_edit, jid_edit = self._allowed_to_edit(affiliation) - if affiliation == 'outcast': + for jid, attrs in result.users.items(): + affiliation_edit, jid_edit = self._allowed_to_edit(result.affiliation) + if result.affiliation == 'outcast': reason = attrs.get('reason') self._ui.outcast_store.append( [jid, reason, None, - affiliation, + result.affiliation, None, affiliation_edit, jid_edit]) - self._affiliations[jid] = {'affiliation': affiliation, + self._affiliations[jid] = {'affiliation': result.affiliation, 'reason': reason} else: nick = attrs.get('nick') @@ -371,11 +369,11 @@ class GroupchatConfig(Gtk.ApplicationWindow): [jid, nick, role, - affiliation, - _(affiliation.capitalize()), + result.affiliation, + _(result.affiliation.capitalize()), affiliation_edit, jid_edit]) - self._affiliations[jid] = {'affiliation': affiliation, + self._affiliations[jid] = {'affiliation': result.affiliation, 'nick': nick} if role is not None: self._ui.role_column.set_visible(True) ===================================== gajim/gtk/notification.py ===================================== @@ -109,7 +109,7 @@ class Notification: def _on_event_removed(self, event_list): for event in event_list: if event.type_ == 'gc-invitation': - self._withdraw('gc-invitation', event.account, event.room_jid) + self._withdraw('gc-invitation', event.account, event.muc) if event.type_ in ('normal', 'printed_chat', 'chat', 'printed_pm', 'pm', 'printed_marked_gc_msg', 'printed_gc_msg'): ===================================== gajim/gui_interface.py ===================================== @@ -609,39 +609,43 @@ class Interface: else: GroupchatConfig(account, obj.jid, 'owner', obj.dataform) - def handle_event_gc_decline(self, obj): - gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, obj.account) + def handle_event_gc_decline(self, event): + gc_control = self.msg_win_mgr.get_gc_control(str(event.muc), + event.account) if gc_control: - if obj.reason: + if event.reason: gc_control.print_conversation( _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': obj.from_, 'reason': obj.reason}, + 'jid': event.from_, 'reason': event.reason}, graphics=False) else: gc_control.print_conversation( _('%(jid)s declined the invitation') % { - 'jid': obj.from_}, graphics=False) - - def handle_event_gc_invitation(self, obj): - if helpers.allow_popup_window(obj.account) or not self.systray_enabled: - dialogs.InvitationReceivedDialog( - obj.account, obj.room_jid, - str(obj.from_), obj.password, obj.reason, - is_continued=obj.is_continued) + 'jid': event.from_}, graphics=False) + + def handle_event_gc_invitation(self, event): + if helpers.allow_popup_window(event.account) or not self.systray_enabled: + dialogs.InvitationReceivedDialog(event.account, event) return - event = events.GcInvitationtEvent( - obj.room_jid, obj.reason, - obj.password, obj.is_continued, str(obj.from_)) - self.add_event(obj.account, str(obj.from_), event) + from_ = str(event.from_) + muc = str(event.muc) + + event_ = events.GcInvitationtEvent(event) + self.add_event(event.account, from_, event_) - if helpers.allow_showing_notification(obj.account): + if helpers.allow_showing_notification(event.account): event_type = _('Groupchat Invitation') - text = _('You are invited to {room} by {user}').format( - room=obj.room_jid, user=str(obj.from_)) - app.notification.popup( - event_type, str(obj.from_), obj.account, 'gc-invitation', - 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid) + text = _('You are invited to {room} by {user}').format(room=muc, + user=from_) + app.notification.popup(event_type, + from_, + event.account, + 'gc-invitation', + 'gajim-gc_invitation', + event_type, + text, + room_jid=muc) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: @@ -1523,7 +1527,9 @@ class Interface: if app.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) + groupchat = event.type_ == 'gc-invitation' + self.roster.add_to_not_in_the_roster( + account, jid, groupchat=groupchat) # Select the big brother contact in roster, it's visible because it has # events. @@ -1621,8 +1627,7 @@ class Interface: event = app.events.get_first_event(account, jid, type_) if event is None: return - dialogs.InvitationReceivedDialog(account, event.room_jid, jid, - event.password, event.reason, event.is_continued) + dialogs.InvitationReceivedDialog(account, event) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': ===================================== gajim/roster_window.py ===================================== @@ -1032,14 +1032,16 @@ class RosterWindow: self.draw_group(group, account) # FIXME: integrate into add_contact() - def add_to_not_in_the_roster(self, account, jid, nick='', resource=''): + def add_to_not_in_the_roster(self, account, jid, nick='', resource='', + groupchat=False): keyID = '' attached_keys = app.config.get_per('accounts', account, 'attached_gpg_keys').split() if jid in attached_keys: keyID = attached_keys[attached_keys.index(jid) + 1] - contact = app.contacts.create_not_in_roster_contact(jid=jid, - account=account, resource=resource, name=nick, keyID=keyID) + contact = app.contacts.create_not_in_roster_contact( + jid=jid, account=account, resource=resource, name=nick, + keyID=keyID, groupchat=groupchat) app.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) return contact @@ -2002,9 +2004,7 @@ class RosterWindow: return True if event.type_ == 'gc-invitation': - dialogs.InvitationReceivedDialog(account, event.room_jid, - event.jid_from, event.password, event.reason, - is_continued=event.is_continued) + dialogs.InvitationReceivedDialog(account, event) app.events.remove_events(account, jid, event) return True @@ -2692,12 +2692,8 @@ class RosterWindow: app.log('avatar').debug('Draw roster avatar: %s', obj.jid) self.draw_avatar(obj.jid, obj.account) - def _nec_gc_subject_received(self, obj): - contact = app.contacts.get_contact_with_highest_priority( - obj.account, obj.jid) - if contact: - contact.status = obj.subject - self.draw_contact(obj.jid, obj.account) + def _nec_gc_subject_received(self, event): + self.draw_contact(event.jid, event.account) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8094cadbead2bdb5638cb79beb2064a5f9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8094cadbead2bdb5638cb79beb2064a5f9… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits