Fix getMediaByShortcode

postaddictme · Apr 19, 2017 · 9d402cd · 9d402cd
1 parent e9e190d
commit 9d402cd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/src/InstagramScraper/Instagram.php b/src/InstagramScraper/Instagram.php
@@ -113,10 +113,10 @@ public static function getMediaByUrl($mediaUrl)
             throw new InstagramException('Response code is ' . $response->code . '. Body: ' . $response->body . ' Something went wrong. Please report issue.');
         }
         $mediaArray = json_decode($response->raw_body, true);
-        if (!isset($mediaArray['media'])) {
+        if (!isset($mediaArray['graphql']['shortcode_media'])) {
             throw new InstagramException('Media with this code does not exist');
         }
-        return Media::fromMediaPage($mediaArray['media']);
+        return Media::fromMediaPage($mediaArray['graphql']['shortcode_media']);
     }
 
     public static function searchAccountsByUsername($username)

diff --git a/src/InstagramScraper/Model/Account.php b/src/InstagramScraper/Model/Account.php
@@ -94,9 +94,9 @@ public static function fromAccountPage($userArray)
     public static function fromMediaPage($userArray)
     {
         $instance = new self();
-        $instance->username = $userArray['username'];
-        $instance->profilePicUrl = $userArray['profile_pic_url'];
         $instance->id = $userArray['id'];
+        $instance->profilePicUrl = $userArray['profile_pic_url'];
+        $instance->username = $userArray['username'];
         $instance->fullName = $userArray['full_name'];
         $instance->isPrivate = $userArray['is_private'];
         return $instance;

diff --git a/src/InstagramScraper/Model/Media.php b/src/InstagramScraper/Model/Media.php
@@ -6,7 +6,14 @@
 
 class Media
 {
+    const TYPE_IMAGE = 'image';
+    const TYPE_VIDEO = 'video';
+    const TYPE_SIDECAR = 'sidecar';
+
+
     public $id;
+    public $shortcode;
+
     public $createdTime;
     public $type;
     public $link;
@@ -21,7 +28,6 @@ class Media
     public $videoStandardResolutionUrl;
     public $videoLowBandwidthUrl;
     public $videoViews;
-    public $code;
     public $owner;
     public $ownerId;
     public $likesCount;
@@ -39,7 +45,7 @@ public static function fromApi($mediaArray)
         $instance->id = $mediaArray['id'];
         $instance->type = $mediaArray['type'];
         $instance->createdTime = $mediaArray['created_time'];
-        $instance->code = $mediaArray['code'];
+        $instance->shortcode = $mediaArray['code'];
         $instance->link = $mediaArray['link'];
         $instance->commentsCount = $mediaArray['comments']['count'];
         $instance->likesCount = $mediaArray['likes']['count'];
@@ -99,18 +105,18 @@ public static function fromMediaPage($mediaArray)
         if (isset($mediaArray['is_ad'])) {
             $instance->isAd = $mediaArray['is_ad'];
         }
-        $instance->createdTime = $mediaArray['date'];
-        $instance->code = $mediaArray['code'];
-        $instance->link = Endpoints::getMediaPageLink($instance->code);
-        $instance->commentsCount = $mediaArray['comments']['count'];
-        $instance->likesCount = $mediaArray['likes']['count'];
-        $images = self::getImageUrls($mediaArray['display_src']);
+        $instance->createdTime = $mediaArray['taken_at_timestamp'];
+        $instance->shortcode = $mediaArray['shortcode'];
+        $instance->link = Endpoints::getMediaPageLink($instance->shortcode);
+        $instance->commentsCount = $mediaArray['edge_media_to_comment']['count'];
+        $instance->likesCount = $mediaArray['edge_media_preview_like']['count'];
+        $images = self::getImageUrls($mediaArray['display_url']);
         $instance->imageStandardResolutionUrl = $images['standard'];
         $instance->imageLowResolutionUrl = $images['low'];
         $instance->imageHighResolutionUrl = $images['high'];
         $instance->imageThumbnailUrl = $images['thumbnail'];
-        if (isset($mediaArray['caption'])) {
-            $instance->caption = $mediaArray['caption'];
+        if (isset($mediaArray['edge_media_to_caption']['edges'][0]['node']['text'])) {
+            $instance->caption = $mediaArray['edge_media_to_caption']['edges'][0]['node']['text'];
         }
         if (isset($mediaArray['location']['id'])) {
             $instance->locationId = $mediaArray['location']['id'];
@@ -125,8 +131,8 @@ public static function fromMediaPage($mediaArray)
     public static function fromTagPage($mediaArray)
     {
         $instance = new self();
-        $instance->code = $mediaArray['code'];
-        $instance->link = Endpoints::getMediaPageLink($instance->code);
+        $instance->shortcode = $mediaArray['code'];
+        $instance->link = Endpoints::getMediaPageLink($instance->shortcode);
         $instance->commentsCount = $mediaArray['comments']['count'];
         $instance->likesCount = $mediaArray['likes']['count'];
         $instance->ownerId = $mediaArray['owner']['id'];

diff --git a/tests/InstagramTest.php b/tests/InstagramTest.php
@@ -107,6 +107,6 @@ public function testGeMediaCommentsByCode()
     {
         $comments = self::$instagram->getMediaCommentsByCode('BR5Njq1gKmB', 40);
         //TODO: check why returns less comments
-        $this->assertEquals(40-2, sizeof($comments));
+        $this->assertEquals(40 - 4, sizeof($comments));
     }
 }