Make the community pages available to local users every time

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 14b9c68ed59fd3476154a2ec367ab84d63adde71..c9e81f7b37a169e54b4fd6deea5151af15fd38fd 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -7,15 +7,15 @@ 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;
 use Friendica\Protocol\Salmon;
 
-require_once 'include/group.php';
-
 function update_contact($id) {
        /*
        Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
@@ -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);