Merge branch 'develop' into rewrite/gravity-constants

[friendica.git] / src / Factory / Api / Twitter / Status.php

diff --git a/src/Factory/Api/Twitter/Status.php b/src/Factory/Api/Twitter/Status.php
index ed138e2bdbb62adc80ad817e9fed537d0a4c1849..a3ced8e58c91fae250349b8aa30d8134dcaea8bc 100644 (file)
--- a/src/Factory/Api/Twitter/Status.php
+++ b/src/Factory/Api/Twitter/Status.php
@@ -70,6 +70,7 @@ class Status extends BaseFactory
        /**
         * @param int $uriId Uri-ID of the item
         * @param int $uid   Item user
+        * @param bool $include_entities Whether to include entities
         *
         * @return \Friendica\Object\Api\Twitter\Status
         * @throws HTTPException\InternalServerErrorException
@@ -90,12 +91,13 @@ class Status extends BaseFactory
        /**
         * @param int $uriId Uri-ID of the item
         * @param int $uid   Item user
+        * @param bool $include_entities Whether to include entities
         *
         * @return \Friendica\Object\Api\Twitter\Status
         * @throws HTTPException\InternalServerErrorException
         * @throws ImagickException|HTTPException\NotFoundException
         */
-       public function createFromUriId(int $uriId, $uid = 0, $include_entities = false): \Friendica\Object\Api\Twitter\Status
+       public function createFromUriId(int $uriId, int $uid = 0, bool $include_entities = false): \Friendica\Object\Api\Twitter\Status
        {
                $fields = ['parent-uri-id', 'uri-id', 'uid', 'author-id', 'author-link', 'author-network', 'owner-id', 'causer-id',
                        'starred', 'app', 'title', 'body', 'raw-body', 'created', 'network','post-reason', 'language', 'gravity',
@@ -110,6 +112,7 @@ class Status extends BaseFactory
        /**
         * @param array $item item array
         * @param int   $uid  Item user
+        * @param bool $include_entities Whether to include entities
         *
         * @return \Friendica\Object\Api\Twitter\Status
         * @throws HTTPException\InternalServerErrorException
@@ -125,7 +128,7 @@ class Status extends BaseFactory
                        $owner = $this->twitterUser->createFromContactId($item['owner-id'], $uid, true);
                }
 
-               $friendica_comments = Post::countPosts(['thr-parent-id' => $item['uri-id'], 'deleted' => false, 'gravity' => GRAVITY_COMMENT]);
+               $friendica_comments = Post::countPosts(['thr-parent-id' => $item['uri-id'], 'deleted' => false, 'gravity' => Item::GRAVITY_COMMENT]);
 
                $text  = '';
                $title = '';
@@ -159,7 +162,7 @@ class Status extends BaseFactory
                        'thr-parent-id' => $item['uri-id'],
                        'uid'           => $uid,
                        'origin'        => true,
-                       'gravity'       => GRAVITY_ACTIVITY,
+                       'gravity'       => Item::GRAVITY_ACTIVITY,
                        'vid'           => Verb::getID(Activity::LIKE),
                        'deleted'       => false
                ]);