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

Added logging

Browse source
This commit is contained in:
Michael 2017-09-10 08:27:24 +00:00
parent bdf490e2fa
commit b847f63e2a
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/ostatus.php
View file

@ -614,9 +614,11 @@ class ostatus {
$stored = true; $stored = true;
$xml = $conversation['source']; $xml = $conversation['source'];
if (self::process($xml, $importer, $contact, $hub, $stored, false)) { if (self::process($xml, $importer, $contact, $hub, $stored, false)) {
logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG);
return; return;
} }
if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) { if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
dba::delete('conversation', array('item-uri' => $related_uri)); dba::delete('conversation', array('item-uri' => $related_uri));
} }
} }
@ -631,6 +633,7 @@ class ostatus {
$xml = ''; $xml = '';
if (stristr($related_data['header'], 'Content-Type: application/atom+xml')) { if (stristr($related_data['header'], 'Content-Type: application/atom+xml')) {
logger('Directly fetched XML for URI '.$related_uri, LOGGER_DEBUG);
$xml = $related_data['body']; $xml = $related_data['body'];
} }
@ -641,32 +644,52 @@ class ostatus {
} }
$xpath = new DomXPath($doc); $xpath = new DomXPath($doc);
$atom_file = '';
$links = $xpath->query('//link'); $links = $xpath->query('//link');
if ($links) { if ($links) {
foreach ($links AS $link) { foreach ($links AS $link) {
$attribute = self::read_attributes($link); $attribute = self::read_attributes($link);
if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) { if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
$related_atom = z_fetch_url($attribute['href']); $atom_file = $attribute['href'];
}
}
if ($atom_file != '') {
$related_atom = z_fetch_url($atom_file);
if ($related_atom['success']) { if ($related_atom['success']) {
logger('Fetched XML for URI '.$related_uri, LOGGER_DEBUG);
$xml = $related_atom['body']; $xml = $related_atom['body'];
} }
} }
} }
} }
}
// Workaround for older GNU Social servers // Workaround for older GNU Social servers
if (($xml == '') && strstr($related, '/notice/')) { if (($xml == '') && strstr($related, '/notice/')) {
$related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related).',atom'); $related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
if ($related_atom['success']) { if ($related_atom['success']) {
logger('GNU Social workaround to fetch XML for URI '.$related_uri, LOGGER_DEBUG);
$xml = $related_atom['body'];
}
}
// Even more worse workaround for GNU Social ;-)
if ($xml == '') {
$related_guess = ostatus::convert_href($related_uri);
$related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
if ($related_atom['success']) {
logger('GNU Social workaround 2 to fetch XML for URI '.$related_uri, LOGGER_DEBUG);
$xml = $related_atom['body']; $xml = $related_atom['body'];
} }
} }
if ($xml != '') { if ($xml != '') {
self::process($xml, $importer, $contact, $hub, $stored, false); self::process($xml, $importer, $contact, $hub, $stored, false);
} else {
logger("XML couldn't be fetched for URI: ".$related_uri." - href: ".$related, LOGGER_DEBUG);
} }
return; return;
} }