Merge remote-tracking branch 'upstream/master' into 1601-gcontact

[friendica-addons.git] / pumpio / pumpio.php

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 95bc6b9f3ca37c9794e3f3e4e6457d1f9a05b62b..0a5f50b967f9a2e66bac4c1ccdb504665be2f60c 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1,7 +1,7 @@
 <?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>
  */
@@ -499,7 +499,10 @@ 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) {
 
@@ -585,7 +588,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);
@@ -604,6 +610,12 @@ 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;
+
        $last = get_config('pumpio','last_poll');
 
        $poll_interval = intval(get_config('pumpio','poll_interval'));
@@ -707,7 +719,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));
@@ -929,27 +944,35 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact) {
 
-       $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-               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),
+       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)));
+       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)));
+       }
 
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
                intval($uid), dbesc($contact->url));
@@ -1365,7 +1388,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);
@@ -1403,12 +1429,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)
@@ -1469,7 +1501,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;
@@ -1617,7 +1652,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;
@@ -1682,6 +1720,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