Revert "Move TwitterOAuth to Composer, part 2 : StatusNet and Tumblr"

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

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index d74fd3134814147efa3d2fa17f29100304e2e135..7308f223de5ad70267e65f5e5339758c87a61ad0 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -55,8 +55,10 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Util\Network;
 
 class StatusNetOAuth extends TwitterOAuth
 {
@@ -234,7 +236,7 @@ function statusnet_settings_post(App $a, $post)
                        foreach ($globalsn as $asn) {
                                if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
                                        $apibase = $asn['apiurl'];
-                                       $c = fetch_url($apibase . 'statusnet/version.xml');
+                                       $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
                                        if (strlen($c) > 0) {
                                                PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
                                                PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
@@ -252,7 +254,7 @@ function statusnet_settings_post(App $a, $post)
                                //  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
                                //  resign quickly after this one try to fix the path ;-)
                                $apibase = $_POST['statusnet-baseapi'];
-                               $c = fetch_url($apibase . 'statusnet/version.xml');
+                               $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
                                if (strlen($c) > 0) {
                                        //  ok the API path is correct, let's save the settings
                                        PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -262,7 +264,7 @@ function statusnet_settings_post(App $a, $post)
                                } else {
                                        //  the API path is not correct, maybe missing trailing / ?
                                        $apibase = $apibase . '/';
-                                       $c = fetch_url($apibase . 'statusnet/version.xml');
+                                       $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
                                        if (strlen($c) > 0) {
                                                //  ok the API path is now correct, let's save the settings
                                                PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -641,7 +643,6 @@ function statusnet_post_hook(App $a, &$b)
                PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
 
                $tempfile = "";
-               require_once "include/network.php";
                $msgarr = BBCode::toPlaintext($b, $max_char, true, 7);
                $msg = $msgarr["text"];
 
@@ -653,7 +654,7 @@ function statusnet_post_hook(App $a, &$b)
                if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
                        if ((strlen($msgarr["url"]) > 20) &&
                                ((strlen($msg . " \n" . $msgarr["url"]) > $max_char))) {
-                               $msg .= " \n" . short_link($msgarr["url"]);
+                               $msg .= " \n" . Network::shortenUrl($msgarr["url"]);
                        } else {
                                $msg .= " \n" . $msgarr["url"];
                        }
@@ -662,7 +663,7 @@ function statusnet_post_hook(App $a, &$b)
                }
 
                if ($image != "") {
-                       $img_str = fetch_url($image);
+                       $img_str = Network::fetchUrl($image);
                        $tempfile = tempnam(get_temppath(), "cache");
                        file_put_contents($tempfile, $img_str);
                        $postdata = ["status" => $msg, "media[]" => $tempfile];
@@ -1371,7 +1372,7 @@ function statusnet_checknotification(App $a, $uid, $own_url, $top_item, $postarr
                                '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'],
@@ -1495,7 +1496,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
                                                continue;
                                        }
 
-                                       $item = item_store($postarray);
+                                       $item = Item::insert($postarray);
                                        $postarray["id"] = $item;
 
                                        logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
@@ -1550,7 +1551,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
                                        continue;
                                }
 
-                               $item = item_store($postarray);
+                               $item = Item::insert($postarray);
                                $postarray["id"] = $item;
 
                                logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
@@ -1579,7 +1580,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
                                        'to_email'     => $u[0]['email'],
                                        'uid'          => $u[0]['uid'],
                                        'item'         => $postarray,
-                                       'link'         => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($item)),
+                                       'link'         => $a->get_baseurl() . '/display/' . urlencode(Item::getGuidById($item)),
                                        'source_name'  => $postarray['author-name'],
                                        'source_link'  => $postarray['author-link'],
                                        'source_photo' => $postarray['author-avatar'],
@@ -1613,14 +1614,14 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
        if (is_array($items)) {
                $posts = array_reverse($items);
 
-               foreach ($posts AS $post) {
+               foreach ($posts as $post) {
                        $postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
 
                        if (trim($postarray['body']) == "") {
                                continue;
                        }
 
-                       $item = item_store($postarray);
+                       $item = Item::insert($postarray);
                        $postarray["id"] = $item;
 
                        logger('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
@@ -1635,7 +1636,6 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 function statusnet_convertmsg(App $a, $body, $no_tags = false)
 {
        require_once "include/items.php";
-       require_once "include/network.php";
 
        $body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
 
@@ -1653,7 +1653,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
 
                        logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
 
-                       $expanded_url = original_url($match[1]);
+                       $expanded_url = Network::finalUrl($match[1]);
 
                        logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
 
@@ -1677,7 +1677,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
                        } elseif ($oembed_data->type != "link") {
                                $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
                        } else {
-                               $img_str = fetch_url($expanded_url, true, $redirects, 4);
+                               $img_str = Network::fetchUrl($expanded_url, true, $redirects, 4);
 
                                $tempfile = tempnam(get_temppath(), "cache");
                                file_put_contents($tempfile, $img_str);