Merge pull request #2758 from annando/1609-sql-charset

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 22ff079b633949b941201d1578dd47e770b76670..08e74e02f3443d3b8a5849442ca4aee4710a20b6 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,5 +1,7 @@
 <?php
 require_once("include/Scrape.php");
+require_once("include/socgraph.php");
+require_once('include/group.php');
 
 function update_contact($id) {
        /*
@@ -43,6 +45,9 @@ function update_contact($id) {
                intval($id)
        );
 
+       // Update the corresponding gcontact entry
+       poco_last_updated($ret["url"]);
+
        return true;
 }
 
@@ -254,13 +259,9 @@ function new_contact($uid,$url,$interactive = false) {
        $contact_id  = $r[0]['id'];
        $result['cid'] = $contact_id;
 
-       $g = q("select def_gid from user where uid = %d limit 1",
-               intval($uid)
-       );
-       if($g && intval($g[0]['def_gid'])) {
-               require_once('include/group.php');
-               group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
-       }
+       $def_gid = get_default_group($uid, $contact["network"]);
+       if (intval($def_gid))
+               group_add_member($uid, '', $contact_id, $def_gid);
 
        require_once("include/Photo.php");
 
@@ -269,7 +270,7 @@ function new_contact($uid,$url,$interactive = false) {
 
        // pull feed and consume it, which should subscribe to the hub.
 
-       proc_run('php',"include/onepoll.php","$contact_id", "force");
+       proc_run(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force");
 
        // create a follow slap
 
@@ -301,8 +302,8 @@ function new_contact($uid,$url,$interactive = false) {
                }
                if($contact['network'] == NETWORK_DIASPORA) {
                        require_once('include/diaspora.php');
-                       $ret = diaspora_share($a->user,$contact);
-                       logger('mod_follow: diaspora_share returns: ' . $ret);
+                       $ret = diaspora::send_share($a->user,$contact);
+                       logger('share returns: '.$ret);
                }
        }