X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=2a021c89e9a3dac70fdb5cd42d857c1b6725a697;hb=89ad41aca5acaee12032eaa2704436ca5ce5dad2;hp=9a2eaeb5b712767ab9bbf0e50a829d06249858ae;hpb=0dce57d4007d7e3cff578825f212a7c0a6cb8800;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 9a2eaeb5b7..2a021c89e9 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -9,10 +9,10 @@ use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Model\GlobalContact; +use Friendica\Model\Contact; +use Friendica\Model\GContact; use Friendica\Network\Probe; -use Friendica\Object\Contact; -use Friendica\Object\Photo; +use Friendica\Object\Image; use Friendica\Util\Lock; use Friendica\Util\XML; use dba; @@ -226,9 +226,9 @@ class OStatus $contact["generation"] = 2; $contact["hide"] = false; // OStatus contacts are never hidden $contact["photo"] = $author["author-avatar"]; - $gcid = GlobalContact::update($contact); + $gcid = GContact::update($contact); - GlobalContact::link($gcid, $contact["uid"], $contact["id"]); + GContact::link($gcid, $contact["uid"], $contact["id"]); } return $author; @@ -1323,7 +1323,7 @@ class OStatus switch ($siteinfo["type"]) { case 'photo': - $imgdata = Photo::getInfoFromURL($siteinfo["image"]); + $imgdata = Image::getInfoFromURL($siteinfo["image"]); $attributes = array("rel" => "enclosure", "href" => $siteinfo["image"], "type" => $imgdata["mime"], @@ -1343,7 +1343,7 @@ class OStatus } if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) { - $imgdata = Photo::getInfoFromURL($siteinfo["image"]); + $imgdata = Image::getInfoFromURL($siteinfo["image"]); $attributes = array("rel" => "enclosure", "href" => $siteinfo["image"], "type" => $imgdata["mime"],