From e871ddf51db73fca4c54c85cb11a745bc7310cf2 Mon Sep 17 00:00:00 2001
From: Nicolas Joyard <joyard.nicolas@gmail.com>
Date: Thu, 2 Jun 2016 08:40:31 +0200
Subject: [PATCH] Fix social nickname extraction
---
memopol/templatetags/memopol_tags.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/memopol/templatetags/memopol_tags.py b/memopol/templatetags/memopol_tags.py
index 2fe32619..6c26fea6 100644
--- a/memopol/templatetags/memopol_tags.py
+++ b/memopol/templatetags/memopol_tags.py
@@ -10,23 +10,23 @@ link = '<a class="{network}-link" href="{url}" target="_blank">{label}</a>'
@register.filter
def twitter_link(url):
return mark_safe(link.format(network='twitter', url=url,
- label=re.sub(r'.*/@?([^/]+)', '@\\1', url)))
+ label=re.sub(r'.*/@?([^/]+)', '@\\1', re.sub(r'/$', '', url.strip()))))
@register.filter
def facebook_link(url):
return mark_safe(link.format(network='facebook', url=url,
- label=re.sub(r'.*/([^/]+)', '\\1', url)))
+ label=re.sub(r'.*/([^/]+)', '\\1', re.sub(r'/$', '', url.strip()))))
@register.filter
def website_link(url):
short_url = re.sub(r'^https?://([^/]+).*', '\\1', url)
return mark_safe(link.format(network='website', url=url,
- label=short_url))
+ label=short_url))
@register.filter
def email_link(address):
return mark_safe(link.format(network='email', url='mailto:%s' % address,
- label=address))
+ label=address))
--
GitLab