From 9a5b16934dc0f9841fbb8fea933ea48ceb894801 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 1 Dec 2018 21:19:13 +0000
Subject: [PATCH] Use high quality images in gallery, and make only 1 API call

---
 layouts/_default/flickr.html | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/layouts/_default/flickr.html b/layouts/_default/flickr.html
index 19d3916..0f442b1 100644
--- a/layouts/_default/flickr.html
+++ b/layouts/_default/flickr.html
@@ -6,24 +6,20 @@
     {{ $id := .Params.photoset }}
     {{ $query := querify "format" "json" "nojsoncallback" "1" "api_key" .Site.Data.flickr.api_key  }}
 
-    {{ $method := querify "method" "flickr.photosets.getPhotos" "user_id" .Site.Data.flickr.user_id "photoset_id" $id "extras" "url_l" }}
-    {{ $photoset_orig:= (getJSON "https://api.flickr.com/services/rest/?" $query "&" $method).photoset }}
-
-    {{ $method := querify "method" "flickr.photosets.getPhotos" "user_id" .Site.Data.flickr.user_id "photoset_id" $id "extras" "url_sq" }}
-    {{ $photoset_thumb := (getJSON "https://api.flickr.com/services/rest/?" $query "&" $method).photoset }}
+    {{ $method := querify "method" "flickr.photosets.getPhotos" "user_id" .Site.Data.flickr.user_id "photoset_id" $id "extras" "url_k,url_q" }}
+    {{ $photoset := (getJSON "https://api.flickr.com/services/rest/?" $query "&" $method).photoset }}
 
     <div id="light-gallery" class="row">
-    {{ range $index, $element := $photoset_orig.photo }}
-      {{ $thumb := (index $photoset_thumb.photo $index).url_sq }}
-      <a href="{{ $element.url_l }}" title="{{ $element.title }}" class="col-2">
-        <img src="{{ $thumb }}" alt="{{ $element.title }}"/>
+    {{ range $element := $photoset.photo }}
+      <a href="{{ $element.url_k }}" title="{{ $element.title }}" class="col-md-2 col-xs-12">
+        <img src="{{ $element.url_q }}" alt="{{ $element.title }}"/>
       </a>
     {{ end }}
     </div>
 
     <h4>
       <a href="{{ .Site.Data.social.accounts.flickr.link }}sets/{{ $id }}/">
-        View entire <i>{{ $photoset_orig.title }}</i> album on Flickr
+        View entire <i>{{ $photoset.title }}</i> album on Flickr
       </a>
     </h4>
   </div>