X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffollow.php;h=c9e81f7b37a169e54b4fd6deea5151af15fd38fd;hb=ecde6e456da2b30ca4cf0413e8162719ac512439;hp=ac07c4085eaff752d8bc1e25643a3a952a34cdca;hpb=7fe549b8d2ce8addc58fb308dccb194f88fcca6e;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index ac07c4085e..c9e81f7b37 100644
--- 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\Object\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
-
-require_once 'include/group.php';
-require_once 'include/salmon.php';
+use Friendica\Protocol\Salmon;
 
 function update_contact($id) {
 	/*
@@ -244,10 +244,7 @@ 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
 	Contact::updateAvatar($ret['photo'], $uid, $contact_id);
@@ -268,7 +265,7 @@ 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) {