logger('item_store: created item ' . $current_post);
// Add every contact to the global contact table
- // Contacts from the statusnet connector are also added since you could add them in OStatus as well.
- if (!$arr['private'] AND in_array($arr["network"],
- array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_STATUSNET, ""))) {
- poco_check($arr["author-link"], $arr["author-name"], $arr["network"], $arr["author-avatar"], "", "", "", "", "", $arr["received"], $arr["contact-id"], $arr["uid"]);
+ poco_store($arr);
+
+/*
+ // Is it a global copy?
+ $store_gcontact = ($arr["uid"] == 0);
+
+ // Is it a comment on a global copy?
+ if (!$store_gcontact AND ($arr["uri"] != $arr["parent-uri"])) {
+ $q = q("SELECT `id` FROM `item` WHERE `uri`='%s' AND `uid` = 0",
+ $arr["parent-uri"]);
+ $store_gcontact = count($q);
+ }
+
+ // This check for private and network is maybe superflous
+ if ($store_gcontact AND !$arr['private'] AND in_array($arr["network"],
+ array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+
+ // "3" means: We don't know this contact directly (Maybe a reshared item)
+ $generation = 3;
+ $network = "";
+
+ // Is it a user from our server?
+ $q = q("SELECT `id` FROM `contact` WHERE `self` AND `nurl` = '%s' LIMIT 1",
+ dbesc(normalise_link($arr["author-link"])));
+ if (count($q)) {
+ $generation = 1;
+ $network = NETWORK_DFRN;
+ } else { // Is it a contact from a user on our server?
+ $q = q("SELECT `network` FROM `contact` WHERE `uid` != 0 AND `network` != ''
+ AND (`nurl` = '%s' OR `alias` IN ('%s', '%s')) LIMIT 1",
+ dbesc(normalise_link($arr["author-link"])),
+ dbesc(normalise_link($arr["author-link"])),
+ dbesc($arr["author-link"]));
+ if (count($q)) {
+ $generation = 2;
+ $network = $q[0]["network"];
+ }
+ }
+
+ poco_check($arr["author-link"], $arr["author-name"], $network, $arr["author-avatar"], "", "", "", "", "", $arr["received"], $generation, $arr["contact-id"], $arr["uid"]);
// Maybe its a body with a shared item? Then extract a global contact from it.
poco_contact_from_body($arr["body"], $arr["received"], $arr["contact-id"], $arr["uid"]);
}
-
+*/
// Set "success_update" to the date of the last time we heard from this contact
// This can be used to filter for inactive contacts and poco.
// Only do this for public postings to avoid privacy problems, since poco data is public.
$photo_timestamp = '';
$photo_url = '';
$birthday = '';
+ $contact_updated = '';
$hubs = $feed->get_links('hub');
logger('consume_feed: hubs: ' . print_r($hubs,true), LOGGER_DATA);
if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
logger('consume_feed: Updating photo for '.$contact['name'].' from '.$photo_url.' uid: '.$contact['uid']);
+
+ $contact_updated = $photo_timestamp;
+
require_once("include/Photo.php");
$photo_failure = false;
$have_photo = false;
}
if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
+ if ($name_updated > $contact_updated)
+ $contact_updated = $name_updated;
+
$r = q("select * from contact where uid = %d and id = %d limit 1",
intval($contact['uid']),
intval($contact['id'])
}
}
+ if ($contact_updated AND $new_name AND $photo_url)
+ poco_check($contact['url'], $new_name, NETWORK_DFRN, $photo_url, "", "", "", "", "", $contact_updated, 2, $contact['id'], $contact['uid']);
+
if(strlen($birthday)) {
if(substr($birthday,0,4) != $contact['bdyear']) {
logger('consume_feed: updating birthday: ' . $birthday);
$contact['bdyear'] = substr($birthday,0,4);
}
-
}
$community_page = 0;
$new_name = '';
$photo_timestamp = '';
$photo_url = '';
+ $contact_updated = '';
$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
}
if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
+
+ $contact_updated = $photo_timestamp;
+
logger('local_delivery: Updating photo for ' . $importer['name']);
require_once("include/Photo.php");
$photo_failure = false;
}
if(($name_updated) && (strlen($new_name)) && ($name_updated > $importer['name-date'])) {
+ if ($name_updated > $contact_updated)
+ $contact_updated = $name_updated;
+
$r = q("select * from contact where uid = %d and id = %d limit 1",
intval($importer['importer_uid']),
intval($importer['id'])
}
}
-
+ if ($contact_updated AND $new_name AND $photo_url)
+ poco_check($importer['url'], $new_name, NETWORK_DFRN, $photo_url, "", "", "", "", "", $contact_updated, 2, $importer['id'], $importer['importer_uid']);
// Currently unsupported - needs a lot of work
$reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
if(! $url)
return;
- $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender') ;
+ $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') ;
logger('poco_load: ' . $url, LOGGER_DEBUG);
$about = '';
$keywords = '';
$gender = '';
+ $generation = 0;
+
+ if ($uid == 0)
+ $network = NETWORK_DFRN;
$name = $entry->displayName;
if(isset($entry->gender))
$gender = $entry->gender;
+ if(isset($entry->generation) AND ($entry->generation > 0))
+ $generation = ++$entry->generation;
+
if(isset($entry->tags))
foreach($entry->tags as $tag)
$keywords = implode(", ", $tag);
- poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $cid, $uid, $zcid);
+ poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
// Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
}
-function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $cid = 0, $uid = 0, $zcid = 0) {
+function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) {
+
+ // Generation:
+ // 0: No definition
+ // 1: Profiles on this server
+ // 2: Contacts of profiles on this server
+ // 3: Contacts of contacts of profiles on this server
+ // 4: ...
+
$gcid = "";
if ($profile_url == "")
return $gcid;
+ $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' LIMIT 1",
+ dbesc(normalise_link($profile_url))
+ );
+ if(count($r))
+ $network = $r[0]["network"];
+
+ if ($network == "") {
+ $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' LIMIT 1",
+ dbesc($profile_url), dbesc(normalise_link($profile_url))
+ );
+ if(count($r)) {
+ $network = $r[0]["network"];
+ $profile_url = $r[0]["url"];
+ }
+ }
+
$x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($profile_url))
);
- if(count($x))
+ if(count($x) AND ($network == ""))
$network = $x[0]["network"];
if (($network == "") OR ($name == "") OR ($profile_photo == "")) {
if (!in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_STATUSNET)))
return $gcid;
- logger("profile-check URL: ".$profile_url." name: ".$name." avatar: ".$profile_photo, LOGGER_DEBUG);
+ logger("profile-check generation: ".$generation." Network: ".$network." URL: ".$profile_url." name: ".$name." avatar: ".$profile_photo, LOGGER_DEBUG);
if(count($x)) {
$gcid = $x[0]['id'];
if (($keywords == "") AND ($x[0]['keywords'] != ""))
$keywords = $x[0]['keywords'];
+ if (($generation == 0) AND ($x[0]['generation'] > 0))
+ $generation = $x[0]['generation'];
+
if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo || $x[0]['updated'] < $updated) {
- q("update gcontact set `name` = '%s', `network` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s',
- `updated` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
- where `nurl` = '%s'",
+ q("UPDATE `gcontact` SET `name` = '%s', `network` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s',
+ `updated` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s', `generation` = %d
+ WHERE (`generation` >= %d OR `generation` = 0) AND `nurl` = '%s'",
dbesc($name),
dbesc($network),
dbesc($profile_photo),
dbesc($about),
dbesc($keywords),
dbesc($gender),
+ intval($generation),
+ intval($generation),
dbesc(normalise_link($profile_url))
);
}
} else {
- q("insert into `gcontact` (`name`,`network`, `url`,`nurl`,`photo`,`connect`, `updated`, `location`, `about`, `keywords`, `gender`)
- values ('%s', '%s', '%s', '%s', '%s','%s', '%s', '%s', '%s', '%s', '%s')",
+ q("INSERT INTO `gcontact` (`name`,`network`, `url`,`nurl`,`photo`,`connect`, `updated`, `location`, `about`, `keywords`, `gender`, `generation`)
+ VALUES ('%s', '%s', '%s', '%s', '%s','%s', '%s', '%s', '%s', '%s', '%s', %d)",
dbesc($name),
dbesc($network),
dbesc($profile_url),
dbesc($location),
dbesc($about),
dbesc($keywords),
- dbesc($gender)
+ dbesc($gender),
+ intval($generation)
);
$x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($profile_url))
return;
logger("prepare poco_check for profile ".$profile, LOGGER_DEBUG);
- poco_check($profile, "", "", "", "", "", "", "", "", $created, $cid, $uid);
+ poco_check($profile, "", "", "", "", "", "", "", "", $created, 3, $cid, $uid);
+}
+
+function poco_store($item) {
+
+ // Isn't it public?
+ if (!$item['private'])
+ return;
+
+ // Or is it from a network where we don't store the global contacts?
+ if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
+ return;
+
+ // Is it a global copy?
+ $store_gcontact = ($item["uid"] == 0);
+
+ // Is it a comment on a global copy?
+ if (!$store_gcontact AND ($item["uri"] != $item["parent-uri"])) {
+ $q = q("SELECT `id` FROM `item` WHERE `uri`='%s' AND `uid` = 0", $item["parent-uri"]);
+ $store_gcontact = count($q);
+ }
+
+ if (!$store_gcontact)
+ return;
+
+ // "3" means: We don't know this contact directly (Maybe a reshared item)
+ $generation = 3;
+ $network = "";
+
+ // Is it a user from our server?
+ $q = q("SELECT `id` FROM `contact` WHERE `self` AND `nurl` = '%s' LIMIT 1",
+ dbesc(normalise_link($item["author-link"])));
+ if (count($q)) {
+ $generation = 1;
+ $network = NETWORK_DFRN;
+ } else { // Is it a contact from a user on our server?
+ $q = q("SELECT `network` FROM `contact` WHERE `uid` != 0 AND `network` != ''
+ AND (`nurl` = '%s' OR `alias` IN ('%s', '%s')) LIMIT 1",
+ dbesc(normalise_link($item["author-link"])),
+ dbesc(normalise_link($item["author-link"])),
+ dbesc($item["author-link"]));
+ if (count($q)) {
+ $generation = 2;
+ $network = $q[0]["network"];
+ }
+ }
+ poco_check($item["author-link"], $item["author-name"], $network, $item["author-avatar"], "", "", "", "", "", $item["received"], $generation, $item["contact-id"], $item["uid"]);
+
+ // Maybe its a body with a shared item? Then extract a global contact from it.
+ poco_contact_from_body($item["body"], $item["received"], $item["contact-id"], $item["uid"]);
}
function count_common_friends($uid,$cid) {
projects / friendica.git / commitdiff