Replace URLs to links in comments (#95)

svjis · Oct 5, 2024 · 1d2bb9d · 1d2bb9d
1 parent b5b6c6b
commit 1d2bb9d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/svjis/articles/templates/article.html b/svjis/articles/templates/article.html
@@ -37,7 +37,7 @@ <h1 class="article-title" id="tbl-desc">{{ obj.header | highlight:search | safe
 <h2 class="article-title">{% trans 'Comments' %}:</h2>
 {% for comment in obj.comments %}
 <div class="article box"><strong>{{ comment.author.first_name }}&nbsp;{{ comment.author.last_name }} {{ comment.created_date | date:"d.m.Y H:i" }}</strong>
-    <br>{{ comment.body | linebreaks | safe }}
+    <br>{{ comment.body | replace_url_to_link | linebreaks | safe }}
 </div>
 {% endfor %}
 {% endif %}

diff --git a/svjis/articles/templates/fault.html b/svjis/articles/templates/fault.html
@@ -112,7 +112,7 @@ <h1 class="page-title"  {% if obj.closed %}style="text-decoration: line-through;
 <h2 class="article-title">{% trans 'Comments' %}:</h2>
     {% for comment in obj.comments %}
     <div class="article box"><strong>{{ comment.author.first_name }}&nbsp;{{ comment.author.last_name }} {{ comment.created_date | date:"d.m.Y H:i" }}</strong>
-        <br>{{ comment.body | linebreaks | safe }}
+        <br>{{ comment.body | replace_url_to_link | linebreaks | safe }}
     </div>
     {% endfor %}
 {% endif %}

diff --git a/svjis/articles/templatetags/article_filters.py b/svjis/articles/templatetags/article_filters.py
@@ -4,6 +4,7 @@
 from django.template.defaultfilters import stringfilter
 from django.conf import settings
 import markdown as md
+import re
 from re import IGNORECASE, compile
 
 register = template.Library()
@@ -35,6 +36,17 @@ def inject_pictures(text, assets):
     return mark_safe(text)
 
 
+@register.filter()
+def replace_url_to_link(value):
+    # Replace url to link
+    urls = re.compile(r"((https?):((//)|(\\\\))+[\w\d:#@%/;$()~_?\+-=\\\.&]*)", re.MULTILINE | re.UNICODE)
+    value = urls.sub(r'<a href="\1" target="_blank">\1</a>', value)
+    # Replace email to mailto
+    urls = re.compile(r"([\w\-\.]+@(\w[\w\-]+\.)+[\w\-]+)", re.MULTILINE | re.UNICODE)
+    value = urls.sub(r'<a href="mailto:\1">\1</a>', value)
+    return mark_safe(value)
+
+
 @register.filter()
 def yes_no(bool_value):
     result = gt("Yes") if bool_value else gt("No")