Move Objects to Model

[friendica-addons.git] / twitter / twitter.php

diff --git a/twitter/twitter.php b/twitter/twitter.php
index f0c71cf41b78eaca2efa7562818fe67d4a0569c5..d55c9febca8c8119ba98a63ea606bb54753a15c4 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -63,7 +63,9 @@
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
+use Friendica\Model\GContact;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
 require_once 'include/enotify.php';
 
@@ -946,11 +948,9 @@ function twitter_queue_hook(&$a,&$b) {
 }
 
 function twitter_fix_avatar($avatar) {
-       require_once("include/Photo.php");
-
        $new_avatar = str_replace("_normal.", ".", $avatar);
 
-       $info = get_photo_info($new_avatar);
+       $info = Image::getInfoFromURL($new_avatar);
        if (!$info)
                $new_avatar = $avatar;
 
@@ -964,7 +964,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
        $avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-       GlobalContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
+       GContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
                        "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
                        "name" => $contact->name, "nick" => $contact->screen_name,
                        "location" => $contact->location, "about" => $contact->description,
@@ -1025,9 +1025,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
                        group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
                }
 
-               require_once("Photo.php");
-
-               $photos = import_profile_photo($avatar, $uid, $contact_id, true);
+               $photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
 
                if ($photos) {
                        q("UPDATE `contact` SET `photo` = '%s',
@@ -1058,9 +1056,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                        logger("twitter_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
 
-                       require_once("Photo.php");
-
-                       $photos = import_profile_photo($avatar, $uid, $r[0]['id'], true);
+                       $photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
 
                        if ($photos) {
                                q("UPDATE `contact` SET `photo` = '%s',