libervia-web: src/server/blog.py annotate

annotate src/server/blog.py @ 1037:dc6c8c4d8ff6

server: redirection rework: - redirection parsing is now launched after LiberviaPages are imported, this way the pages are accessible and their methods are usable - inv_redirections attribute in LiberviaRootResource keep a map from new URL to old URL, allowing to check if a redirected path can lead to the same page - LiberviaPage methods are used to retrieve their URL - fixed remaining args when going to a redirected page - new checkRedirection method to see if a redirection can lead to the same URL

author	Goffi <goffi@goffi.org>
date	Wed, 24 Jan 2018 09:57:38 +0100
parents	d0b27d1e2d50
children	f2170536ba23

rev	line source
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	1 #!/usr/bin/python
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	2 # -- coding: utf-8 --
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	3
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	4 # Libervia: a Salut à Toi frontend
964 fd4eae654182 misc: date update (yes it's a bit late :p ) Goffi <goffi@goffi.org> parents: 954 diff changeset	5 # Copyright (C) 2011-2017 Jérôme Poisson <goffi@goffi.org>
818 f8a7a046ff9c copyright update Goffi <goffi@goffi.org> parents: 786 diff changeset	6 # Copyright (C) 2013-2016 Adrien Cossa <souliane@mailoo.org>
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	7
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	8 # This program is free software: you can redistribute it and/or modify
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	9 # it under the terms of the GNU Affero General Public License as published by
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	10 # the Free Software Foundation, either version 3 of the License, or
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	11 # (at your option) any later version.
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	12
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	13 # This program is distributed in the hope that it will be useful,
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	16 # GNU Affero General Public License for more details.
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	17
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	18 # You should have received a copy of the GNU Affero General Public License
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 331 diff changeset	19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	20
586 3eb3a2c0c011 browser and server side: uses RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 487 diff changeset	21 from sat.core.i18n import _, D_
847 330db23d4a44 server (blog): call fixXHTMLLinks on XHTML content souliane <souliane@mailoo.org> parents: 831 diff changeset	22 from sat_frontends.tools.strings import addURLToText, fixXHTMLLinks
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	23 from sat.core.log import getLogger
0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	24 log = getLogger(__name__)
898 2d15b484ca33 blog, browser: updated imports to reflect renaming of common.py to common/data_format.py Goffi <goffi@goffi.org> parents: 896 diff changeset	25 from sat.tools.common import data_format
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	26 from sat.tools import xml_tools
728 9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	27 from dbus.exceptions import DBusException
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	28 from twisted.internet import defer
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	29 from twisted.web import server
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	30 from twisted.web.resource import Resource
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	31 from twisted.words.protocols.jabber.jid import JID
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	32 from twisted.words.xish import domish
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	33 from jinja2 import Environment, PackageLoader
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	34 from datetime import datetime
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	35 import re
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	36 import os
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	37 import sys
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	38 import urllib
229 e632f77c4219 bridge: asyncGetParamA takes a security_limit argument souliane <souliane@mailoo.org> parents: 228 diff changeset	39
588 c8cca1a373dd server_side: static blog: convert \n in raw text message to <br/> souliane <souliane@mailoo.org> parents: 586 diff changeset	40 from libervia.server.html_tools import sanitizeHtml, convertNewLinesToXHTML
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 446 diff changeset	41 from libervia.server.constants import Const as C
981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 446 diff changeset	42
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	43 NS_ATOM = 'http://www.w3.org/2005/Atom'
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	44 PARAMS_TO_GET = (C.STATIC_BLOG_PARAM_TITLE, C.STATIC_BLOG_PARAM_BANNER, C.STATIC_BLOG_PARAM_KEYWORDS, C.STATIC_BLOG_PARAM_DESCRIPTION)
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	45 re_strip_empty_div = re.compile(r"<div ?/>\|<div> *?</div>")
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	46
950 67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	47 # TODO: check disco features and use max_items when RSM is not available
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	48 # FIXME: change navigation links handling, this is is fragile
950 67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	49 # XXX: this page will disappear, LiberviaPage will be used instead
67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	50 # TODO: delete this page and create a compatibility page for links
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	51
827 f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	52
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	53 def getDefaultQueryData(request):
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	54 """Return query data which must be present in all links
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	55
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	56 @param request(twisted.web.http.Request): request instance comming from render
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	57 @return (dict): a dict with values as expected by urllib.urlencode
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	58 """
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	59 default_query_data = {}
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	60 try:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	61 default_query_data['tag'] = request.extra_dict['mam_filter_{}'.format(C.MAM_FILTER_CATEGORY)].encode('utf-8')
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	62 except KeyError:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	63 pass
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	64 return default_query_data
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	65
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	66
827 f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	67 def _quote(value):
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	68 """Quote a value for use in url
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	69
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	70 @param value(unicode): value to quote
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	71 @return (str): quoted value
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	72 """
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	73 return urllib.quote(value.encode('utf-8'), '')
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	74
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	75
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	76 def _unquote(quoted_value):
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	77 """Unquote a value coming from url
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	78
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	79 @param unquote_value(str): value to unquote
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	80 @return (unicode): unquoted value
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	81 """
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	82 assert not isinstance(quoted_value, unicode)
827 f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	83 return urllib.unquote(quoted_value).decode('utf-8')
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	84
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	85
893 298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	86 def _urlencode(query):
298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	87 """Same as urllib.urlencode, but use '&' instead of '&'"""
896 06ead60cbfe0 blog: no unicode here we said! Goffi <goffi@goffi.org> parents: 895 diff changeset	88 return '&'.join(["{}={}".format(urllib.quote_plus(str(k)), urllib.quote_plus(str(v)))
893 298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	89 for k,v in query.iteritems()])
298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	90
298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	91
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	92 class TemplateProcessor(object):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	93
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	94 THEME = 'default'
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	95
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	96 def __init__(self, host):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	97 self.host = host
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	98
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	99 # add Libervia's themes directory to the python path
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	100 sys.path.append(os.path.dirname(os.path.normpath(self.host.themes_dir)))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	101 themes = os.path.basename(os.path.normpath(self.host.themes_dir))
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	102 self.env = Environment(loader=PackageLoader(themes, self.THEME))
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	103
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	104 def useTemplate(self, request, tpl, data=None):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	105 theme_url = os.path.join('/', C.THEMES_URL, self.THEME)
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	106
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	107 data_ = {'images': os.path.join(theme_url, 'images'),
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	108 'styles': os.path.join(theme_url, 'styles'),
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	109 }
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	110 if data:
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	111 data_.update(data)
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	112
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	113 template = self.env.get_template('{}.html'.format(tpl))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	114 return template.render(**data_).encode('utf-8')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	115
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	116
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	117 class MicroBlog(Resource, TemplateProcessor):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	118 isLeaf = True
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	119
243 63e9b680d3e7 browser_side, blog: better PEP8 compliance souliane <souliane@mailoo.org> parents: 229 diff changeset	120 def __init__(self, host):
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	121 self.host = host
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	122 Resource.__init__(self)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	123 TemplateProcessor.__init__(self, host)
484 ae86b32b959c server side (blog): manage our own avatars cache because existing entity data are not updated souliane <souliane@mailoo.org> parents: 483 diff changeset	124 self.avatars_cache = {}
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	125
950 67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	126 def _avatarPathToUrl(self, avatar, request, bare_jid_s):
67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	127 filename = os.path.basename(avatar)
67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	128 avatar_url = os.path.join(self.host.service_cache_url, filename)
67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	129 self.avatars_cache[bare_jid_s] = avatar_url
67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	130 return avatar_url
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	131
25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	132
950 67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	133 def getAvatarURL(self, pub_jid, request):
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	134 """Return avatar of a jid if in cache, else ask for it.
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	135
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	136 @param pub_jid (JID): publisher JID
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	137 @return: deferred avatar URL (unicode)
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	138 """
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	139 bare_jid_s = pub_jid.userhost()
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	140 try:
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	141 url = self.avatars_cache[bare_jid_s]
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	142 except KeyError:
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	143 self.avatars_cache[bare_jid_s] = '' # avoid to request the vcard several times
950 67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	144 d = self.host.bridgeCall('avatarGet', bare_jid_s, False, False, C.SERVICE_PROFILE)
67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	145 d.addCallback(self._avatarPathToUrl, request, bare_jid_s)
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	146 return d
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	147 return defer.succeed(url if url else C.DEFAULT_AVATAR_URL)
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	148
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	149 def render_GET(self, request):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	150 if not request.postpath or len(request.postpath) > 2:
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	151 return self.useTemplate(request, "static_blog_error", {'message': "You must indicate a nickname"})
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	152
827 f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	153 prof_requested = _unquote(request.postpath[0])
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	154
728 9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	155 try:
915 e9e9d9d893a8 server: renamed getProfileName to profileNameGet following core change and new conventions. Goffi <goffi@goffi.org> parents: 914 diff changeset	156 prof_found = self.host.bridge.profileNameGet(prof_requested)
728 9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	157 except DBusException:
9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	158 prof_found = None
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	159 if not prof_found or prof_found == C.SERVICE_PROFILE:
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	160 return self.useTemplate(request, "static_blog_error", {'message': "Invalid nickname"})
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	161
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	162 d = defer.Deferred()
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	163 # TODO: jid caching
747 efbd28b3438e static blog: fixed bad use of JID Goffi <goffi@goffi.org> parents: 746 diff changeset	164 self.host.bridge.asyncGetParamA('JabberID', 'Connection', 'value', profile_key=prof_found, callback=d.callback, errback=d.errback)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	165 d.addCallback(self.render_gotJID, request, prof_found)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	166 return server.NOT_DONE_YET
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	167
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	168 def render_gotJID(self, pub_jid_s, request, profile):
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	169 pub_jid = JID(pub_jid_s)
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	170
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	171 request.extra_dict = {} # will be used for RSM and MAM
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	172 self.parseURLParams(request)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	173 if request.item_id:
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	174 # FIXME: this part seems useless
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	175 # we want a specific item
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	176 # item_ids = [request.item_id]
825 a3e888ac4964 server (blog): removed another max_items Goffi <goffi@goffi.org> parents: 824 diff changeset	177 # max_items = 1
954 7892f1a1e2cf server (blog): temporary fix for atom feed: Goffi <goffi@goffi.org> parents: 950 diff changeset	178 max_items = C.NO_LIMIT # FIXME
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	179 else:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	180 # max_items = int(request.extra_dict['rsm_max']) # FIXME
954 7892f1a1e2cf server (blog): temporary fix for atom feed: Goffi <goffi@goffi.org> parents: 950 diff changeset	181 max_items = C.NO_LIMIT
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	182 # TODO: use max_items only when RSM is not available
586 3eb3a2c0c011 browser and server side: uses RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 487 diff changeset	183
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	184 if request.atom:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	185 request.extra_dict.update(request.mam_extra)
882 d3d2b97aa12c blog (atom): removed hard ATOM_MAX_ITEMS value as it need to be used with MAM, may come back in the future Goffi <goffi@goffi.org> parents: 881 diff changeset	186 self.getAtom(pub_jid, max_items, request.extra_dict, request.extra_comments_dict, request, profile)
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	187
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	188 elif request.item_id:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	189 # we can't merge mam_extra now because we'll use item_ids
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	190 self.getItemById(pub_jid, request.item_id, request.extra_dict,
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	191 request.extra_comments_dict, request, profile)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	192 else:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	193 request.extra_dict.update(request.mam_extra)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	194 self.getItems(pub_jid, max_items, request.extra_dict,
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	195 request.extra_comments_dict, request, profile)
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	196
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	197 ## URL parsing
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	198
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	199 def parseURLParams(self, request):
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	200 """Parse the request URL parameters.
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	201
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	202 @param request: HTTP request
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	203 """
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	204 if len(request.postpath) > 1:
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	205 if request.postpath[1] == 'atom.xml': # return the atom feed
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	206 request.atom = True
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	207 request.item_id = None
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	208 else:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	209 request.atom = False
827 f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	210 request.item_id = _unquote(request.postpath[1])
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	211 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	212 request.item_id = None
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	213 request.atom = False
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	214
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	215 self.parseURLParamsRSM(request)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	216 # XXX: request.display_single is True when only one blog post is visible
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	217 request.display_single = (request.item_id is not None) or int(request.extra_dict['rsm_max']) == 1
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	218 self.parseURLParamsCommentsRSM(request)
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	219 self.parseURLParamsMAM(request)
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	220
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	221 def parseURLParamsRSM(self, request):
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	222 """Parse RSM request data from the URL parameters for main items
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	223
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	224 fill request.extra_dict accordingly
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	225 @param request: HTTP request
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	226 """
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	227 if request.item_id: # XXX: item_id and RSM are not compatible
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	228 return
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	229 try:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	230 rsm_max = int(request.args['max'][0])
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	231 if rsm_max > C.STATIC_RSM_MAX_LIMIT:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	232 log.warning(u"Request with rsm_max over limit ({})".format(rsm_max))
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	233 rsm_max = C.STATIC_RSM_MAX_LIMIT
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	234 request.extra_dict['rsm_max'] = unicode(rsm_max)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	235 except (ValueError, KeyError):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	236 request.extra_dict['rsm_max'] = unicode(C.STATIC_RSM_MAX_DEFAULT)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	237 try:
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	238 request.extra_dict['rsm_index'] = request.args['index'][0]
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	239 except (ValueError, KeyError):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	240 try:
829 c1000ea40e6c server (blog): fixed unicode handling for query args Goffi <goffi@goffi.org> parents: 828 diff changeset	241 request.extra_dict['rsm_before'] = request.args['before'][0].decode('utf-8')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	242 except KeyError:
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	243 try:
829 c1000ea40e6c server (blog): fixed unicode handling for query args Goffi <goffi@goffi.org> parents: 828 diff changeset	244 request.extra_dict['rsm_after'] = request.args['after'][0].decode('utf-8')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	245 except KeyError:
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	246 pass
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	247
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	248 def parseURLParamsCommentsRSM(self, request):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	249 """Parse RSM request data from the URL parameters for comments
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	250
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	251 fill request.extra_dict accordingly
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	252 @param request: HTTP request
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	253 """
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	254 request.extra_comments_dict = {}
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	255 if request.display_single:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	256 try:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	257 rsm_max = int(request.args['comments_max'][0])
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	258 if rsm_max > C.STATIC_RSM_MAX_LIMIT:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	259 log.warning(u"Request with rsm_max over limit ({})".format(rsm_max))
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	260 rsm_max = C.STATIC_RSM_MAX_LIMIT
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	261 request.extra_comments_dict['rsm_max'] = unicode(rsm_max)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	262 except (ValueError, KeyError):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	263 request.extra_comments_dict['rsm_max'] = unicode(C.STATIC_RSM_MAX_COMMENTS_DEFAULT)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	264 else:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	265 request.extra_comments_dict['rsm_max'] = "0"
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	266
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	267 def parseURLParamsMAM(self, request):
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	268 """Parse MAM request data from the URL parameters for main items
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	269
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	270 fill request.extra_dict accordingly
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	271 @param request: HTTP request
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	272 """
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	273 # XXX: we use a separate dict for MAM as the filters are not used
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	274 # when display_single is set (because it then use item_ids which
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	275 # can't be used with MAM), but it is still used in this case
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	276 # for navigation links.
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	277 request.mam_extra = {}
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	278 try:
829 c1000ea40e6c server (blog): fixed unicode handling for query args Goffi <goffi@goffi.org> parents: 828 diff changeset	279 request.mam_extra['mam_filter_{}'.format(C.MAM_FILTER_CATEGORY)] = request.args['tag'][0].decode('utf-8')
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	280 except KeyError:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	281 pass
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	282
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	283 ## Items retrieval
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	284
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	285 def getItemById(self, pub_jid, item_id, extra_dict, extra_comments_dict, request, profile):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	286 """
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	287
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	288 @param pub_jid (jid.JID): publisher JID
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	289 @param item_id(unicode): ID of the item to retrieve
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	290 @param extra_dict (dict): extra configuration for initial items only
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	291 @param extra_comments_dict (dict): extra configuration for comments only
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	292 @param request: HTTP request
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	293 @param profile
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	294 """
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	295
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	296 def gotItems(items):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	297 items, metadata = items
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	298 item = items[0] # assume there's only one item
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	299
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	300 def gotMetadata(result):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	301 dummy, rsm_metadata = result
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	302 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	303 metadata['rsm_count'] = rsm_metadata['rsm_count']
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	304 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	305 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	306 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	307 metadata['rsm_index'] = unicode(int(rsm_metadata['rsm_index'])-1)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	308 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	309 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	310
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	311 metadata['rsm_first'] = metadata['rsm_last'] = item["id"]
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	312
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	313 def gotComments(comments):
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	314 # at this point we can merge mam dict
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	315 request.extra_dict.update(request.mam_extra)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	316 # build the items as self.getItems would do it (and as self.renderHTML expects them to be)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	317 comments = [(item['comments_service'], item['comments_node'], "", comments[0], comments[1])]
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	318 self.renderHTML([(item, comments)], metadata, request, pub_jid, profile)
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	319
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	320 # get the comments
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	321 # max_comments = int(extra_comments_dict['rsm_max']) # FIXME
954 7892f1a1e2cf server (blog): temporary fix for atom feed: Goffi <goffi@goffi.org> parents: 950 diff changeset	322 max_comments = C.NO_LIMIT
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	323 # TODO: use max_comments only when RSM is not available
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	324 self.host.bridge.mbGet(item['comments_service'], item['comments_node'], max_comments, [],
826 70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	325 extra_comments_dict, C.SERVICE_PROFILE,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	326 callback=gotComments,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	327 errback=lambda failure: self.renderError(failure, request, pub_jid))
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	328
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	329 # XXX: retrieve RSM information related to the main item. We can't do it while
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	330 # retrieving the item, because item_ids and rsm should not be used together.
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	331 self.host.bridge.mbGet(pub_jid.userhost(), '', 0, [],
826 70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	332 {"rsm_max": "1", "rsm_after": item["id"]}, C.SERVICE_PROFILE,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	333 callback=gotMetadata,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	334 errback=lambda failure: self.renderError(failure, request, pub_jid))
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	335
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	336 # get the main item
826 70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	337 self.host.bridge.mbGet(pub_jid.userhost(), '', 0, [item_id],
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	338 extra_dict, C.SERVICE_PROFILE,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	339 callback=gotItems,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	340 errback=lambda failure: self.renderError(failure, request, pub_jid))
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	341
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	342 def getItems(self, pub_jid, max_items, extra_dict, extra_comments_dict, request, profile):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	343 """
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	344
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	345 @param pub_jid (jid.JID): publisher JID
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	346 @param max_items(int): maximum number of item to get, C.NO_LIMIT for no limit
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	347 @param extra_dict (dict): extra configuration for initial items only
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	348 @param extra_comments_dict (dict): extra configuration for comments only
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	349 @param request: HTTP request
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	350 @param profile
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	351 """
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	352 def getResultCb(data, rt_session):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	353 remaining, results = data
824 d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	354 # we have requested one node only
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	355 assert remaining == 0
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	356 assert len(results) == 1
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	357 service, node, failure, items, metadata = results[0]
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	358 if failure:
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	359 self.renderError(failure, request, pub_jid)
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	360 else:
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	361 self.renderHTML(items, metadata, request, pub_jid, profile)
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	362
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	363 def getResult(rt_session):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	364 self.host.bridge.mbGetFromManyWithCommentsRTResult(rt_session, C.SERVICE_PROFILE,
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	365 callback=lambda data: getResultCb(data, rt_session),
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	366 errback=lambda failure: self.renderError(failure, request, pub_jid))
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	367
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	368 # max_comments = int(extra_comments_dict['rsm_max']) # FIXME
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	369 max_comments = 0
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	370 # TODO: use max_comments only when RSM is not available
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	371 self.host.bridge.mbGetFromManyWithComments(C.JID, [pub_jid.userhost()], max_items,
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	372 max_comments, extra_dict, extra_comments_dict,
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	373 C.SERVICE_PROFILE, callback=getResult)
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	374
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	375 def getAtom(self, pub_jid, max_items, extra_dict, extra_comments_dict, request, profile):
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	376 """
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	377
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	378 @param pub_jid (jid.JID): publisher JID
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	379 @param max_items(int): maximum number of item to get, C.NO_LIMIT for no limit
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	380 @param extra_dict (dict): extra configuration for initial items only
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	381 @param extra_comments_dict (dict): extra configuration for comments only
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	382 @param request: HTTP request
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	383 @param profile
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	384 """
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	385 def gotItems(data):
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	386 # Generate a clean atom feed with uri linking to this blog
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	387 # from microblog data
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	388 items, metadata= data
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	389 feed_elt = domish.Element((NS_ATOM, u'feed'))
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	390 title = _(u"{user}'s blog").format(user=profile)
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	391 feed_elt.addElement(u'title', content=title)
884 763da94ba28b blog (atom): base_url_ext can now only specify scheme, or netloc, or path, it will be used to complete data coming from request's path Goffi <goffi@goffi.org> parents: 882 diff changeset	392
1006 d0b27d1e2d50 server: moved code to retrieve external server from legacy blog to server.py, and use it to find websocket URL Goffi <goffi@goffi.org> parents: 964 diff changeset	393 base_blog_url = self.host.getExtBaseURL(request,
d0b27d1e2d50 server: moved code to retrieve external server from legacy blog to server.py, and use it to find websocket URL Goffi <goffi@goffi.org> parents: 964 diff changeset	394 u'blog/{user}'.format(user=profile))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	395
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	396 # atom link
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	397 link_feed_elt = feed_elt.addElement('link')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	398 link_feed_elt['href'] = u'{base}/atom.xml'.format(base=base_blog_url)
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	399 link_feed_elt['type'] = u'application/atom+xml'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	400 link_feed_elt['rel'] = u'self'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	401
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	402 # blog link
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	403 link_blog_elt = feed_elt.addElement('link')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	404 link_blog_elt['rel'] = u'alternate'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	405 link_blog_elt['type'] = u'text/html'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	406 link_blog_elt['href'] = base_blog_url
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	407
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	408 # blog link XMPP uri
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	409 blog_xmpp_uri = metadata['uri']
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	410 link_blog_elt = feed_elt.addElement('link')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	411 link_blog_elt['rel'] = u'alternate'
892 bf2af257e18b blog: changed xmpp: alternate links MIME type for application/atom+xml Goffi <goffi@goffi.org> parents: 891 diff changeset	412 link_blog_elt['type'] = u'application/atom+xml'
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	413 link_blog_elt['href'] = blog_xmpp_uri
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	414
886 fe4d8dfaaa65 blog: OK, OK, I forgot the _quote method, it's better now :) Goffi <goffi@goffi.org> parents: 885 diff changeset	415 feed_elt.addElement('id', content=_quote(blog_xmpp_uri))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	416 updated_unix = max([float(item['updated']) for item in items])
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	417 updated_dt = datetime.fromtimestamp(updated_unix)
890 dc27e29b7c22 blog (atom feed): fixed forgotten content keyword, resulting in content published as namespace Goffi <goffi@goffi.org> parents: 889 diff changeset	418 feed_elt.addElement(u'updated', content=u'{}Z'.format(updated_dt.isoformat("T")))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	419
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	420 for item in items:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	421 entry_elt = feed_elt.addElement(u'entry')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	422
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	423 # Title
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	424 try:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	425 title = item['title']
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	426 except KeyError:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	427 # for microblog (without title), we use an abstract of content as title
900 f82b97d9ca5f server (blog): use unicode character for ellispsis in atom feed's microblog title Goffi <goffi@goffi.org> parents: 899 diff changeset	428 title = u'{}…'.format(u' '.join(item['content'][:70].split()))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	429 entry_elt.addElement(u'title', content=title)
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	430
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	431 # HTTP link
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	432 http_link_elt = entry_elt.addElement(u'link')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	433 http_link_elt['rel'] = u'alternate'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	434 http_link_elt['type'] = u'text/html'
886 fe4d8dfaaa65 blog: OK, OK, I forgot the _quote method, it's better now :) Goffi <goffi@goffi.org> parents: 885 diff changeset	435 http_link_elt['href'] = u'{base}/{quoted_id}'.format(base=base_blog_url, quoted_id=_quote(item['id']))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	436 # XMPP link
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	437 xmpp_link_elt = entry_elt.addElement(u'link')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	438 xmpp_link_elt['rel'] = u'alternate'
894 e4e278255c9a blog: changed MIME type for xmpp: link, forgotten in rev dc27e29b7c22 Goffi <goffi@goffi.org> parents: 893 diff changeset	439 xmpp_link_elt['type'] = u'application/atom+xml'
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	440 xmpp_link_elt['href'] = u'{blog_uri};item={item_id}'.format(blog_uri=blog_xmpp_uri, item_id=item['id'])
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	441
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	442 # date metadata
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	443 entry_elt.addElement(u'id', content=item['atom_id'])
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	444 updated = datetime.fromtimestamp(float(item['updated']))
890 dc27e29b7c22 blog (atom feed): fixed forgotten content keyword, resulting in content published as namespace Goffi <goffi@goffi.org> parents: 889 diff changeset	445 entry_elt.addElement(u'updated', content=u'{}Z'.format(updated.isoformat("T")))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	446 published = datetime.fromtimestamp(float(item['published']))
890 dc27e29b7c22 blog (atom feed): fixed forgotten content keyword, resulting in content published as namespace Goffi <goffi@goffi.org> parents: 889 diff changeset	447 entry_elt.addElement(u'published', content=u'{}Z'.format(published.isoformat("T")))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	448
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	449 # author metadata
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	450 author_elt = entry_elt.addElement(u'author')
890 dc27e29b7c22 blog (atom feed): fixed forgotten content keyword, resulting in content published as namespace Goffi <goffi@goffi.org> parents: 889 diff changeset	451 author_elt.addElement('name', content=item.get('author', profile))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	452 try:
890 dc27e29b7c22 blog (atom feed): fixed forgotten content keyword, resulting in content published as namespace Goffi <goffi@goffi.org> parents: 889 diff changeset	453 author_elt.addElement('uri', content=u'xmpp:{}'.format(item['author_jid']))
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	454 except KeyError:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	455 pass
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	456 try:
890 dc27e29b7c22 blog (atom feed): fixed forgotten content keyword, resulting in content published as namespace Goffi <goffi@goffi.org> parents: 889 diff changeset	457 author_elt.addElement('email', content=item['author_email'])
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	458 except KeyError:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	459 pass
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	460
899 bc3a3e804a7a blog(atom): added categories (tags) in Atom feed Goffi <goffi@goffi.org> parents: 898 diff changeset	461 # categories
bc3a3e804a7a blog(atom): added categories (tags) in Atom feed Goffi <goffi@goffi.org> parents: 898 diff changeset	462 for tag in data_format.dict2iter("tag", item):
bc3a3e804a7a blog(atom): added categories (tags) in Atom feed Goffi <goffi@goffi.org> parents: 898 diff changeset	463 category_elt = entry_elt.addElement(u"category")
bc3a3e804a7a blog(atom): added categories (tags) in Atom feed Goffi <goffi@goffi.org> parents: 898 diff changeset	464 category_elt["term"] = tag
bc3a3e804a7a blog(atom): added categories (tags) in Atom feed Goffi <goffi@goffi.org> parents: 898 diff changeset	465
879 2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	466 # content
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	467 try:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	468 content_xhtml = item['content_xhtml']
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	469 except KeyError:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	470 content_elt = entry_elt.addElement('content', content='content')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	471 content_elt['type'] = 'text'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	472 else:
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	473 content_elt = entry_elt.addElement('content')
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	474 content_elt['type'] = 'xhtml'
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	475 content_elt.addChild(xml_tools.ElementParser()(content_xhtml, namespace=C.NS_XHTML))
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	476
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	477 atom_feed = u'<?xml version="1.0" encoding="utf-8"?>\n{}'.format(feed_elt.toXml())
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	478 self.renderAtomFeed(atom_feed, request),
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	479
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	480 self.host.bridge.mbGet(pub_jid.userhost(), '', max_items, [], extra_dict, C.SERVICE_PROFILE, callback=gotItems)
2e0e9cf9efb4 blog (atom feed): fixed atom handling: Goffi <goffi@goffi.org> parents: 855 diff changeset	481
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	482 ## rendering
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	483
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	484 def _updateDict(self, value, dict_, key):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	485 dict_[key] = value
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	486
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	487 def _getImageParams(self, options, key, default, alt):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	488 """regexp from http://answers.oreilly.com/topic/280-how-to-validate-urls-with-regular-expressions/"""
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	489 url = options[key] if key in options else ''
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	490 regexp = r"^(https?\|ftp)://[a-z0-9-]+(\.[a-z0-9-]+)+(/[\w-]+)*/[\w-]+\.(gif\|png\|jpg)$"
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	491 if re.match(regexp, url):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	492 url = url
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	493 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	494 url = default
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	495 return BlogImage(url, alt)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	496
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	497 def renderError(self, failure, request, pub_jid):
891 14e611e38b67 server (blog): set HTTP status code to 500 on renderError Goffi <goffi@goffi.org> parents: 890 diff changeset	498 request.setResponseCode(500)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	499 request.write(self.useTemplate(request, "static_blog_error", {'message': "Can't access requested data"}))
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	500 request.finish()
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	501
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	502 def renderHTML(self, items, metadata, request, pub_jid, profile):
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	503 """Retrieve the user parameters before actually rendering the static blog
586 3eb3a2c0c011 browser and server side: uses RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 487 diff changeset	504
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	505 @param items(list[tuple(dict, list)]): same as in self._renderHTML
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	506 @param metadata(dict): original node metadata
389 2d782349b88a server_side: display blog comments when you click on a main item header or title souliane <souliane@mailoo.org> parents: 388 diff changeset	507 @param request: HTTP request
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	508 @param pub_jid (JID): publisher JID
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	509 @param profile (unicode): %(doc_profile)s
389 2d782349b88a server_side: display blog comments when you click on a main item header or title souliane <souliane@mailoo.org> parents: 388 diff changeset	510 """
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	511 d_list = []
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	512 options = {}
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	513
950 67a59552f3e3 server (blog): fixed avatars handling, there is now a well-known URL to SERVICE_PROFILE cache Goffi <goffi@goffi.org> parents: 916 diff changeset	514 d = self.getAvatarURL(pub_jid, request)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	515 d.addCallback(self._updateDict, options, 'avatar')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	516 d.addErrback(self.renderError, request, pub_jid)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	517 d_list.append(d)
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	518
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	519 for param_name in PARAMS_TO_GET:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	520 d = defer.Deferred()
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	521 self.host.bridge.asyncGetParamA(param_name, C.STATIC_BLOG_KEY, 'value', C.SERVER_SECURITY_LIMIT, profile, callback=d.callback, errback=d.errback)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	522 d.addCallback(self._updateDict, options, param_name)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	523 d.addErrback(self.renderError, request, pub_jid)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	524 d_list.append(d)
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	525
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	526 dlist_d = defer.DeferredList(d_list)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	527 dlist_d.addCallback(lambda dummy: self._renderHTML(items, metadata, options, request, pub_jid))
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	528
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	529 def _renderHTML(self, items, metadata, options, request, pub_jid):
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	530 """Actually render the static blog.
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	531
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	532 If mblog_data is a list of dict, we are missing the comments items so we just
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	533 display the main items. If mblog_data is a list of couple, each couple is
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	534 associating a main item data with the list of its comments, so we render all.
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	535 @param items(list[tuple(dict, list)]): list of 2-tuple with
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	536 - item(dict): item microblog data
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	537 - comments_list(list[tuple]): list of 5-tuple with
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	538 - service (unicode): pubsub service where the comments node is
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	539 - node (unicode): comments node
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	540 - failure (unicode): empty in case of success, else error message
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	541 - comments(list[dict]): list of microblog data
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	542 - comments_metadata(dict): metadata of the comment node
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	543 @param metadata(dict): original node metadata
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	544 @param options: dict defining the blog's parameters
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	545 @param request: the HTTP request
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	546 @param pub_jid (JID): publisher JID
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	547 """
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	548 if not isinstance(options, dict):
0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	549 options = {}
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	550 user = sanitizeHtml(pub_jid.user)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	551 base_url = os.path.join('/blog/',user)
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	552
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	553 def getOption(key):
726 e949b7c7ed9c server side (blog): fixes unicode error souliane <souliane@mailoo.org> parents: 725 diff changeset	554 return sanitizeHtml(options[key]) if key in options else ''
441 63017904c4d4 server_side: static blog retrieve page's title, meta description and keywords from the parameters souliane <souliane@mailoo.org> parents: 436 diff changeset	555
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	556 avatar = os.path.normpath('/{}'.format(getOption('avatar')))
702 d94feb0d849e server_side: give a better look to the static blog souliane <souliane@mailoo.org> parents: 694 diff changeset	557 title = getOption(C.STATIC_BLOG_PARAM_TITLE) or user
893 298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	558 query_data = _urlencode(getDefaultQueryData(request)).decode('utf-8')
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	559
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	560 xmpp_uri = metadata['uri']
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	561 if len(items) == 1:
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	562 # FIXME: that's really not a good way to get item id
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	563 # this must be changed after static blog refactorisation
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	564 item_id = items[0][0]['id']
886 fe4d8dfaaa65 blog: OK, OK, I forgot the _quote method, it's better now :) Goffi <goffi@goffi.org> parents: 885 diff changeset	565 xmpp_uri+=u";item={}".format(_quote(item_id))
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	566
855 de17f7313cbe server (blog): fixed atom feed link Goffi <goffi@goffi.org> parents: 854 diff changeset	567 data = {'url_base': base_url,
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	568 'xmpp_uri': xmpp_uri,
855 de17f7313cbe server (blog): fixed atom feed link Goffi <goffi@goffi.org> parents: 854 diff changeset	569 'url_query': u'?{}'.format(query_data) if query_data else '' ,
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	570 'keywords': getOption(C.STATIC_BLOG_PARAM_KEYWORDS),
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	571 'description': getOption(C.STATIC_BLOG_PARAM_DESCRIPTION),
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	572 'title': title,
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	573 'favicon': avatar,
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	574 'banner_img': self._getImageParams(options, C.STATIC_BLOG_PARAM_BANNER, avatar, title)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	575 }
586 3eb3a2c0c011 browser and server side: uses RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 487 diff changeset	576
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	577 data['navlinks'] = NavigationLinks(request, items, metadata, base_url)
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	578 data['messages'] = []
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	579 for item in items:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	580 item, comments_list = item
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	581 comments, comments_count = [], 0
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	582 for node_comments in comments_list:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	583 comments.extend(node_comments[3])
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	584 try:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	585 comments_count += int(node_comments[4]['rsm_count'])
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	586 except KeyError:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	587 pass
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	588 data['messages'].append(BlogMessage(request, base_url, item, comments, comments_count))
586 3eb3a2c0c011 browser and server side: uses RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 487 diff changeset	589
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	590 request.write(self.useTemplate(request, 'static_blog', data))
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	591 request.finish()
243 63e9b680d3e7 browser_side, blog: better PEP8 compliance souliane <souliane@mailoo.org> parents: 229 diff changeset	592
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	593 def renderAtomFeed(self, feed, request):
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	594 request.write(feed.encode('utf-8'))
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	595 request.finish()
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	596
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	597
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	598 class NavigationLinks(object):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	599
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	600 def __init__(self, request, items, metadata, base_url):
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	601 """Build the navigation links.
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	602
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	603 @param items (list): list of items
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	604 @param metadata (dict): rsm data
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	605 @param base_url (unicode): the base URL for this user's blog
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	606 @return: dict
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	607 """
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	608 # FIXME: this code must be refactorized, it is fragile
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	609 # and difficult to maintain
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	610
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	611 # query data which must be present in all links
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	612 default_query_data = getDefaultQueryData(request)
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	613
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	614 # which links we need to display
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	615 if request.display_single:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	616 links = ('later_message', 'older_message')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	617 # key must exist when using the template
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	618 self.later_messages = self.older_messages = ''
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	619 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	620 links = ('later_messages', 'older_messages')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	621 self.later_message = self.older_message = ''
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	622
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	623 # now we set the links according to RSM
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	624 for key in links:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	625 query_data = default_query_data.copy()
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	626
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	627 if key.startswith('later_message'):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	628 try:
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	629 index = int(metadata['rsm_index'])
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	630 except (KeyError, ValueError):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	631 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	632 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	633 if index == 0:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	634 # we don't show this link on first page
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	635 setattr(self, key, '')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	636 continue
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	637 try:
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	638 query_data['before'] = metadata['rsm_first'].encode('utf-8')
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	639 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	640 pass
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	641 else:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	642 try:
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	643 index = int(metadata['rsm_index'])
ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	644 count = int(metadata.get('rsm_count'))
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	645 except (KeyError, ValueError):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	646 # XXX: if we don't have index or count, we can't know if we
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	647 # are on the last page or not
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	648 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	649 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	650 # if we have index, we don't show the after link
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	651 # on the last page
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	652 if index + len(items) >= count:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	653 setattr(self, key, '')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	654 continue
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	655 try:
880 ccbad50e1426 blog, themes(default): added <link> element referencing xmpp: uri of the item Goffi <goffi@goffi.org> parents: 879 diff changeset	656 query_data['after'] = metadata['rsm_last'].encode('utf-8')
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	657 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	658 pass
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	659
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	660 if request.display_single:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	661 query_data['max'] = 1
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	662
893 298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	663 link = "{}?{}".format(base_url, _urlencode(query_data))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	664 setattr(self, key, BlogLink(link, key, key.replace('_', ' ')))
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	665
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	666
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	667 class BlogImage(object):
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	668
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	669 def __init__(self, url_, alt):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	670 self.url = url_
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	671 self.alt = alt
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	672
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	673
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	674 class BlogLink(object):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	675
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	676 def __init__(self, url_, style, text):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	677 self.url = url_
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	678 self.style = style
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	679 self.text = text
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	680
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	681
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	682 class BlogMessage(object):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	683
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	684 def __init__(self, request, base_url, entry, comments=None, comments_count=0):
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	685 """
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	686
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	687 @param request: HTTP request
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	688 @param base_url (unicode): the base URL
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	689 @param entry(dict): item microblog data
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	690 @param comments(list[dict]): list of microblog data
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	691 @param comments_count (int): total number of comments
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	692 """
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	693 if comments is None:
0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	694 comments = []
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	695 timestamp = float(entry.get('published', 0))
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 743 diff changeset	696
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	697 # FIXME: for now we assume that the comments' depth is only 1
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	698 is_comment = not entry.get('comments', False)
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	699
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	700 self.date = datetime.fromtimestamp(timestamp)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	701 self.type = "comment" if is_comment else "main_item"
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	702 self.style = 'mblog_comment' if is_comment else ''
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	703 self.content = self.getText(entry, 'content')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	704
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	705 if is_comment:
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	706 self.author = (_(u"from {}").format(entry['author']))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	707 else:
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	708 self.author = ' '
827 f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	709 self.url = "{}/{}".format(base_url, _quote(entry['id']))
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	710 query_data = getDefaultQueryData(request)
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	711 if query_data:
893 298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	712 self.url += '?{}'.format(_urlencode(query_data))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	713 self.title = self.getText(entry, 'title')
898 2d15b484ca33 blog, browser: updated imports to reflect renaming of common.py to common/data_format.py Goffi <goffi@goffi.org> parents: 896 diff changeset	714 self.tags = [sanitizeHtml(tag) for tag in data_format.dict2iter('tag', entry)]
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	715
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	716 count_text = lambda count: D_(u'comments') if count > 1 else D_(u'comment')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	717
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	718 self.comments_text = u"{} {}".format(comments_count, count_text(comments_count))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	719
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	720 delta = comments_count - len(comments)
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	721 if request.display_single and delta > 0:
893 298fbe562060 blog: escape "&" when encoding URL, so they can be used without escaping in the HTML template Goffi <goffi@goffi.org> parents: 892 diff changeset	722 prev_url = "{}?{}".format(self.url, _urlencode({'comments_max': comments_count}))
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	723 prev_text = D_(u"show {count} previous {comments}").format(
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	724 count = delta, comments = count_text(delta))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	725 self.all_comments_link = BlogLink(prev_url, "comments_link", prev_text)
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	726
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	727 if comments:
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	728 self.comments = [BlogMessage(request, base_url, comment) for comment in comments]
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	729
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	730 def getText(self, entry, key):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	731 try:
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	732 xhtml = entry['{}_xhtml'.format(key)]
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	733 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	734 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	735 processor = addURLToText if key.startswith('content') else sanitizeHtml
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	736 return convertNewLinesToXHTML(processor(entry[key]))
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	737 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	738 return None
854 0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	739 else:
0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	740 # FIXME: empty <div /> elements provoke rendering issue
0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	741 # this regex is a temporary workadound, need more investigation
0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	742 xhtml = re_strip_empty_div.sub("", xhtml)
0dfb76b13115 server (blog): fixes: Goffi <goffi@goffi.org> parents: 847 diff changeset	743 return fixXHTMLLinks(xhtml)

Mercurial > libervia-web

annotate src/server/blog.py @ 1037:dc6c8c4d8ff6