]> git.mxchange.org Git - friendica.git/blobdiff - include/socgraph.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #2975 from annando/1611-frontend-worker
[friendica.git] / include / socgraph.php
diff --git a/include/socgraph.php b/include/socgraph.php
index 3718f82306fc7336e8d7db61747bacc540744b2c..421a68cc9ef9212aad785505f179c2814cec5dab 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -9,6 +9,7 @@
 
 require_once('include/datetime.php');
 require_once("include/Scrape.php");
+require_once("include/network.php");
 require_once("include/html2bbcode.php");
 require_once("include/Contact.php");
 require_once("include/Photo.php");
@@ -51,7 +52,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
        if(! $url)
                return;
 
-       $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation') ;
+       $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
 
        logger('poco_load: ' . $url, LOGGER_DEBUG);
 
@@ -85,6 +86,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                $about = '';
                $keywords = '';
                $gender = '';
+               $contact_type = -1;
                $generation = 0;
 
                $name = $entry->displayName;
@@ -132,6 +134,9 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                        foreach($entry->tags as $tag)
                                $keywords = implode(", ", $tag);
 
+               if(isset($entry->contactType) AND ($entry->contactType >= 0))
+                       $contact_type = $entry->contactType;
+
                // If you query a Friendica server for its profiles, the network has to be Friendica
                /// TODO It could also be a Redmatrix server
                //if ($uid == 0)
@@ -139,6 +144,9 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
                poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
 
+               $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
+               update_gcontact($gcontact);
+
                // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
                // Deactivated because we now update Friendica contacts in dfrn.php
                //if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
@@ -1067,8 +1075,16 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
 
 function suggestion_query($uid, $start = 0, $limit = 80) {
 
-       if(! $uid)
+       if (!$uid) {
                return array();
+       }
+
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+//     $list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
+//     if (!is_null($list)) {
+//             return $list;
+//     }
 
        $network = array(NETWORK_DFRN);
 
@@ -1079,9 +1095,10 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                $network[] = NETWORK_OSTATUS;
 
        $sql_network = implode("', '", $network);
-       //$sql_network = "'".$sql_network."', ''";
        $sql_network = "'".$sql_network."'";
 
+       /// @todo This query is really slow
+       // By now we cache the data for five minutes
        $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact
                INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id`
                where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
@@ -1100,8 +1117,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                intval($limit)
        );
 
-       if(count($r) && count($r) >= ($limit -1))
+       if (count($r) && count($r) >= ($limit -1)) {
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+//             Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+
                return $r;
+       }
 
        $r2 = q("SELECT gcontact.* FROM gcontact
                INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id`
@@ -1130,6 +1152,9 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        while (sizeof($list) > ($limit))
                array_pop($list);
 
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+//     Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
        return $list;
 }
 
@@ -1235,7 +1260,7 @@ function poco_discover($complete = false) {
                        }
 
                        // Fetch all users from the other server
-                       $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+                       $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
                        logger("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG);
 
@@ -1254,7 +1279,7 @@ function poco_discover($complete = false) {
                                        $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
 
                                        // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
-                                       $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+                                       $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
                                        $success = false;
 
@@ -1302,7 +1327,7 @@ function poco_discover_server_users($data, $server) {
                        logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG);
 
                        // Fetch all contacts from a given user from the other server
-                       $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+                       $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
                        $retdata = z_fetch_url($url);
                        if ($retdata["success"])
@@ -1329,6 +1354,7 @@ function poco_discover_server($data, $default_generation = 0) {
                $about = '';
                $keywords = '';
                $gender = '';
+               $contact_type = -1;
                $generation = $default_generation;
 
                $name = $entry->displayName;
@@ -1373,6 +1399,9 @@ function poco_discover_server($data, $default_generation = 0) {
                if(isset($entry->generation) AND ($entry->generation > 0))
                        $generation = ++$entry->generation;
 
+               if(isset($entry->contactType) AND ($entry->contactType >= 0))
+                       $contact_type = $entry->contactType;
+
                if(isset($entry->tags))
                        foreach($entry->tags as $tag)
                                $keywords = implode(", ", $tag);
@@ -1382,6 +1411,10 @@ function poco_discover_server($data, $default_generation = 0) {
 
                        logger("Store profile ".$profile_url, LOGGER_DEBUG);
                        poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0);
+
+                       $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
+                       update_gcontact($gcontact);
+
                        logger("Done for profile ".$profile_url, LOGGER_DEBUG);
                }
        }
@@ -1506,7 +1539,7 @@ function get_gcontact_id($contact) {
 
        if ($doprobing) {
                logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
-               proc_run('php', 'include/gprobe.php', bin2hex($contact["url"]));
+               proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
        }
 
        if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
@@ -1533,7 +1566,7 @@ function update_gcontact($contact) {
                return false;
 
        $r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
-                       `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
+                       `contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
                FROM `gcontact` WHERE `id` = %d LIMIT 1",
                intval($gcontact_id));
 
@@ -1613,20 +1646,20 @@ function update_gcontact($contact) {
        }
 
        if ($update) {
-               logger("Update gcontact for ".$contact["url"]." Callstack: ".App::callstack(), LOGGER_DEBUG);
+               logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
 
                q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
                                        `birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
-                                       `alias` = '%s', `notify` = '%s', `url` = '%s',
+                                       `contact-type` = %d, `alias` = '%s', `notify` = '%s', `url` = '%s',
                                        `location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s',
                                        `server_url` = '%s', `connect` = '%s'
                                WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)",
                        dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]),
                        dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]),
                        dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
-                       intval($contact["nsfw"]), dbesc($contact["alias"]), dbesc($contact["notify"]),
-                       dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
-                       intval($contact["generation"]), dbesc($contact["updated"]),
+                       intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
+                       dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
+                       dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]),
                        dbesc($contact["server_url"]), dbesc($contact["connect"]),
                        dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
 
@@ -1643,13 +1676,14 @@ function update_gcontact($contact) {
 
                        q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s',
                                                `network` = '%s', `bd` = '%s', `gender` = '%s',
-                                               `keywords` = '%s', `alias` = '%s', `url` = '%s',
-                                               `location` = '%s', `about` = '%s'
+                                               `keywords` = '%s', `alias` = '%s', `contact-type` = %d,
+                                               `url` = '%s', `location` = '%s', `about` = '%s'
                                        WHERE `id` = %d",
                                dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]),
                                dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]),
-                               dbesc($contact["keywords"]), dbesc($contact["alias"]), dbesc($contact["url"]),
-                               dbesc($contact["location"]), dbesc($contact["about"]), intval($r[0]["id"]));
+                               dbesc($contact["keywords"]), dbesc($contact["alias"]), intval($contact["contact-type"]),
+                               dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
+                               intval($r[0]["id"]));
                }
        }
 
Unnamed repository; edit this file 'description' to name the repository.