From 0b6256bae8365d8f8ae381a97875ce8298e1238c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 27 Jul 2021 01:00:14 +0000 Subject: [PATCH 1/3] schema --- schema.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/schema.sql b/schema.sql index 8317287c1..2b1489fb8 100644 --- a/schema.sql +++ b/schema.sql @@ -717,7 +717,6 @@ CREATE TABLE public.domains ( can_submit boolean, can_comment boolean, reason integer, - show_thumbnail boolean, embed_function character varying(64), embed_template character varying(32) DEFAULT NULL::character varying, sandbox_embed boolean DEFAULT false From ab94376e7b67f2442be7e1410a40dd95a8d0cac5 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Tue, 27 Jul 2021 16:29:03 +0200 Subject: [PATCH 2/3] sneed --- drama/helpers/sanitize.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drama/helpers/sanitize.py b/drama/helpers/sanitize.py index ec213317e..23607013c 100644 --- a/drama/helpers/sanitize.py +++ b/drama/helpers/sanitize.py @@ -1,7 +1,7 @@ import bleach from bs4 import BeautifulSoup from bleach.linkifier import LinkifyFilter -from urllib.parse import ParseResult, urlunparse +from urllib.parse import ParseResult, urlunparse, urlencode, urlparse, parse_qs from functools import partial from .get import * from os import path @@ -205,6 +205,13 @@ def sanitize(text, linkgen=False, flair=False): for i in re.finditer('(/comments/.*?)"', sanitized): url = i.group(1) - if not "sort=" in url: sanitized = sanitized.replace(url, f"{url}?sort=controversial") + p = urlparse(url).query + p = parse_qs(p) + + if 'sort' not in p: + p['sort'] = ['controversial'] + + url_noquery = url.split('?')[0] + sanitized = sanitized.replace(url, f"{url_noquery}?{urlencode(p, True)}") return sanitized \ No newline at end of file From 7d5a0e86c9308a66c9a53ec0d214b7f91ad8e855 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 27 Jul 2021 20:00:14 +0000 Subject: [PATCH 3/3] schema --- schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.sql b/schema.sql index 2b1489fb8..c1efd42e2 100644 --- a/schema.sql +++ b/schema.sql @@ -869,7 +869,7 @@ CREATE TABLE public.modactions ( target_comment_id integer, created_utc integer DEFAULT 0, kind character varying(32) DEFAULT NULL::character varying, - _note character varying(256) DEFAULT NULL::character varying + _note character varying(350) DEFAULT NULL::character varying );