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

annotate src/server/blog.py @ 831:25931797db20

server (blog/themes): sanitize tags + display tags URLs

author	souliane <souliane@mailoo.org>
date	Sat, 09 Jan 2016 13:00:31 +0100
parents	a825700c01e4
children	330db23d4a44

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
818 f8a7a046ff9c copyright update Goffi <goffi@goffi.org> parents: 786 diff changeset	5 # Copyright (C) 2011-2016 Jérôme Poisson <goffi@goffi.org>
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_
306 52b1afd7ac3f server_side: display rich text in blogs (addURLToText is now in sat_frontends/tools/strings) souliane <souliane@mailoo.org> parents: 243 diff changeset	22 from sat_frontends.tools.strings import addURLToText
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__)
760 78caef6ed8e7 static blog: replaced mbdata2tags by sat.tools.common.dict2iter Goffi <goffi@goffi.org> parents: 749 diff changeset	25 from sat.tools import common
728 9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	26 from dbus.exceptions import DBusException
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	27 from twisted.internet import defer
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	28 from twisted.web import server
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	29 from twisted.web.resource import Resource
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	30 from twisted.words.protocols.jabber.jid import JID
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	31 from jinja2 import Environment, PackageLoader
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	32 from datetime import datetime
388 893451e35686 server_side: display blog banner if it is defined souliane <souliane@mailoo.org> parents: 375 diff changeset	33 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	34 import os
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	35 import sys
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	36 import urllib
229 e632f77c4219 bridge: asyncGetParamA takes a security_limit argument souliane <souliane@mailoo.org> parents: 228 diff changeset	37
588 c8cca1a373dd server_side: static blog: convert \n in raw text message to <br/> souliane <souliane@mailoo.org> parents: 586 diff changeset	38 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	39 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	40
229 e632f77c4219 bridge: asyncGetParamA takes a security_limit argument souliane <souliane@mailoo.org> parents: 228 diff changeset	41
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	42 PARAMS_TO_GET = (C.STATIC_BLOG_PARAM_TITLE, C.STATIC_BLOG_PARAM_BANNER, C.STATIC_BLOG_PARAM_KEYWORDS, C.STATIC_BLOG_PARAM_DESCRIPTION)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	43
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	44 # TODO: chech disco features and use max_items 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	45
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	46
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	47 def getDefaultQueryData(request):
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	48 """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	49
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	50 @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	51 @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	52 """
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	53 default_query_data = {}
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	54 try:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	55 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	56 except KeyError:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	57 pass
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	58 return default_query_data
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	59
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	60
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	61 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	62 """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	63
f1fc7245b910 server (blog): moved _quote and _unquote to module functions, and use them in BlogMessage.url Goffi <goffi@goffi.org> parents: 826 diff changeset	64 @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	65 @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	66 """
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 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	68
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 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	71 """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	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 @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	74 @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	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 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	77
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
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	79 class TemplateProcessor(object):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	80
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	81 THEME = 'default'
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	82
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	83 def __init__(self, host):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	84 self.host = host
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	85
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	86 # add Libervia's themes directory to the python path
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	87 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	88 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	89 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	90
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	91 def useTemplate(self, request, tpl, data=None):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	92 theme_url = os.path.join('/', C.THEMES_URL, self.THEME)
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	93
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	94 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	95 'styles': os.path.join(theme_url, 'styles'),
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	96 }
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	97 if data:
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	98 data_.update(data)
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	99
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	100 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	101 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	102
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 class MicroBlog(Resource, TemplateProcessor):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	105 isLeaf = True
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	106
243 63e9b680d3e7 browser_side, blog: better PEP8 compliance souliane <souliane@mailoo.org> parents: 229 diff changeset	107 def __init__(self, host):
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	108 self.host = host
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	109 Resource.__init__(self)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	110 TemplateProcessor.__init__(self, host)
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	111 self.host.bridge.register('entityDataUpdated', self.entityDataUpdatedHandler)
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	112 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	113 self.waiting_deferreds = {}
0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	114
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	115 def entityDataUpdatedHandler(self, entity_s, key, value, dummy):
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	116 """Retrieve the avatar we've been waiting for and fires the callback.
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	117
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	118 @param entity_s (str): JID of the contact
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	119 @param key (str): entity data key
0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	120 @param value (str): entity data value
0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	121 @param dummy (str): that would be C.SERVICE_PROFILE
0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	122 """
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	123 if key != "avatar":
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	124 return
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	125 log.debug(_(u"Received a new avatar for entity %s") % entity_s)
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	126
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	127 url = os.path.join(C.AVATARS_DIR, value)
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	128 self.avatars_cache[entity_s] = url
749 7168a9873dde server_side (blog): fixes avatar callback souliane <souliane@mailoo.org> parents: 747 diff changeset	129 try:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	130 self.waiting_deferreds.pop(entity_s).callback(url)
749 7168a9873dde server_side (blog): fixes avatar callback souliane <souliane@mailoo.org> parents: 747 diff changeset	131 except KeyError:
7168a9873dde server_side (blog): fixes avatar callback souliane <souliane@mailoo.org> parents: 747 diff changeset	132 pass
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	133
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	134 def getAvatarURL(self, pub_jid):
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	135 """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	136
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	137 @param pub_jid (JID): publisher JID
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	138 @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	139 """
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	140 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	141 try:
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	142 url = self.avatars_cache[bare_jid_s]
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	143 except KeyError:
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	144 self.avatars_cache[bare_jid_s] = '' # avoid to request the vcard several times
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	145 self.host.bridge.getCard(bare_jid_s, C.SERVICE_PROFILE)
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	146 d = defer.Deferred()
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	147 self.waiting_deferreds[bare_jid_s] = d
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	148 return d
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	149 return defer.succeed(url if url else C.DEFAULT_AVATAR_URL)
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	150
c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	151 def render_GET(self, request):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	152 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	153 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	154
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	155 prof_requested = _unquote(request.postpath[0])
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	156
728 9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	157 try:
9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	158 prof_found = self.host.bridge.getProfileName(prof_requested)
9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	159 except DBusException:
9d35d75566fb server_side (blog): clean error message when unknown profile is requested souliane <souliane@mailoo.org> parents: 727 diff changeset	160 prof_found = None
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	161 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	162 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	163
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	164 d = defer.Deferred()
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	165 # TODO: jid caching
747 efbd28b3438e static blog: fixed bad use of JID Goffi <goffi@goffi.org> parents: 746 diff changeset	166 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	167 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	168 return server.NOT_DONE_YET
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	169
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	170 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	171 pub_jid = JID(pub_jid_s)
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	172
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	173 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	174 self.parseURLParams(request)
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	175 if request.item_id:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	176 # we want a specific item
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	177 item_ids = [request.item_id]
825 a3e888ac4964 server (blog): removed another max_items Goffi <goffi@goffi.org> parents: 824 diff changeset	178 # max_items = 1
a3e888ac4964 server (blog): removed another max_items Goffi <goffi@goffi.org> parents: 824 diff changeset	179 max_items = 0 # FIXME
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	180 else:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	181 item_ids = []
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	182 # max_items = int(request.extra_dict['rsm_max']) # FIXME
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	183 max_items = 0
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	184 # 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	185
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	186 if request.atom:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	187 request.extra_dict.update(request.mam_extra)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	188 self.host.bridge.mbGetAtom(pub_jid.userhost(), '', max_items, item_ids,
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	189 request.extra_dict, C.SERVICE_PROFILE,
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	190 lambda feed: self.renderAtomFeed(feed, request),
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	191 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	192 elif request.item_id:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	193 # 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	194 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	195 request.extra_comments_dict, request, profile)
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	196 else:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	197 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	198 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	199 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	200
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	201 ## URL parsing
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	202
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	203 def parseURLParams(self, request):
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	204 """Parse the request URL parameters.
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	205
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	206 @param request: HTTP request
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	207 """
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	208 if len(request.postpath) > 1:
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	209 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	210 request.atom = True
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	211 request.item_id = None
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	212 else:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	213 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	214 request.item_id = _unquote(request.postpath[1])
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	215 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	216 request.item_id = None
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	217 request.atom = False
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	218
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	219 self.parseURLParamsRSM(request)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	220 # 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	221 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	222 self.parseURLParamsCommentsRSM(request)
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	223 self.parseURLParamsMAM(request)
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	224
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	225 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	226 """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	227
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	228 fill request.extra_dict accordingly
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	229 @param request: HTTP request
e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	230 """
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	231 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	232 return
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	233 try:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	234 rsm_max = int(request.args['max'][0])
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	235 if rsm_max > C.STATIC_RSM_MAX_LIMIT:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	236 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	237 rsm_max = C.STATIC_RSM_MAX_LIMIT
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	238 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	239 except (ValueError, KeyError):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	240 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	241 try:
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	242 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	243 except (ValueError, KeyError):
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	244 try:
829 c1000ea40e6c server (blog): fixed unicode handling for query args Goffi <goffi@goffi.org> parents: 828 diff changeset	245 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	246 except KeyError:
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	247 try:
829 c1000ea40e6c server (blog): fixed unicode handling for query args Goffi <goffi@goffi.org> parents: 828 diff changeset	248 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	249 except KeyError:
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	250 pass
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	251
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	252 def parseURLParamsCommentsRSM(self, request):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	253 """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	254
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	255 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	256 @param request: HTTP request
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	257 """
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	258 request.extra_comments_dict = {}
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	259 if request.display_single:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	260 try:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	261 rsm_max = int(request.args['comments_max'][0])
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	262 if rsm_max > C.STATIC_RSM_MAX_LIMIT:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	263 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	264 rsm_max = C.STATIC_RSM_MAX_LIMIT
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	265 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	266 except (ValueError, KeyError):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	267 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	268 else:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	269 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	270
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	271 def parseURLParamsMAM(self, request):
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	272 """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	273
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	274 fill request.extra_dict accordingly
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	275 @param request: HTTP request
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	276 """
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	277 # 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	278 # 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	279 # 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	280 # for navigation links.
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	281 request.mam_extra = {}
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	282 try:
829 c1000ea40e6c server (blog): fixed unicode handling for query args Goffi <goffi@goffi.org> parents: 828 diff changeset	283 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	284 except KeyError:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	285 pass
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	286
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	287 ## Items retrieval
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	288
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	289 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	290 """
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	291
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	292 @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	293 @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	294 @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	295 @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	296 @param request: HTTP request
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	297 @param profile
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	298 """
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	299
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	300 def gotItems(items):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	301 items, metadata = items
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	302 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	303
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	304 def gotMetadata(result):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	305 dummy, rsm_metadata = result
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_count'] = rsm_metadata['rsm_count']
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 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	311 metadata['rsm_index'] = unicode(int(rsm_metadata['rsm_index'])-1)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	312 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	313 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	314
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	315 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	316
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	317 def gotComments(comments):
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	318 # at this point we can merge mam dict
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	319 request.extra_dict.update(request.mam_extra)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	320 # 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	321 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	322 self.renderHTML([(item, comments)], metadata, request, pub_jid, profile)
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	323
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	324 # get the comments
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	325 # max_comments = int(extra_comments_dict['rsm_max']) # FIXME
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	326 max_comments = 0
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	327 # 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	328 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	329 extra_comments_dict, C.SERVICE_PROFILE,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	330 callback=gotComments,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	331 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	332
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	333 # 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	334 # 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	335 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	336 {"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	337 callback=gotMetadata,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	338 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	339
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	340 # get the main item
826 70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	341 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	342 extra_dict, C.SERVICE_PROFILE,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	343 callback=gotItems,
70939916dc80 server (blog): added unhandler errback in getItemById Goffi <goffi@goffi.org> parents: 825 diff changeset	344 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	345
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	346 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	347 """
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	348
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	349 @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	350 @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	351 @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	352 @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	353 @param request: HTTP request
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	354 @param profile
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	355 """
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	356 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	357 remaining, results = data
824 d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	358 # we have requested one node only
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	359 assert remaining == 0
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	360 assert len(results) == 1
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	361 service, node, failure, items, metadata = results[0]
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	362 if failure:
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	363 self.renderError(failure, request, pub_jid)
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	364 else:
d990ae5612df server (blog): better handling of mbGetFromManyWithCommentsRTResult in getItems Goffi <goffi@goffi.org> parents: 823 diff changeset	365 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	366
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	367 def getResult(rt_session):
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	368 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	369 callback=lambda data: getResultCb(data, rt_session),
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	370 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	371
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	372 # max_comments = int(extra_comments_dict['rsm_max']) # FIXME
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	373 max_comments = 0
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	374 # 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	375 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	376 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	377 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	378
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	379 ## rendering
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	380
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	381 def _updateDict(self, value, dict_, key):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	382 dict_[key] = value
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	383
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	384 def _getImageParams(self, options, key, default, alt):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	385 """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	386 url = options[key] if key in options else ''
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	387 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	388 if re.match(regexp, url):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	389 url = url
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	390 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	391 url = default
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	392 return BlogImage(url, alt)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	393
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	394 def renderError(self, failure, request, pub_jid):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	395 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	396 request.finish()
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	397
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	398 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	399 """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	400
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	401 @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	402 @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	403 @param request: HTTP request
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	404 @param pub_jid (JID): publisher JID
3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	405 @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	406 """
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	407 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	408 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	409
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	410 d = self.getAvatarURL(pub_jid)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	411 d.addCallback(self._updateDict, options, 'avatar')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	412 d.addErrback(self.renderError, request, pub_jid)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	413 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	414
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	415 for param_name in PARAMS_TO_GET:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	416 d = defer.Deferred()
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	417 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	418 d.addCallback(self._updateDict, options, param_name)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	419 d.addErrback(self.renderError, request, pub_jid)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	420 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	421
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	422 dlist_d = defer.DeferredList(d_list)
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	423 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	424
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	425 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	426 """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	427
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	428 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	429 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	430 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	431 @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	432 - 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	433 - 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	434 - 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	435 - node (unicode): comments node
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	436 - 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	437 - 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	438 - 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	439 @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	440 @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	441 @param request: the HTTP request
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	442 @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	443 """
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	444 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	445 options = {}
727 3bd097380da7 server side (blog): fixes displaying the avatar souliane <souliane@mailoo.org> parents: 726 diff changeset	446 user = sanitizeHtml(pub_jid.user)
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	447 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	448
483 0bbbef1d53a8 server side (blog): use user's avatar a the blog's favicon + small refactorization souliane <souliane@mailoo.org> parents: 481 diff changeset	449 def getOption(key):
726 e949b7c7ed9c server side (blog): fixes unicode error souliane <souliane@mailoo.org> parents: 725 diff changeset	450 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	451
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	452 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	453 title = getOption(C.STATIC_BLOG_PARAM_TITLE) or user
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	454 data = {'base_url': base_url,
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	455 'keywords': getOption(C.STATIC_BLOG_PARAM_KEYWORDS),
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	456 '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	457 'title': title,
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	458 'favicon': avatar,
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	459 '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	460 }
586 3eb3a2c0c011 browser and server side: uses RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 487 diff changeset	461
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	462 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	463 data['messages'] = []
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	464 for item in items:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	465 item, comments_list = item
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	466 comments, comments_count = [], 0
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	467 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	468 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	469 try:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	470 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	471 except KeyError:
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	472 pass
c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	473 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	474
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	475 request.write(self.useTemplate(request, 'static_blog', data))
10 c28a4840e1a8 server: microblog resource Goffi <goffi@goffi.org> parents: diff changeset	476 request.finish()
243 63e9b680d3e7 browser_side, blog: better PEP8 compliance souliane <souliane@mailoo.org> parents: 229 diff changeset	477
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	478 def renderAtomFeed(self, feed, request):
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	479 request.write(feed.encode('utf-8'))
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	480 request.finish()
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	481
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	482
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	483 class NavigationLinks(object):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	484
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	485 def __init__(self, request, items, rsm_data, base_url):
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	486 """Build the navigation links.
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	487
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	488 @param items (list): list of items
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	489 @param rsm_data (dict): rsm data
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	490 @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	491 @return: dict
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	492 """
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	493 # query data which must be present in all links
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	494 default_query_data = getDefaultQueryData(request)
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	495
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	496 # which links we need to display
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	497 if request.display_single:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	498 links = ('later_message', 'older_message')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	499 # key must exist when using the template
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	500 self.later_messages = self.older_messages = ''
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	501 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	502 links = ('later_messages', 'older_messages')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	503 self.later_message = self.older_message = ''
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	504
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	505 # now we set the links according to RSM
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	506 for key in links:
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	507 query_data = default_query_data.copy()
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	508
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	509 if key.startswith('later_message'):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	510 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	511 index = int(rsm_data['rsm_index'])
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	512 except (KeyError, ValueError):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	513 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	514 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	515 if index == 0:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	516 # we don't show this link on first page
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	517 setattr(self, key, '')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	518 continue
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	519 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	520 query_data['before'] = rsm_data['rsm_first'].encode('utf-8')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	521 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	522 pass
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	523 else:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	524 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	525 index = int(rsm_data['rsm_index'])
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	526 count = int(rsm_data.get('rsm_count'))
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	527 except (KeyError, ValueError):
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	528 # 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	529 # are on the last page or not
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	530 pass
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	531 else:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	532 # if we have index, we don't show the after link
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	533 # on the last page
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	534 if index + len(items) >= count:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	535 setattr(self, key, '')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	536 continue
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	537 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	538 query_data['after'] = rsm_data['rsm_last'].encode('utf-8')
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	539 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	540 pass
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	541
708 e9a6cbb924e6 server_side: fixes static blog navigation links souliane <souliane@mailoo.org> parents: 705 diff changeset	542 if request.display_single:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	543 query_data['max'] = 1
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	544
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	545 link = "{}?{}".format(base_url, urllib.urlencode(query_data))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	546 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	547
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	548
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	549 class BlogImage(object):
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	550
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	551 def __init__(self, url_, alt):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	552 self.url = url_
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	553 self.alt = alt
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	554
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	555
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	556 class BlogLink(object):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	557
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	558 def __init__(self, url_, style, text):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	559 self.url = url_
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	560 self.style = style
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	561 self.text = text
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	562
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	563
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	564 class BlogMessage(object):
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	565
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	566 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	567 """
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	568
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	569 @param request: HTTP request
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	570 @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	571 @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	572 @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	573 @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	574 """
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	575 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	576
725 c1abaa91a121 server (blog): update to the new mechanism in XEP-0277 + improvement: souliane <souliane@mailoo.org> parents: 717 diff changeset	577 # 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	578 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	579
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	580 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	581 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	582 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	583 self.content = self.getText(entry, 'content')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	584
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	585 if is_comment:
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	586 self.author = (_("from {}").format(entry['author']))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	587 else:
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	588 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	589 self.url = "{}/{}".format(base_url, _quote(entry['id']))
828 0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	590 query_data = getDefaultQueryData(request)
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	591 if query_data:
0c824ebe9d87 server (blog): implemented tag/category filtering: Goffi <goffi@goffi.org> parents: 827 diff changeset	592 self.url += '?{}'.format(urllib.urlencode(query_data))
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	593 self.title = self.getText(entry, 'title')
831 25931797db20 server (blog/themes): sanitize tags + display tags URLs souliane <souliane@mailoo.org> parents: 830 diff changeset	594 self.tags = [sanitizeHtml(tag) for tag in common.dict2iter('tag', entry)]
712 bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	595
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	596 count_text = lambda count: D_('comments') if count > 1 else D_('comment')
704 5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	597
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	598 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	599
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	600 delta = comments_count - len(comments)
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	601 if request.display_single and delta > 0:
830 a825700c01e4 server (blog): fixes typo in a dict declaration souliane <souliane@mailoo.org> parents: 829 diff changeset	602 prev_url = "{}?{}".format(self.url, urllib.urlencode({'comments_max': comments_count}))
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	603 prev_text = D_("show {count} previous {comments}").format(
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	604 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	605 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	606
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	607 if comments:
bf562fb9c273 server_side: use Jinja2 template engine for static blog souliane <souliane@mailoo.org> parents: 708 diff changeset	608 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	609
5319110a862c server_side: static blog uses the default template souliane <souliane@mailoo.org> parents: 702 diff changeset	610 def getText(self, entry, key):
823 027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	611 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	612 return entry['{}_xhtml'.format(key)]
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	613 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	614 try:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	615 processor = addURLToText if key.startswith('content') else sanitizeHtml
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	616 return convertNewLinesToXHTML(processor(entry[key]))
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	617 except KeyError:
027139763511 server (blog): cleaning & improvments: Goffi <goffi@goffi.org> parents: 818 diff changeset	618 return None

Mercurial > libervia-web

annotate src/server/blog.py @ 831:25931797db20