From 3e096e4a42b7baeb78d4c080bc331efd8c406f0b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 26 Jan 2013 15:50:31 -0800 Subject: better handling of failures to lookup remote authors --- include/zot.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'include/zot.php') diff --git a/include/zot.php b/include/zot.php index 827ab2053..ac18dfd41 100644 --- a/include/zot.php +++ b/include/zot.php @@ -229,10 +229,13 @@ function zot_refresh($them,$channel = null) { $j = json_decode($result['body'],true); + if(! (($j) && ($j['success']))) + return false; + $x = import_xchan($j); - if(! $x['success']) - return $x; + if(! $x['success']) + return false; $xchan_hash = $x['hash']; @@ -785,7 +788,10 @@ function zot_import($arr) { if($i['message']) { if($i['message']['type'] === 'activity') { $arr = get_item_elements($i['message']); - + if(! array_key_exists('created',$arr)) { + logger('Activity rejected: probable failure to lookup author/owner. ' . print_r($i['message'],true)); + continue; + } logger('Activity received: ' . print_r($arr,true), LOGGER_DATA); logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA); -- cgit v1.2.3