Add pagination to API statuses/friends and statuses/followers

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index e2f81f12796f2c2aed1e32282e5ce384446afb3d..c9e81f7b37a169e54b4fd6deea5151af15fd38fd 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -7,14 +7,14 @@ use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
-
-require_once 'include/group.php';
-require_once 'include/salmon.php';
-require_once 'include/Photo.php';
+use Friendica\Protocol\Salmon;
 
 function update_contact($id) {
        /*
@@ -244,13 +244,10 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
        $contact_id  = $r[0]['id'];
        $result['cid'] = $contact_id;
 
-       $def_gid = get_default_group($uid, $contact["network"]);
-       if (intval($def_gid)) {
-               group_add_member($uid, '', $contact_id, $def_gid);
-       }
+       Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
 
        // 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.
 
@@ -268,11 +265,11 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                        $item['verb'] = ACTIVITY_FOLLOW;
                        $item['follow'] = $contact["url"];
                        $slap = OStatus::salmon($item, $r[0]);
-                       slapper($r[0], $contact['notify'], $slap);
+                       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);
                }
        }