Get rid of shortening; render URLs.

2 files changed, 10 insertions, 9 deletions

diff --git a/aliases.txr b/aliases.txr
index f667918..67874c7 100644
--- a/aliases.txr
+++ b/aliases.txr
@@ -14,15 +14,8 @@
      (:method get-decoded-memo (alias)
        (url-decode alias.memo))
      (:method get-html-memo (alias)
-       (let* ((mem alias.(get-decoded-memo))
-              (html (html-encode mem)))
-         (ifa (< (length mem) 60)
-           html
-           `<span title="@(html-encode mem)">         \
-              @(html-encode [mem 0..27])            \ \
-              [<a href="mailto:@mem"                  \
-                  onclick="return false;">...</a>]  \ \
-              @(html-encode [mem -27..t])</span>`)))))
+       (let* ((mem alias.(get-decoded-memo)))
+         (html-encode-with-http mem)))))
 @;
 @(bind selected-alias-keys nil)
 @;
diff --git a/util.tl b/util.tl
index 71fc985..e987423 100644
--- a/util.tl
+++ b/util.tl
@@ -21,3 +21,11 @@
 
 (defun move-tail (items keys)
   (move-impl items keys (length items)))
+
+(defun html-encode-with-http (str)
+  (let* ((pairs (tuples 2 (tok-str str #/https?:\/\/\S+/ t))))
+    (cat-str
+      (mappend (tb ((text : link))
+                 (list (html-encode text)
+                       (if link `<sup>[<a href="@link">link</a>]</sup>`)))
+               pairs))))