Merge pull request #505 from MrPetovan/task/4116-move-twitteroauth-to-composer

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

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index a9c7084dc6d3780a1db2330501a9e32181c7afb8..d0fe09d568e070fe6f2e730762a232faa28ac22e 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -16,6 +16,7 @@ use Friendica\Model\Group;
 use Friendica\Model\User;
 use Friendica\Model\Item;
 use Friendica\Model\Queue;
+use Friendica\Util\Network;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -973,7 +974,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
        $likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' .
                '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
 
-       $ret = item_store($likedata);
+       $ret = Item::insert($likedata);
 
        logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 }
@@ -1249,7 +1250,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
        if (trim($postarray['body']) == "")
                return false;
 
-       $top_item = item_store($postarray);
+       $top_item = Item::insert($postarray);
        $postarray["id"] = $top_item;
 
        if (($top_item == 0) && ($post->verb == "update")) {
@@ -1305,7 +1306,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                                                'to_email'     => $user[0]['email'],
                                                'uid'          => $user[0]['uid'],
                                                'item'         => $postarray,
-                                               'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
+                                               'link'         => $a->get_baseurl().'/display/'.urlencode(Item::getGuidById($top_item)),
                                                'source_name'  => $postarray['author-name'],
                                                'source_link'  => $postarray['author-link'],
                                                'source_photo' => $postarray['author-avatar'],
@@ -1698,7 +1699,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 
 
 function pumpio_reachable($url) {
-       $data = z_fetch_url($url, false, $redirects, ['timeout'=>10]);
+       $data = Network::curl($url, false, $redirects, ['timeout'=>10]);
        return(intval($data['return_code']) != 0);
 }