Add Instagram.php session helper functions and update Media keys (#1036)

* Add Account fields

add fbid, has_clips, has_guides, category_name

* Avoid extra login request before setting cached session

* return session

* Update Media properties

Instagram's web api recently updated and some values still need to be replaced.

* Update Media.php

* add id to carousel media

* update createdTime property

Author: Calvin Schemanski

src/InstagramScraper/Instagram.php

@@ -92,6 +92,27 @@ public static function withCredentials(ClientInterface $client, $username, $pass
         return $instance;
     }
 
+    /**
+     * @param ClientInterface $client
+     * @param string $username
+     * @param CacheInterface $cache
+     *
+     * @return Instagram
+     */
+    public static function withUsername(ClientInterface $client, $username, $cache)
+    {
+        static::$instanceCache = $cache;
+        $instance = new self($client);
+        $instance->sessionUsername = $username;
+        return $instance;
+    }
+
+    public function loadSession()
+    {
+        $session = static::$instanceCache->get($this->getCacheKey());
+        $this->userSession = $session;
+        return $session;
+    }
     /**
      * @param string $tag
      *

src/InstagramScraper/Model/CarouselMedia.php

@@ -8,6 +8,11 @@
  */
 class CarouselMedia
 {
+    /**
+     * @var string
+     */
+    private $id;
+    
     /**
      * @var string
      */
@@ -61,6 +66,25 @@ public function __construct()
         return $this;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+    
+    /**
+     * @param mixed $id
+     *
+     * @return $this
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
+    
     /**
      * @return mixed
      */

src/InstagramScraper/Model/Media.php

@@ -571,13 +571,14 @@ public function getLocationAddress()
     protected function initPropertiesCustom($value, $prop, $arr)
     {
         switch ($prop) {
-            case 'id':
+            case 'pk':
                 $this->id = $value;
                 break;
             case 'type':
                 $this->type = $value;
                 break;
             case 'date':
+            case 'taken_at':
             case 'created_time':
                 $this->createdTime = (int)$value;
                 break;
@@ -674,7 +675,7 @@ protected function initPropertiesCustom($value, $prop, $arr)
                 break;
             case 'location':
                 if (isset($arr[$prop])) {
-                    $this->locationId = $arr[$prop]['id'] ?? null;
+                    $this->locationId = $arr[$prop]['pk'] ?? null;
                     $this->locationName = $arr[$prop]['name'] ?? null;
                     $this->locationSlug = $arr[$prop]['slug'] ?? null;
                     $this->locationAddressJson = $arr[$prop]['address_json'] ?? null;
@@ -853,6 +854,9 @@ protected function initPropertiesCustom($value, $prop, $arr)
     private static function setCarouselMedia($mediaArray, $carouselArray, $instance)
     {
         $carouselMedia = new CarouselMedia();
+        if(isset($carouselArray['id'])) {
+            $carouselMedia->setId($carouselArray['id']);
+        }
         if(isset($carouselArray['type'])) {
             $carouselMedia->setType($carouselArray['type']);