Entities, Source and api functions rearranged

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

diff --git a/src/Factory/Api/Twitter/User.php b/src/Factory/Api/Twitter/User.php
index 6c3c3cc1fc5fe8f14d34d16e23b23e9862039515..eae8c80917e79b0b729bc0c59142c7d94edca0ed 100644 (file)
--- a/src/Factory/Api/Twitter/User.php
+++ b/src/Factory/Api/Twitter/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -39,7 +39,7 @@ class User extends BaseFactory
         */
        public function createFromContactId(int $contactId, $uid = 0, $skip_status = false, $include_user_entities = true)
        {
-               $cdata = Contact::getPublicAndUserContacID($contactId, $uid);
+               $cdata = Contact::getPublicAndUserContactID($contactId, $uid);
                if (!empty($cdata)) {
                        $publicContact = Contact::getById($cdata['public']);
                        $userContact = Contact::getById($cdata['user']);
@@ -50,6 +50,13 @@ class User extends BaseFactory
 
                $apcontact = APContact::getByURL($publicContact['url'], false);
 
-               return new \Friendica\Object\Api\Twitter\User($publicContact, $apcontact, $userContact, $skip_status, $include_user_entities);
+               $status = null; // @todo fetch last status
+
+               return new \Friendica\Object\Api\Twitter\User($publicContact, $apcontact, $userContact, $status, $include_user_entities);
+       }
+
+       public function createFromUserId(int $uid, $skip_status = false, $include_user_entities = true)
+       {
+               return $this->createFromContactId(Contact::getPublicIdByUserId($uid), $uid, $skip_status, $include_user_entities);
        }
 }