From 52106f1d3f64c49eb2be67c0801dfb4aa8205353 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Mon, 30 Oct 2017 14:58:50 +1100
Subject: [PATCH] Make shortlinks discoverable by displaying them on each
 entry, with extraneous bits trimmed out

---
 entries/templates/entries/h-entry.html  |  8 ++++++--
 lemoncurry/templatetags/friendly_url.py | 10 ++++++++++
 lemoncurry/templatetags/shortlink.py    | 10 ++++++++++
 lemoncurry/utils.py                     | 12 +++++++++++-
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 lemoncurry/templatetags/friendly_url.py
 create mode 100644 lemoncurry/templatetags/shortlink.py

diff --git a/entries/templates/entries/h-entry.html b/entries/templates/entries/h-entry.html
index c46b121..bf3b2b0 100644
--- a/entries/templates/entries/h-entry.html
+++ b/entries/templates/entries/h-entry.html
@@ -1,4 +1,4 @@
-{% load humanize markdown %}<article class="card h-entry">
+{% load friendly_url humanize markdown shortlink %}<article class="card h-entry">
 	{% if entry.photo %}<img class="card-img-top u-photo" src="{{ entry.photo.url }}" />{% endif %}
 	<div class="card-body">
 		{% if entry.name %}<h4 class="card-title p-name">{{ entry.name }}</h4>{% endif %}
@@ -9,12 +9,16 @@
 			<img class="u-photo" src="{{ entry.author.avatar.url }}" />
 			{{ entry.author.first_name }} {{ entry.author.last_name }}
 		</a>
-		<a class="u-url" href="{{ entry.url }}">
+		<a class="u-uid u-url" href="{{ entry.url }}">
 			<time class="dt-published" datetime="{{ entry.published.isoformat }}">
 				<i class="fa fa-calendar"></i>
 				{{ entry.published | naturaltime }}
 			</time>
 		</a>
+		{% shortlink entry as short %}<a class="u-url" href="{{ short }}">
+			<i class="fa fa-link"></i>
+			{{ short | friendly_url }}
+		</a>
 		{% if entry.updated != entry.published %}
 		<time class="dt-updated" datetime="{{ entry.updated.isoformat }}">
 			<i class="fa fa-pencil"></i>
diff --git a/lemoncurry/templatetags/friendly_url.py b/lemoncurry/templatetags/friendly_url.py
new file mode 100644
index 0000000..a3ad561
--- /dev/null
+++ b/lemoncurry/templatetags/friendly_url.py
@@ -0,0 +1,10 @@
+from django import template
+from urllib.parse import urlunparse, urlparse
+
+register = template.Library()
+
+
+@register.filter
+def friendly_url(url):
+    (scheme, netloc, path, params, q, fragment) = urlparse(url)
+    return urlunparse(('', netloc, path, '', '', ''))
diff --git a/lemoncurry/templatetags/shortlink.py b/lemoncurry/templatetags/shortlink.py
new file mode 100644
index 0000000..0a2a645
--- /dev/null
+++ b/lemoncurry/templatetags/shortlink.py
@@ -0,0 +1,10 @@
+from django import template
+from django.template import Context
+from lemoncurry import utils
+
+register = template.Library()
+
+
+@register.simple_tag
+def shortlink(obj):
+    return utils.shortlink(obj)
diff --git a/lemoncurry/utils.py b/lemoncurry/utils.py
index 6afb0f3..6ce735a 100644
--- a/lemoncurry/utils.py
+++ b/lemoncurry/utils.py
@@ -3,8 +3,10 @@ from accept_types import get_best_match
 from django.conf import settings
 from django.http import HttpResponse
 from os.path import join
+from shorturls import default_converter as converter
+from shorturls.templatetags.shorturl import ShortURL
 from types import SimpleNamespace
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urljoin
 
 cache = SimpleNamespace(package_json=None)
 
@@ -38,3 +40,11 @@ def form_encoded_response(content):
         urlencode(content),
         content_type='application/x-www-form-urlencoded'
     )
+
+
+def shortlink(obj):
+    prefix = ShortURL(None).get_prefix(obj)
+    tinyid = converter.from_decimal(obj.pk)
+    if hasattr(settings, 'SHORT_BASE_URL') and settings.SHORT_BASE_URL:
+        return urljoin(settings.SHORT_BASE_URL, prefix + tinyid)
+    return '/' + prefix + tinyid