Move Object\Contact to Model\Contact

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 4d91f8b1c0661946f183676a6e15e567fc1e6c73..ef132a68be6b96a2a628d153f10dc083dfa4dac3 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -16,10 +16,10 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
 use Friendica\Model\GlobalContact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Object\Contact;
-use Friendica\Object\Profile;
 use Friendica\Util\XML;
 
 use dba;
@@ -27,7 +27,6 @@ use SimpleXMLElement;
 
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
-require_once 'include/Photo.php';
 require_once 'include/group.php';
 require_once 'include/datetime.php';
 require_once 'include/queue_fn.php';
@@ -1340,10 +1339,6 @@ class Diaspora
                if ($r) {
                        $cid = $r[0]["id"];
                        $network = $r[0]["network"];
-
-                       // We are receiving content from a user that possibly is about to be terminated
-                       // This means the user is vital, so we remove a possible termination date.
-                       Contact::unmarkForArchival($r[0]);
                } else {
                        $cid = $contact["id"];
                        $network = NETWORK_DIASPORA;
@@ -2211,7 +2206,7 @@ class Diaspora
                        $image_url = "http://".$handle_parts[1].$image_url;
                }
 
-               update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
+               Contact::updateAvatar($image_url, $importer["uid"], $contact["id"]);
 
                // Generic birthday. We don't know the timezone. The year is irrelevant.
 
@@ -2471,7 +2466,7 @@ class Diaspora
                        group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
                }
 
-               update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
+               Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
                if ($importer["page-flags"] == PAGE_NORMAL) {
                        logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
@@ -2494,7 +2489,7 @@ class Diaspora
 
                        logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
 
-                       update_contact_avatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
+                       Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
 
                        // technically they are sharing with us (CONTACT_IS_SHARING),
                        // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX