improve error response

codemonauts · Feb 16, 2021 · ed2de67 · ed2de67
1 parent 3a8c15d
commit ed2de67
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,11 @@
 # Instagram Feed Changelog
 
-## Unreleased
+## 1.0.6 - 2021-02-16
 ### Added
 - Enable environment variables for setting username (thanks to @niektenhoopen)
-- Add rel noopener and noreferrer properties to links (thanks to @JayBox325)
-- Add full image URL
-- Add hasAudio attribute
+- Add rel noopener and noreferrer properties to links in the README (thanks to @JayBox325)
+- Add full image URL attribute.
+- Add hasAudio attribute.
 
 ### Changed
 - Prevent request storm if no items are cached and the request failed.

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "codemonauts/craft-instagram-feed",
   "description": "Craft CMS plugin to receive Instragram feed data as variable in templates.",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "craft-plugin",
   "keywords": [
     "craft",

diff --git a/src/services/InstagramService.php b/src/services/InstagramService.php
@@ -100,7 +100,11 @@ private function getInstagramAccountData(string $account): array
         }
 
         if (!array_key_exists('ProfilePage', $obj['entry_data'])) {
-            Craft::error('Instagram profile data could not be fetched. Maybe the site structure has changed.', __METHOD__);
+            if (stripos($html, 'welcome back to instagram') !== false) {
+                Craft::error('Instagram tag data could not be fetched. It seems that your IP address has been blocked by Instagram. See https://github.com/codemonauts/craft-instagram-feed/issues/32', __METHOD__);
+            } else {
+                Craft::error('Instagram tag data could not be fetched. Maybe the site structure has changed.', __METHOD__);
+            }
 
             return [];
         }
@@ -136,7 +140,11 @@ private function getInstagramTagData(string $tag): array
         }
 
         if (!array_key_exists('TagPage', $obj['entry_data'])) {
-            Craft::error('Instagram tag data could not be fetched. Maybe the site structure has changed.', __METHOD__);
+            if (stripos($html, 'welcome back to instagram') !== false) {
+                Craft::error('Instagram tag data could not be fetched. It seems that your IP address has been blocked by Instagram. See https://github.com/codemonauts/craft-instagram-feed/issues/32', __METHOD__);
+            } else {
+                Craft::error('Instagram tag data could not be fetched. Maybe the site structure has changed.', __METHOD__);
+            }
 
             return [];
         }