From 1e86666e227b955f37170699452e36d2805d329d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Iranzo=20G=C3=B3mez?= <Pablo.Iranzo@gmail.com>
Date: Fri, 7 Feb 2020 11:34:24 +0100
Subject: [PATCH] (feat) Allow combination of single or multiple galleries into
 one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pablo Iranzo Gómez <Pablo.Iranzo@gmail.com>
---
 .../photoswipe-instagram-gallery.md           | 13 +++
 static/js/create-instagram-gallery.js         | 81 +++++++++----------
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/documentation/content/Components/photoswipe-instagram-gallery.md b/documentation/content/Components/photoswipe-instagram-gallery.md
index 4997a5e1..85f04d0f 100644
--- a/documentation/content/Components/photoswipe-instagram-gallery.md
+++ b/documentation/content/Components/photoswipe-instagram-gallery.md
@@ -46,3 +46,16 @@ It's code is
 ```html
 <div class="elegant-instagram" data-instagram-id="B7yh4IdItNd"></div>
 ```
+
+## A combined single + multiple post
+
+<div class="elegant-instagram" data-instagram-id="BwWo35fAcR3,B7yh4IdItNd"></div>
+
+It's code is
+
+```html
+<div
+  class="elegant-instagram"
+  data-instagram-id="BwWo35fAcR3,B7yh4IdItNd"
+></div>
+```
diff --git a/static/js/create-instagram-gallery.js b/static/js/create-instagram-gallery.js
index 9cd45953..73c3bc74 100644
--- a/static/js/create-instagram-gallery.js
+++ b/static/js/create-instagram-gallery.js
@@ -43,33 +43,47 @@ const convertInstagramToPhotoSwipe = () => {
   // Get div.elegant-instagram
   document.querySelectorAll(".elegant-instagram").forEach(ele => {
     // Get instagram-id
-    const instagramId = ele.dataset.instagramId;
-
-    fetch(`https://www.instagram.com/p/${instagramId}/?__a=1`)
-      .then(response => {
-        response.json().then(json => {
-          // Get Original image from the json
-          const level1 = json.graphql.shortcode_media;
-
-          let divHTML = `<div
+    const instagramIds = ele.dataset.instagramId;
+    let divHTML = `<div
                           class="elegant-gallery"
                           itemscope
                           itemtype="http://schema.org/ImageGallery"
                         >`;
+    instagramIds.split(",").forEach(instagramId => {
+      fetch(`https://www.instagram.com/p/${instagramId}/?__a=1`).then(
+        response => {
+          response.json().then(json => {
+            // Get Original image from the json
+            const level1 = json.graphql.shortcode_media;
+            const username = level1.owner.username;
+            const name = level1.owner.full_name;
 
-          const username = level1.owner.username;
-          const name = level1.owner.full_name;
+            if (
+              level1.edge_sidecar_to_children &&
+              level1.edge_sidecar_to_children.edges.length > 0
+            ) {
+              // It is more than one image
+              level1.edge_sidecar_to_children.edges.forEach(edge => {
+                const origImage = edge.node.display_url;
+                const height = edge.node.dimensions.height;
+                const width = edge.node.dimensions.width;
+                const thumbnail = edge.node.display_resources[0].src;
 
-          if (
-            level1.edge_sidecar_to_children &&
-            level1.edge_sidecar_to_children.edges.length > 0
-          ) {
-            // It is more than one image
-            level1.edge_sidecar_to_children.edges.forEach(edge => {
-              const origImage = edge.node.display_url;
-              const height = edge.node.dimensions.height;
-              const width = edge.node.dimensions.width;
-              const thumbnail = edge.node.display_resources[0].src;
+                divHTML += getFigureHTML(
+                  origImage,
+                  height,
+                  width,
+                  thumbnail,
+                  username,
+                  name,
+                  instagramId
+                );
+              });
+            } else {
+              const origImage = level1.display_url;
+              const height = level1.dimensions.height;
+              const width = level1.dimensions.width;
+              const thumbnail = level1.display_resources[0].src;
 
               divHTML += getFigureHTML(
                 origImage,
@@ -80,23 +94,8 @@ const convertInstagramToPhotoSwipe = () => {
                 name,
                 instagramId
               );
-            });
-          } else {
-            const origImage = level1.display_url;
-            const height = level1.dimensions.height;
-            const width = level1.dimensions.width;
-            const thumbnail = level1.display_resources[0].src;
-
-            divHTML += getFigureHTML(
-              origImage,
-              height,
-              width,
-              thumbnail,
-              username,
-              name,
-              instagramId
-            );
-          }
+            }
+          });
 
           // Close div
           divHTML += `</div>`;
@@ -107,9 +106,9 @@ const convertInstagramToPhotoSwipe = () => {
 
           // Trigger PhotoSwipe
           initPhotoSwipeFromDOM(".elegant-gallery");
-        });
-      })
-      .catch(err => console.error("Failed", err));
+        }
+      );
+    });
   });
 };