Merge pull request #450 from MrPetovan/issue/3878-move-Contact-to-src

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

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 81b5e107e582eaadd28ba234223c92cfeeb0117f..3d3f5bf4d7dfcc3fbdccbb9edcfe8960c656b34b 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -6,17 +6,17 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 
-use Friendica\Core\Worker;
-
-require('addon/pumpio/oauth/http.php');
-require('addon/pumpio/oauth/oauth_client.php');
-require_once('include/enotify.php');
-require_once('include/socgraph.php');
-require_once("include/Photo.php");
-require_once("mod/share.php");
-
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Core\Worker;
+use Friendica\Model\GlobalContact;
+use Friendica\Object\Contact;
+
+require 'addon/pumpio/oauth/http.php';
+require 'addon/pumpio/oauth/oauth_client.php';
+require_once 'include/enotify.php';
+require_once "include/Photo.php";
+require_once "mod/share.php";
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
@@ -969,11 +969,11 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
-       update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+       GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
                        "photo" => $contact->image->url, "name" => $contact->displayName,  "hide" => true,
                        "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
                        "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
-       $cid = get_contact($contact->url, $uid);
+       $cid = Contact::getIdForURL($contact->url, $uid);
 
        if ($no_insert)
                return($cid);