Merge pull request #4005 from zeroadam/Features-#3878

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 55ea86f8cd80534515cf08e19801416a83adae45..14b9c68ed59fd3476154a2ec367ab84d63adde71 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,18 +1,20 @@
 <?php
-
+/**
+ * @file include/follow.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Contact;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\OStatus;
+use Friendica\Protocol\PortableContact;
+use Friendica\Protocol\Salmon;
 
-require_once 'include/probe.php';
-require_once 'include/socgraph.php';
 require_once 'include/group.php';
-require_once 'include/salmon.php';
-require_once 'include/ostatus.php';
-require_once 'include/Photo.php';
-require_once 'include/diaspora.php';
 
 function update_contact($id) {
        /*
@@ -57,7 +59,7 @@ function update_contact($id) {
        );
 
        // Update the corresponding gcontact entry
-       poco_last_updated($ret["url"]);
+       PortableContact::lastUpdated($ret["url"]);
 
        return true;
 }
@@ -187,12 +189,12 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                dbesc($ret['network'])
        );
 
-       if (!dbm::is_result($r))
+       if (!DBM::is_result($r))
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
                        intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
        );
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                // update contact
                $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
@@ -233,7 +235,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                intval($uid)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                $result['message'] .=  t('Unable to retrieve contact information.') . EOL;
                return $result;
        }
@@ -248,29 +250,29 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
        }
 
        // Update the avatar
-       update_contact_avatar($ret['photo'],$uid,$contact_id);
+       Contact::updateAvatar($ret['photo'], $uid, $contact_id);
 
        // pull feed and consume it, which should subscribe to the hub.
 
-       Worker::add(PRIORITY_HIGH, "onepoll", $contact_id, "force");
+       Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
 
        $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
                        WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
                        intval($uid)
        );
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
                        // create a follow slap
                        $item = array();
                        $item['verb'] = ACTIVITY_FOLLOW;
                        $item['follow'] = $contact["url"];
-                       $slap = ostatus::salmon($item, $r[0]);
-                       slapper($r[0], $contact['notify'], $slap);
+                       $slap = OStatus::salmon($item, $r[0]);
+                       Salmon::slapper($r[0], $contact['notify'], $slap);
                }
 
                if ($contact['network'] == NETWORK_DIASPORA) {
-                       $ret = Diaspora::send_share($a->user,$contact);
+                       $ret = Diaspora::sendShare($a->user, $contact);
                        logger('share returns: '.$ret);
                }
        }