X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=f7786bee4f08593708ae9d4ff4634e352fad9867;hb=26354f5ab6a8d8c2c1960e2a721dfe79c80a690c;hp=0e6c9c91c8477cebadd19a2a9c9f757bf397f518;hpb=643b4390ef085a649871f990362adfd754a615b6;p=friendica-addons.git

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 0e6c9c91..f7786bee 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1,12 +1,16 @@
 <?php
 /**
  * Name: pump.io Post Connector
- * Description: Post to pump.io
+ * Description: Bidirectional (posting, relaying and reading) connector for pump.io.
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 require('addon/pumpio/oauth/http.php');
 require('addon/pumpio/oauth/oauth_client.php');
+require_once('include/enotify.php');
+require_once('include/socgraph.php');
+require_once("include/Photo.php");
+require_once("mod/share.php");
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
@@ -18,6 +22,7 @@ function pumpio_install() {
 	register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
 	register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
 	register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
+	register_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
 }
 
 function pumpio_uninstall() {
@@ -28,6 +33,7 @@ function pumpio_uninstall() {
 	unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
 	unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
 	unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
+	unregister_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
 }
 
 function pumpio_module() {}
@@ -57,6 +63,14 @@ function pumpio_content(&$a) {
 	return $o;
 }
 
+function pumpio_check_item_notification($a, &$notification_data) {
+	$hostname = get_pconfig($notification_data["uid"], 'pumpio','host');
+	$username = get_pconfig($notification_data["uid"], "pumpio", "user");
+
+        $notification_data["profiles"][] = "https://".$hostname."/".$username;
+}
+
+
 function pumpio_registerclient(&$a, $host) {
 
 	$url = "https://".$host."/api/client/register";
@@ -68,8 +82,10 @@ function pumpio_registerclient(&$a, $host) {
 	if ($application_name == "")
 		$application_name = $a->get_hostname();
 
+	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+
 	$params["type"] = "client_associate";
-	$params["contacts"] = $a->config['admin_email'];
+	$params["contacts"] = $adminlist[0];
 	$params["application_type"] = "native";
 	$params["application_name"] = $application_name;
 	$params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png";
@@ -302,6 +318,7 @@ function pumpio_settings_post(&$a,&$b) {
 			set_pconfig(local_user(),'pumpio','mirror',false);
 			set_pconfig(local_user(),'pumpio','post_by_default',false);
 			set_pconfig(local_user(),'pumpio','lastdate', 0);
+			set_pconfig(local_user(),'pumpio','last_id', '');
 		} else {
 			// filtering the username if it is filled wrong
 			$user = $_POST['pumpio_user'];
@@ -433,20 +450,8 @@ function pumpio_send(&$a,&$b) {
 
 		$title = trim($b['title']);
 
-		//if ($title != '')
-		//	$title = "<h4>".$title."</h4>";
-
 		$content = bbcode($b['body'], false, false, 4);
 
-		// Enhance the way, videos are displayed
-		$content = preg_replace('/<a href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
-		$content = preg_replace('/<a href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-		$content = preg_replace('/<a href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-		$content = preg_replace('/<a href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-
-		$URLSearchString = "^\[\]";
-		$content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content);
-
 		$params = array();
 
 		$params["verb"] = "post";
@@ -499,9 +504,16 @@ function pumpio_send(&$a,&$b) {
 		$username = $user.'@'.$host;
 		$url = 'https://'.$host.'/api/user/'.$user.'/feed';
 
-		$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+		if (pumpio_reachable($url))
+			$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+		else
+			$success = false;
 
 		if($success) {
+
+			if ($user->generator->displayName)
+				set_pconfig($b["uid"], "pumpio", "application_name", $user->generator->displayName);
+
 			$post_id = $user->object->id;
 			logger('pumpio_send '.$username.': success '.$post_id);
 			if($post_id AND $iscomment) {
@@ -581,7 +593,10 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
 
-	$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+	else
+		$success = false;
 
 	if($success)
 		logger('pumpio_action '.$username.' '.$action.': success '.$uri);
@@ -599,8 +614,13 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
 	}
 }
 
+function pumpio_sync(&$a) {
+	$r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'",
+		$plugin);
+
+	if (!count($r))
+		return;
 
-function pumpio_cron(&$a,$b) {
 	$last = get_config('pumpio','last_poll');
 
 	$poll_interval = intval(get_config('pumpio','poll_interval'));
@@ -663,6 +683,11 @@ function pumpio_cron(&$a,$b) {
 	set_config('pumpio','last_poll', time());
 }
 
+function pumpio_cron(&$a,$b) {
+	//pumpio_sync($a);
+	proc_run("php","addon/pumpio/pumpio_sync.php");
+}
+
 function pumpio_fetchtimeline(&$a, $uid) {
 	$ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
 	$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
@@ -672,8 +697,12 @@ function pumpio_fetchtimeline(&$a, $uid) {
 	$hostname = get_pconfig($uid, 'pumpio','host');
 	$username = get_pconfig($uid, "pumpio", "user");
 
-	$application_name  = get_config('pumpio', 'application_name');
-
+	//  get the application name for the pump.io app
+	//  1st try personal config, then system config and fallback to the
+	//  hostname of the node if neither one is set.
+	$application_name  = get_pconfig( $uid, 'pumpio', 'application_name');
+	if ($application_name == "")
+		$application_name  = get_config('pumpio', 'application_name');
 	if ($application_name == "")
 		$application_name = $a->get_hostname();
 
@@ -695,7 +724,10 @@ function pumpio_fetchtimeline(&$a, $uid) {
 
 	$username = $user.'@'.$host;
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	else
+		$success = false;
 
 	if (!$success) {
 		logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true));
@@ -830,17 +862,19 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 	// Searching for the liked post
 	// Two queries for speed issues
-	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
 				dbesc($post->object->id),
-				intval($uid)
+				intval($uid),
+				dbesc(NETWORK_PUMPIO)
 		);
 
 	if (count($r))
 		$orig_post = $r[0];
 	else {
-		$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
 					dbesc($post->object->id),
-					intval($uid)
+					intval($uid),
+					dbesc(NETWORK_PUMPIO)
 			);
 
 		if (!count($r))
@@ -915,29 +949,44 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 	logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 }
 
-function pumpio_get_contact($uid, $contact) {
+function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
-	$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-		dbesc(normalise_link($contact->url)));
+	if (function_exists("update_gcontact")) {
+		update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+				"photo" => $contact->image->url, "name" => $contact->displayName,  "hide" => true,
+				"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
+				"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
 
-	if (count($r) == 0)
-		q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-			dbesc(normalise_link($contact->url)),
-			dbesc($contact->displayName),
-			dbesc($contact->preferredUsername),
-			dbesc($contact->image->url));
-	else
-		q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-			dbesc($contact->displayName),
-			dbesc($contact->preferredUsername),
-			dbesc($contact->image->url),
+		$cid = get_contact($contact->url, $uid);
+	} else {
+		// Old Code
+		$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
 			dbesc(normalise_link($contact->url)));
 
-	if (DB_UPDATE_VERSION >= "1177")
-		q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
-			dbesc($contact->location->displayName),
-			dbesc($contact->summary),
-			dbesc(normalise_link($contact->url)));
+		if (count($r) == 0)
+			q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
+				dbesc(normalise_link($contact->url)),
+				dbesc($contact->displayName),
+				dbesc($contact->preferredUsername),
+				dbesc($contact->image->url));
+		else
+			q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
+				dbesc($contact->displayName),
+				dbesc($contact->preferredUsername),
+				dbesc($contact->image->url),
+				dbesc(normalise_link($contact->url)));
+
+		if (DB_UPDATE_VERSION >= "1177")
+			q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
+				dbesc($contact->location->displayName),
+				dbesc($contact->summary),
+				dbesc(normalise_link($contact->url)));
+
+		$cid = 0;
+	}
+
+	if ($no_insert)
+		return($cid);
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
 		intval($uid), dbesc($contact->url));
@@ -984,27 +1033,6 @@ function pumpio_get_contact($uid, $contact) {
 			group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
 		}
 
-		require_once("Photo.php");
-
-		$photos = import_profile_photo($contact->image->url,$uid,$contact_id);
-
-		q("UPDATE `contact` SET `photo` = '%s',
-					`thumb` = '%s',
-					`micro` = '%s',
-					`name-date` = '%s',
-					`uri-date` = '%s',
-					`avatar-date` = '%s'
-				WHERE `id` = %d
-			",
-		dbesc($photos[0]),
-		dbesc($photos[1]),
-		dbesc($photos[2]),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		intval($contact_id)
-		);
-
                 if (DB_UPDATE_VERSION >= "1177")
 			q("UPDATE `contact` SET `location` = '%s',
 						`about` = '%s'
@@ -1014,39 +1042,9 @@ function pumpio_get_contact($uid, $contact) {
 				intval($contact_id)
 			);
 	} else {
-		// update profile photos once every two weeks as we have no notification of when they change.
-		//$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false);
-                $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
-
-		// check that we have all the photos, this has been known to fail on occasion
-
-		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
-			require_once("Photo.php");
-
-			$photos = import_profile_photo($contact->image->url, $uid, $r[0]['id']);
-
-			q("UPDATE `contact` SET `photo` = '%s',
-					`thumb` = '%s',
-					`micro` = '%s',
-					`name-date` = '%s',
-					`uri-date` = '%s',
-					`avatar-date` = '%s',
-					`name` = '%s',
-					`nick` = '%s'
-					WHERE `id` = %d
-				",
-			dbesc($photos[0]),
-			dbesc($photos[1]),
-			dbesc($photos[2]),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc($contact->displayName),
-			dbesc($contact->preferredUsername),
-			intval($r[0]['id'])
-			);
+		$contact_id = $r[0]["id"];
 
-			if (DB_UPDATE_VERSION >= "1177")
+		/*	if (DB_UPDATE_VERSION >= "1177")
 				q("UPDATE `contact` SET `location` = '%s',
 							`about` = '%s'
 						WHERE `id` = %d",
@@ -1054,11 +1052,13 @@ function pumpio_get_contact($uid, $contact) {
 					dbesc($contact->summary),
 					intval($r[0]['id'])
 				);
-		}
-
+		*/
 	}
 
-	return($r[0]["id"]);
+	if (function_exists("update_contact_avatar"))
+		update_contact_avatar($contact->image->url, $uid, $contact_id);
+
+	return($contact_id);
 }
 
 function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
@@ -1150,14 +1150,14 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 			$postarray['allow_cid'] = '<' . $self[0]['id'] . '>';
 		}
 	} else {
-		$contact_id = 0;
+		$contact_id = pumpio_get_contact($uid, $post->actor, true);
 
-		if(link_compare($post->actor->url, $own_id)) {
+		if (link_compare($post->actor->url, $own_id)) {
 			$contact_id = $self[0]['id'];
 			$post->actor->displayName = $self[0]['name'];
 			$post->actor->url = $self[0]['url'];
 			$post->actor->image->url = $self[0]['photo'];
-		} else {
+		} elseif ($contact_id == 0) {
 			// Take an existing contact, the contact of the note or - as a fallback - the id of the user
 			$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
 				dbesc($post->actor->url),
@@ -1213,6 +1213,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	$postarray['plink'] = $post->object->url;
 	$postarray['app'] = $post->generator->displayName;
 	$postarray['body'] = html2bbcode($post->object->content);
+	$postarray['object'] = json_encode($post);
 
 	if ($post->object->fullImage->url != "")
 		$postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];
@@ -1221,14 +1222,35 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 		$postarray['title'] = $post->object->displayName;
 
 	$postarray['created'] = datetime_convert('UTC','UTC',$post->published);
-	$postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
+	if (isset($post->updated))
+		$postarray['edited'] = datetime_convert('UTC','UTC',$post->updated);
+	elseif (isset($post->received))
+		$postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
+	else
+		$postarray['edited'] = $postarray['created'];
 
 	if ($post->verb == "share") {
 		if (!intval(get_config('system','wall-to-wall_share'))) {
-			$postarray['body'] = "[share author='".$post->object->author->displayName.
+			if (isset($post->object->author->displayName) AND ($post->object->author->displayName != ""))
+				$share_author = $post->object->author->displayName;
+			elseif (isset($post->object->author->preferredUsername) AND ($post->object->author->preferredUsername != ""))
+				$share_author = $post->object->author->preferredUsername;
+			else
+				$share_author = $post->object->author->url;
+
+			$postarray['body'] = share_header($share_author, $post->object->author->url,
+							$post->object->author->image->url, "",
+							datetime_convert('UTC','UTC',$post->object->created),
+							$post->links->self->href).
+						$postarray['body']."[/share]";
+
+			/*
+			$postarray['body'] = "[share author='".$share_author.
 					"' profile='".$post->object->author->url.
 					"' avatar='".$post->object->author->image->url.
+					"' posted='".datetime_convert('UTC','UTC',$post->object->created).
 					"' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+			*/
 		} else {
 			// Let shares look like wall-to-wall posts
 			$postarray['author-name'] = $post->object->author->displayName;
@@ -1241,6 +1263,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 		return false;
 
 	$top_item = item_store($postarray);
+	$postarray["id"] = $top_item;
 
 	if (($top_item == 0) AND ($post->verb == "update")) {
 		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
@@ -1269,42 +1292,44 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 		if (link_compare($own_id, $postarray['author-link']))
 			return $top_item;
 
-		$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
-				dbesc($postarray['parent-uri']),
-				intval($uid)
-				);
-
-		if(count($myconv)) {
-
-			foreach($myconv as $conv) {
-				// now if we find a match, it means we're in this conversation
-
-				if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id))
-					continue;
+		if (!function_exists("check_item_notification")) {
+			$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
+					dbesc($postarray['parent-uri']),
+					intval($uid)
+					);
 
-				require_once('include/enotify.php');
-
-				$conv_parent = $conv['parent'];
-
-				notification(array(
-					'type'         => NOTIFY_COMMENT,
-					'notify_flags' => $user[0]['notify-flags'],
-					'language'     => $user[0]['language'],
-					'to_name'      => $user[0]['username'],
-					'to_email'     => $user[0]['email'],
-					'uid'          => $user[0]['uid'],
-					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
-					'source_name'  => $postarray['author-name'],
-					'source_link'  => $postarray['author-link'],
-					'source_photo' => $postarray['author-avatar'],
-					'verb'         => ACTIVITY_POST,
-					'otype'        => 'item',
-					'parent'       => $conv_parent,
-					));
-
-				// only send one notification
-				break;
+			if(count($myconv)) {
+
+				foreach($myconv as $conv) {
+					// now if we find a match, it means we're in this conversation
+
+					if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id))
+						continue;
+
+					require_once('include/enotify.php');
+
+					$conv_parent = $conv['parent'];
+
+					notification(array(
+						'type'         => NOTIFY_COMMENT,
+						'notify_flags' => $user[0]['notify-flags'],
+						'language'     => $user[0]['language'],
+						'to_name'      => $user[0]['username'],
+						'to_email'     => $user[0]['email'],
+						'uid'          => $user[0]['uid'],
+						'item'         => $postarray,
+						'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
+						'source_name'  => $postarray['author-name'],
+						'source_link'  => $postarray['author-link'],
+						'source_photo' => $postarray['author-avatar'],
+						'verb'         => ACTIVITY_POST,
+						'otype'        => 'item',
+						'parent'       => $conv_parent,
+						));
+
+					// only send one notification
+					break;
+				}
 			}
 		}
 	}
@@ -1351,7 +1376,10 @@ function pumpio_fetchinbox(&$a, $uid) {
 	if ($last_id != "")
 		$url .= '?since='.urlencode($last_id);
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	else
+		$success = false;
 
 	if ($user->items) {
 	    $posts = array_reverse($user->items);
@@ -1389,12 +1417,18 @@ function pumpio_getallusers(&$a, $uid) {
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/following';
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+	else
+		$success = false;
 
 	if ($users->totalItems > count($users->items)) {
 		$url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;
 
-		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+		if (pumpio_reachable($url))
+			$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+		else
+			$success = false;
 	}
 
 	foreach ($users->items AS $user)
@@ -1455,7 +1489,10 @@ function pumpio_queue_hook(&$a,&$b) {
 			$client->client_id = $consumer_key;
 			$client->client_secret = $consumer_secret;
 
-			$success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+			if (pumpio_reachable($z['url']))
+				$success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+			else
+				$success = false;
 
 			if($success) {
 				$post_id = $user->object->id;
@@ -1603,7 +1640,10 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 
 	logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+	else
+		$success = false;
 
 	if (!$success)
 		return;
@@ -1668,6 +1708,12 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 	}
 }
 
+
+function pumpio_reachable($url) {
+	$data = z_fetch_url($url, false, $redirects, array('timeout'=>10));
+	return(intval($data['return_code']) != 0);
+}
+
 /*
 To-Do:
  - edit own notes