From 575b6819c733c4a0bfec155ecda6156049ef77d4 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Mon, 17 Feb 2020 09:49:54 +0100 Subject: [PATCH] Fixed error 500 when rendering markdown --- api/funkwhale_api/common/utils.py | 5 ++++- api/requirements/base.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/funkwhale_api/common/utils.py b/api/funkwhale_api/common/utils.py index ca870e141..ab89925a1 100644 --- a/api/funkwhale_api/common/utils.py +++ b/api/funkwhale_api/common/utils.py @@ -249,8 +249,11 @@ def join_queries_or(left, right): return right +MARKDOWN_RENDERER = markdown.Markdown(extensions=["nl2br", "extra"]) + + def render_markdown(text): - return markdown.markdown(text, extensions=["nl2br", "extra"]) + return MARKDOWN_RENDERER.convert(text) SAFE_TAGS = [ diff --git a/api/requirements/base.txt b/api/requirements/base.txt index 5e6f5d447..87a36dae5 100644 --- a/api/requirements/base.txt +++ b/api/requirements/base.txt @@ -76,5 +76,5 @@ django-cacheops==4.2 click>=7,<8 service_identity==18.1.0 -markdown>=3,<4 +markdown>=3.2,<4 bleach>=3,<4