Mercurial > libervia-backend
view frontends/src/tools/jid.py @ 1963:a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
/!\ several features are temporarily disabled, like notifications in frontends
next step in refactoring, with the following changes:
- jp: updated jp message to follow changes in backend/bridge
- jp: added --lang, --subject, --subject_lang, and --type options to jp message + fixed unicode handling for jid
- quick_frontend (QuickApp, QuickChat):
- follow backend changes
- refactored chat, message are now handled in OrderedDict and uid are kept so they can be updated
- Message and Occupant classes handle metadata, so frontend just have to display them
- Primitivus (Chat):
- follow backend/QuickFrontend changes
- info & standard messages are handled in the same MessageWidget class
- improved/simplified handling of messages, removed update() method
- user joined/left messages are merged when next to each other
- a separator is shown when message is received while widget is out of focus, so user can quickly see the new messages
- affiliation/role are shown (in a basic way for now) in occupants panel
- removed "/me" messages handling, as it will be done by a backend plugin
- message language is displayed when available (only one language per message for now)
- fixed :history and :search commands
- core (constants): new constants for messages type, XML namespace, entity type
- core: *Message methods renamed to follow new code sytle (e.g. sendMessageToBridge => messageSendToBridge)
- core (messages handling): fixed handling of language
- core (messages handling): mes_data['from'] and ['to'] are now jid.JID
- core (core.xmpp): reorganised message methods, added getNick() method to client.roster
- plugin text commands: fixed plugin and adapted to new messages behaviour. client is now used in arguments instead of profile
- plugins: added information for cancellation reason in CancelError calls
- plugin XEP-0045: various improvments, but this plugin still need work:
- trigger is used to avoid message already handled by the plugin to be handled a second time
- changed the way to handle history, the last message from DB is checked and we request only messages since this one, in seconds (thanks Poezio folks :))
- subject reception is waited before sending the roomJoined signal, this way we are sure that everything including history is ready
- cmd_* method now follow the new convention with client instead of profile
- roomUserJoined and roomUserLeft messages are removed, the events are now handled with info message with a "ROOM_USER_JOINED" info subtype
- probably other forgotten stuffs :p
author | Goffi <goffi@goffi.org> |
---|---|
date | Mon, 20 Jun 2016 18:41:53 +0200 |
parents | 2daf7b4c6756 |
children | 8b37a62336c3 |
line wrap: on
line source
#!/usr/bin/env python2 # -*- coding: utf-8 -*- # SAT: a jabber client # Copyright (C) 2009-2016 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero 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 Affero General Public License for more details. # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # hack to use this module with pyjamas try: unicode('') # XXX: unicode doesn't exist in pyjamas # normal version class BaseJID(unicode): def __new__(cls, jid_str): self = unicode.__new__(cls, cls._normalize(jid_str)) return self def __init__(self, jid_str): pass def _parse(self): """Find node domain and resource""" node_end = self.find('@') if node_end < 0: node_end = 0 domain_end = self.find('/') if domain_end == 0: raise ValueError("a jid can't start with '/'") if domain_end == -1: domain_end = len(self) self.node = self[:node_end] or None self.domain = self[(node_end + 1) if node_end else 0:domain_end] self.resource = self[domain_end + 1:] or None except (TypeError, AttributeError): # Error raised is not the same depending on pyjsbuild options # pyjamas version class BaseJID(object): def __init__(self, jid_str): self.__internal_str = JID._normalize(jid_str) def __str__(self): return self.__internal_str def __getattr__(self, name): return getattr(self.__internal_str, name) def __eq__(self, other): if not isinstance(other, JID): return False return (self.node == other.node and self.domain == other.domain and self.resource == other.resource) def __hash__(self): return hash('JID<{}>'.format(self.__internal_str)) def find(self, *args): return self.__internal_str.find(*args) def _parse(self): """Find node domain and resource""" node_end = self.__internal_str.find('@') if node_end < 0: node_end = 0 domain_end = self.__internal_str.find('/') if domain_end == 0: raise ValueError("a jid can't start with '/'") if domain_end == -1: domain_end = len(self.__internal_str) self.node = self.__internal_str[:node_end] or None self.domain = self.__internal_str[(node_end + 1) if node_end else 0:domain_end] self.resource = self.__internal_str[domain_end + 1:] or None class JID(BaseJID): """This class help manage JID (Node@Domaine/Resource)""" def __init__(self, jid_str): super(JID, self).__init__(jid_str) self._parse() @staticmethod def _normalize(jid_str): """Naive normalization before instantiating and parsing the JID""" if not jid_str: return jid_str tokens = jid_str.split('/') tokens[0] = tokens[0].lower() # force node and domain to lower-case return '/'.join(tokens) @property def bare(self): if not self.node: return JID(self.domain) return JID(u"{}@{}".format(self.node, self.domain)) def is_valid(self): """ @return: True if the JID is XMPP compliant """ # TODO: implement real check, according to the RFC http://tools.ietf.org/html/rfc6122 return self.domain != "" def newResource(entity, resource): """Build a new JID from the given entity and resource. @param entity (JID): original JID @param resource (unicode): new resource @return: a new JID instance """ return JID(u"%s/%s" % (entity.bare, resource))