keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

upgrading the photo and name update

Browse source
This commit is contained in:
Mike Macgirvin 2010-09-10 00:42:53 -07:00
parent f7cff0eb5a
commit ca8566008d
2 changed files with 79 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/items.php
View file

@ -308,10 +308,10 @@ function post_remote($a,$arr) {
if($arr['gravity']) if($arr['gravity'])
$arr['gravity = intval($arr['gravity']); $arr['gravity'] = intval($arr['gravity']);
elseif($arr['parent-uri'] == $arr['uri']) elseif($arr['parent-uri'] == $arr['uri'])
$arr['gravity'] = 0; $arr['gravity'] = 0;
else($arr['verb'] == ACTIVITY_POST) elseif($arr['verb'] == ACTIVITY_POST)
$arr['gravity'] = 6; $arr['gravity'] = 6;
if(! x($arr,'type')) if(! x($arr,'type'))

54
include/poller.php
View file

@ -72,7 +72,8 @@
$importer = $r[0]; $importer = $r[0];
echo "IMPORTER: {$importer['name']}"; if($debugging)
echo "IMPORTER: {$importer['name']}";
$last_update = (($contact['last-update'] == '0000-00-00 00:00:00') $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
? datetime_convert('UTC','UTC','now - 30 days','Y-m-d\TH:i:s\Z') ? datetime_convert('UTC','UTC','now - 30 days','Y-m-d\TH:i:s\Z')
@ -84,8 +85,10 @@ echo "IMPORTER: {$importer['name']}";
$xml = fetch_url($url); $xml = fetch_url($url);
echo "URL: " . $url; if($debugging) {
echo "XML: " . $xml; echo "URL: " . $url . "\r\n";
echo "XML: " . $xml . "\r\n";
}
if(! $xml) if(! $xml)
continue; continue;
@ -128,8 +131,10 @@ echo "XML: " . $xml;
$xml = post_url($contact['poll'],$postvars); $xml = post_url($contact['poll'],$postvars);
echo "XML response:" . $xml . "\r\n"; if($debugging) {
echo "Length:" . strlen($xml) . "\r\n"; echo "XML response:" . $xml . "\r\n";
echo "Length:" . strlen($xml) . "\r\n";
}
if(! strlen($xml)) { if(! strlen($xml)) {
// an empty response may mean there's nothing new - record the fact that we checked // an empty response may mean there's nothing new - record the fact that we checked
@ -145,14 +150,35 @@ echo "Length:" . strlen($xml) . "\r\n";
$feed->enable_order_by_date(false); $feed->enable_order_by_date(false);
$feed->init(); $feed->init();
// Check at the feed level for updated contact name and/or photo
$name_updated = '';
$new_name = '';
$photo_timestamp = '';
$photo_url = '';
$rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, author);
if($rawtags) {
$elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
$new_name = $elems['name'][0]['data'];
}
if(($elems['link'][0]['attribs']['']['rel'] == 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
$photo_url = $elems['link'][0]['attribs']['']['href'];
}
}
if(! $photo_timestamp) {
$photo_rawupdate = $feed->get_feed_tags(NAMESPACE_DFRN,'icon-updated'); $photo_rawupdate = $feed->get_feed_tags(NAMESPACE_DFRN,'icon-updated');
if($photo_rawupdate) { if($photo_rawupdate) {
$photo_timestamp = datetime_convert('UTC','UTC',$photo_rawupdate[0]['data']); $photo_timestamp = datetime_convert('UTC','UTC',$photo_rawupdate[0]['data']);
$photo_url = $feed->get_image_url(); $photo_url = $feed->get_image_url();
if(strlen($photo_url) && $photo_timestamp > $contact['avatar-date']) { }
}
if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
require_once("Photo.php"); require_once("Photo.php");
$photo_failure = false; $photo_failure = false;
$r = q("SELECT `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d LIMIT 1",
@ -173,7 +199,6 @@ echo "Length:" . strlen($xml) . "\r\n";
$img->scaleImageSquare(175); $img->scaleImageSquare(175);
$hash = $resource_id; $hash = $resource_id;
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 4); $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 4);
$img->scaleImage(80); $img->scaleImage(80);
@ -187,14 +212,23 @@ echo "Length:" . strlen($xml) . "\r\n";
} }
} }
} }
if(($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
dbesc(notags(trim($new_name))),
dbesc(datetime_convert()),
intval($contact['uid']),
intval($contact['id'])
);
} }
// Now process the feed
foreach($feed->get_items() as $item) { foreach($feed->get_items() as $item) {
$deleted = false; $deleted = false;
$rawdelete = $item->get_item_tags("http://purl.org/atompub/tombstones/1.0", 'deleted-entry'); $rawdelete = $item->get_item_tags( NAMESPACE_TOMB, 'deleted-entry');
if(isset($rawdelete[0]['attribs']['']['ref'])) { if(isset($rawdelete[0]['attribs']['']['ref'])) {
$uri = $rawthread[0]['attribs']['']['ref']; $uri = $rawthread[0]['attribs']['']['ref'];
$deleted = true; $deleted = true;
@ -258,7 +292,7 @@ echo "Length:" . strlen($xml) . "\r\n";
$is_reply = false; $is_reply = false;
$item_id = $item->get_id(); $item_id = $item->get_id();
$rawthread = $item->get_item_tags("http://purl.org/syndication/thread/1.0",'in-reply-to'); $rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
if(isset($rawthread[0]['attribs']['']['ref'])) { if(isset($rawthread[0]['attribs']['']['ref'])) {
$is_reply = true; $is_reply = true;
$parent_uri = $rawthread[0]['attribs']['']['ref']; $parent_uri = $rawthread[0]['attribs']['']['ref'];