fixes #13

Bolandish · Jun 14, 2016 · 2449912 · 2449912
1 parent 4713035
commit 2449912
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
       "email": "[email protected]"
     }
   ],
-  "version": "1.0.8",
+  "version": "1.0.9",
   "autoload": {
     "psr-4": {"Bolandish\\": "src/"}
   }

diff --git a/src/Instagram.php b/src/Instagram.php
@@ -8,8 +8,13 @@ public static function getMediaByHashtag($hashtag = null, $count = 16, $assoc =
         {
             return false;
         }
+        if($comment_count){
+            $comments = "comments.last($comment_count) {           count,           nodes {             id,             created_at,             text,             user {               id,               profile_pic_url,               username             }           },           page_info         }";
+        }else{
+            $comments = "comments {       count     }";
+        }
         $hashtag = strtolower($hashtag);
-        $parameters = urlencode("ig_hashtag($hashtag) { media.first($count) {   count,   nodes {     caption,     code,    comments.last($comment_count) {           count,           nodes {             id,             created_at,             text,             user {               id,               profile_pic_url,               username             }           },           page_info         },     date,     dimensions {       height,       width     },     display_src,     id,     is_video,     likes {       count     },     owner {       id,       username,       full_name,       profile_pic_url,     biography     },     thumbnail_src,     video_views,     video_url   },   page_info }  }");
+        $parameters = urlencode("ig_hashtag($hashtag) { media.first($count) {   count,   nodes {     caption,     code,   $comments,     date,     dimensions {       height,       width     },     display_src,     id,     is_video,     likes {       count     },     owner {       id,       username,       full_name,       profile_pic_url,     biography     },     thumbnail_src,     video_views,     video_url   },   page_info }  }");
         $url = "https://www.instagram.com/query/?q=$parameters&ref=tags%3A%3Ashow";
         $media = json_decode(file_get_contents($url), ($assoc || $assoc == "array"));
         if($assoc == "array")
@@ -25,7 +30,12 @@ public static function getMediaByUserID($user = null, $count = 16, $assoc = fals
         {
             return false;
         }
-        $parameters = urlencode("ig_user($user) { media.first($count) {   count,   nodes {     caption,     code,     comments.last($comment_count) {           count,           nodes {             id,             created_at,             text,             user {               id,               profile_pic_url,               username             }           },           page_info         },     date,     dimensions {       height,       width     },     display_src,     id,     is_video,     likes {       count     },     owner {       id,       username,       full_name,       profile_pic_url,     biography     },     thumbnail_src,     video_views,     video_url   },   page_info }  }");
+        if($comment_count){
+            $comments = "comments.last($comment_count) {           count,           nodes {             id,             created_at,             text,             user {               id,               profile_pic_url,               username             }           },           page_info         }";
+        }else{
+            $comments = "comments {       count     }";
+        }
+        $parameters = urlencode("ig_user($user) { media.first($count) {   count,   nodes {     caption,     code,     $comments,     date,     dimensions {       height,       width     },     display_src,     id,     is_video,     likes {       count     },     owner {       id,       username,       full_name,       profile_pic_url,     biography     },     thumbnail_src,     video_views,     video_url   },   page_info }  }");
         $url = "https://www.instagram.com/query/?q=$parameters&ref=tags%3A%3Ashow";
         $media = json_decode(file_get_contents($url),($assoc || $assoc == "array"));
         if($assoc == "array")