From 69e3d7f267df1aaf49c43f29f8bb0df6a67512f4 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 5 Oct 2017 01:22:34 +1100
Subject: [PATCH] Use a much shorter scheme for constructing PGP key URLs -
 hashes are now MD5 in base64, which isn't secure but doesn't need to be since
 it's just for cachebusting

---
 config/models                                                   | 2 +-
 src/Widget/Hcard.hs                                             | 2 +-
 .../ACA7BABE.asc                                                | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename static/pgp/{83F3DCEC98D522B6A38AF5D927D076D2ACA7BABE/730bdc101033253892477f590e847fc0e494327d452a433f085ad1cd2db6cea4 => RXDVvgKpVG2xsEnpLNjGwg}/ACA7BABE.asc (100%)

diff --git a/config/models b/config/models
index 60e52dc..58a434d 100644
--- a/config/models
+++ b/config/models
@@ -10,7 +10,7 @@ User
 PgpKey
     userId UserId
     fingerprint Text maxlen=40
-    hash Text maxlen=64
+    hash Text maxlen=22
     UniqueFingerprint fingerprint
 
 Site
diff --git a/src/Widget/Hcard.hs b/src/Widget/Hcard.hs
index 227ca45..d8881f1 100644
--- a/src/Widget/Hcard.hs
+++ b/src/Widget/Hcard.hs
@@ -27,7 +27,7 @@ prettyPgp = T.unwords . T.chunksOf 4 . pgpKeyFingerprint
 
 routeFromPgp :: PgpKey -> Route App
 routeFromPgp PgpKey { pgpKeyFingerprint = f, pgpKeyHash = h } =
-    StaticR $ StaticRoute ["pgp", f, h, T.takeEnd 8 f ++ ".asc"] []
+    StaticR $ StaticRoute ["pgp", h, T.takeEnd 8 f ++ ".asc"] []
 
 hcard :: Entity User -> Widget
 hcard (Entity userId user) = do
diff --git a/static/pgp/83F3DCEC98D522B6A38AF5D927D076D2ACA7BABE/730bdc101033253892477f590e847fc0e494327d452a433f085ad1cd2db6cea4/ACA7BABE.asc b/static/pgp/RXDVvgKpVG2xsEnpLNjGwg/ACA7BABE.asc
similarity index 100%
rename from static/pgp/83F3DCEC98D522B6A38AF5D927D076D2ACA7BABE/730bdc101033253892477f590e847fc0e494327d452a433f085ad1cd2db6cea4/ACA7BABE.asc
rename to static/pgp/RXDVvgKpVG2xsEnpLNjGwg/ACA7BABE.asc