Mercurial > libervia-backend
view frontends/src/tools/strings.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 | 1128feb54180 |
children | 2c31ddf633e5 |
line wrap: on
line source
#!/usr/bin/env python2 # -*- coding: utf-8 -*- # SAT helpers methods for plugins # Copyright (C) 2013-2016 Adrien Cossa (souliane@mailoo.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/>. import re def getURLParams(url): """This comes from pyjamas.Location.makeUrlDict with a small change to also parse full URLs, and parameters with no value specified (in that case the default value "" is used). @param url: any URL with or without parameters @return: a dictionary of the parameters, if any was given, or {} """ dict_ = {} if "/" in url: # keep the part after the last "/" url = url[url.rindex("/") + 1:] if url.startswith("?"): # remove the first "?" url = url[1:] pairs = url.split("&") for pair in pairs: if len(pair) < 3: continue kv = pair.split("=", 1) dict_[kv[0]] = kv[1] if len(kv) > 1 else "" return dict_ def addURLToText(string, new_target=True): """Check a text for what looks like an URL and make it clickable. @param string (unicode): text to process @param new_target (bool): if True, make the link open in a new window """ # XXX: report any change to libervia.browser.strings.addURLToText # Regexp from http://daringfireball.net/2010/07/improved_regex_for_matching_urls def repl(match): url = match.group(0) if not re.match(r"""[a-z]{3,}://|mailto:|xmpp:""", url): url = "http://" + url target = ' target="_blank"' if new_target else '' return '<a href="%s"%s class="url">%s</a>' % (url, target, match.group(0)) pattern = r"""(?i)\b((?:[a-z]{3,}://|(www|ftp)\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/|mailto:|xmpp:)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?]))""" return re.sub(pattern, repl, string) def addURLToImage(string): """Check a XHTML text for what looks like an imageURL and make it clickable. @param string (unicode): text to process """ # XXX: report any change to libervia.browser.strings.addURLToImage def repl(match): url = match.group(1) return '<a href="%s" target="_blank">%s</a>' % (url, match.group(0)) pattern = r"""<img[^>]* src="([^"]+)"[^>]*>""" return re.sub(pattern, repl, string) def fixXHTMLLinks(xhtml): """Add http:// if the scheme is missing and force opening in a new window. @param string (unicode): XHTML Content """ subs = [] for match in re.finditer(r'<a( \w+="[^"]*")* ?/?>', xhtml): tag = match.group(0) url = re.search(r'href="([^"]*)"', tag) if url and not url.group(1).startswith("#"): # skip internal anchor if not re.search(r'target="([^"]*)"', tag): # no target subs.append((tag, '<a target="_blank"%s' % tag[2:])) if not re.match(r"^\w+://", url.group(1)): # no scheme subs.append((url.group(0), 'href="http://%s"' % url.group(1))) for url, new_url in subs: xhtml = xhtml.replace(url, new_url) return xhtml