From 534736d94c6fbc5dfc7751a00e9baadd9362c660 Mon Sep 17 00:00:00 2001 From: dishantsethi Date: Fri, 28 May 2021 15:01:35 +0530 Subject: [PATCH] duplicate content urls --- junction/proposals/templatetags/proposal_filters.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/junction/proposals/templatetags/proposal_filters.py b/junction/proposals/templatetags/proposal_filters.py index 3e3232a7..f23c248d 100644 --- a/junction/proposals/templatetags/proposal_filters.py +++ b/junction/proposals/templatetags/proposal_filters.py @@ -47,9 +47,14 @@ def is_reviewer_voted(proposal, user, phase=None): @register.filter(name="get_content_urls") def get_content_urls(proposal): + import markdown + if proposal.content_urls: - url_re = r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+" - urls = re.findall(url_re, proposal.content_urls) + url_re = markdown.markdown(proposal.content_urls) + urls = re.findall("href=[\"'](.*?)[\"']", url_re) + if not urls: + url_re = r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+" + urls = re.findall(url_re, proposal.content_urls) return urls else: return []