Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 14:06:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2022-03-24 19:39:45 +00:00
commit b0659a112d
5 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
synapse/push/mailer.py
View file

@ -18,7 +18,6 @@ from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, TypeVar
import bleach
import jinja2
from markupsafe import Markup
from synapse.api.constants import EventTypes, Membership, RoomTypes
from synapse.api.errors import StoreError
@ -868,7 +867,7 @@ class Mailer:
)
def safe_markup(raw_html: str) -> Markup:
def safe_markup(raw_html: str) -> jinja2.Markup:
"""
Sanitise a raw HTML string to a set of allowed tags and attributes, and linkify any bare URLs.
@ -878,7 +877,7 @@ def safe_markup(raw_html: str) -> Markup:
Returns:
A Markup object ready to safely use in a Jinja template.
"""
return Markup(
return jinja2.Markup(
bleach.linkify(
bleach.clean(
raw_html,
@ -892,7 +891,7 @@ def safe_markup(raw_html: str) -> Markup:
)
def safe_text(raw_text: str) -> Markup:
def safe_text(raw_text: str) -> jinja2.Markup:
"""
Sanitise text (escape any HTML tags), and then linkify any bare URLs.
@ -902,7 +901,7 @@ def safe_text(raw_text: str) -> Markup:
Returns:
A Markup object ready to safely use in a Jinja template.
"""
return Markup(
return jinja2.Markup(
bleach.linkify(bleach.clean(raw_text, tags=[], attributes=[], strip=False))
)