Merge pull request #490 from valga/threaded_comments

Media: Load threaded comments
postaddictme · May 21, 2019 · a3a5bba · a3a5bba
2 parents 2599b88 + fa34096
commit a3a5bba
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 1 deletion.
diff --git a/src/InstagramScraper/Model/Comment.php b/src/InstagramScraper/Model/Comment.php
@@ -25,6 +25,26 @@ class Comment extends AbstractModel
      */
     protected $owner;
 
+    /**
+     * @var static[]
+     */
+    protected $childComments = [];
+
+    /**
+     * @var int
+     */
+    protected $childCommentsCount = 0;
+
+    /**
+     * @var bool
+     */
+    protected $hasMoreChildComments = false;
+
+    /**
+     * @var string
+     */
+    protected $childCommentsNextPage = '';
+
     /**
      * @var bool
      */
@@ -62,6 +82,38 @@ public function getOwner()
         return $this->owner;
     }
 
+    /**
+     * @return static[]
+     */
+    public function getChildComments()
+    {
+        return $this->childComments;
+    }
+
+    /**
+     * @return int
+     */
+    public function getChildCommentsCount()
+    {
+        return $this->childCommentsCount;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasMoreChildComments()
+    {
+        return $this->hasMoreChildComments;
+    }
+
+    /**
+     * @return string
+     */
+    public function getChildCommentsNextPage()
+    {
+        return $this->childCommentsNextPage;
+    }
+
     /**
      * @param $value
      * @param $prop
@@ -81,6 +133,22 @@ protected function initPropertiesCustom($value, $prop)
             case 'owner':
                 $this->owner = Account::create($value);
                 break;
+            case 'edge_threaded_comments':
+                if (isset($value['count'])) {
+                    $this->childCommentsCount = (int) $value['count'];
+                }
+                if (isset($value['edges']) && is_array($value['edges'])) {
+                    foreach ($value['edges'] as $commentData) {
+                        $this->childComments[] = static::create($commentData['node']);
+                    }
+                }
+                if (isset($value['page_info']['has_next_page'])) {
+                    $this->hasMoreChildComments = (bool) $value['page_info']['has_next_page'];
+                }
+                if (isset($value['page_info']['end_cursor'])) {
+                    $this->childCommentsNextPage = (string) $value['page_info']['end_cursor'];
+                }
+                break;
         }
     }
 

diff --git a/src/InstagramScraper/Model/Media.php b/src/InstagramScraper/Model/Media.php
@@ -140,6 +140,11 @@ class Media extends AbstractModel
      */
     protected $comments = [];
 
+    /**
+     * @var Comment[]
+     */
+    protected $previewComments = [];
+
     /**
      * @var bool
      */
@@ -400,6 +405,14 @@ public function getComments()
         return $this->comments;
     }
 
+    /**
+     * @return Comment[]
+     */
+    public function getPreviewComments()
+    {
+        return $this->previewComments;
+    }
+
     /**
      * @return bool
      */
@@ -455,7 +468,7 @@ protected function initPropertiesCustom($value, $prop, $arr)
             case 'link':
                 $this->link = $value;
                 break;
-            case 'edge_media_to_comment':
+            case 'comments':
                 $this->commentsCount = $arr[$prop]['count'];
                 break;
             case 'likes':
@@ -557,7 +570,18 @@ protected function initPropertiesCustom($value, $prop, $arr)
                 $this->shortCode = $value;
                 $this->link = Endpoints::getMediaPageLink($this->shortCode);
                 break;
+            case 'edge_media_preview_comment':
+                if (isset($arr[$prop]['count'])) {
+                    $this->commentsCount = (int) $arr[$prop]['count'];
+                }
+                if (isset($arr[$prop]['edges']) && is_array($arr[$prop]['edges'])) {
+                    foreach ($arr[$prop]['edges'] as $commentData) {
+                        $this->previewComments[] = Comment::create($commentData['node']);
+                    }
+                }
+                break;
             case 'edge_media_to_comment':
+            case 'edge_media_to_parent_comment':
                 if (isset($arr[$prop]['count'])) {
                     $this->commentsCount = (int) $arr[$prop]['count'];
                 }