Merge pull request #157 from annando/master

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

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 2171acf471d712a91bb2317a2046085a0d66d90f..66aa3bd596e31110bd980bd4e7a62f86caed2911 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -313,11 +313,12 @@ function statusnet_settings(&$a,&$s) {
             $s .= '<div class="clear"></div>';
             $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
             $s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
-            $s .= '<p></p><div class="clear"></div></div>';
+            $s .= '<div class="clear"></div>';
             $s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('StatusNet application name').'</label>';
             $s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
-            $s .= '<p></p><div class="clear"></div></div>';
+            $s .= '<p></p><div class="clear"></div>';
             $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+            $s .= '</div>';
        } else {
                /***
                 * ok we have a consumer key pair now look into the OAuth stuff
@@ -491,10 +492,10 @@ function statusnet_shortenmsg($b, $max_char) {
        $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
 
        // remove the share element
-       $body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
+       //$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
 
        // At first convert the text to html
-       $html = bbcode($body, false, false);
+       $html = bbcode($body, false, false, 2);
 
        // Then convert it to plain text
        //$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
@@ -547,9 +548,20 @@ function statusnet_shortenmsg($b, $max_char) {
                $msglink = $b["plink"];
 
        // If the message is short enough then don't modify it. (if the link exists in the original message)
-       if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
+       if ((strlen(trim($origmsg)) <= $max_char) AND (($msglink == "") OR strpos($origmsg, $msglink)))
+               return(array("msg"=>trim($origmsg), "image"=>""));
+
+       // If the message is short enough and contains a picture then post the picture as well
+       if ((strlen(trim($origmsg)) <= ($max_char - 20)) AND strpos($origmsg, $msglink))
+               return(array("msg"=>trim($origmsg), "image"=>$image));
+
+       // If the message is short enough and the link exists in the original message don't modify it as well
+       if ((strlen(trim($origmsg)) <= $max_char) AND strpos($origmsg, $msglink))
                return(array("msg"=>trim($origmsg), "image"=>""));
 
+       // Preserve the unshortened link
+       $orig_link = $msglink;
+
        if (strlen($msglink) > 20)
                $msglink = short_link($msglink);
 
@@ -569,7 +581,22 @@ function statusnet_shortenmsg($b, $max_char) {
        while (strpos($msg, "  ") !== false)
                $msg = str_replace("  ", " ", $msg);
 
-       return(array("msg"=>trim($msg." ".$msglink), "image"=>$image));
+       //return(array("msg"=>trim($msg."\n".$msglink), "image"=>$image));
+
+       // Looking if the link points to an image
+       $img_str = fetch_url($orig_link);
+
+       $tempfile = tempnam(get_config("system","temppath"), "cache");
+       file_put_contents($tempfile, $img_str);
+       $mime = image_type_to_mime_type(exif_imagetype($tempfile));
+       unlink($tempfile);
+
+       if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
+               return(array("msg"=>trim($msg), "image"=>$orig_link));
+       else if (($image != $orig_link) AND ($image != "") AND (strlen($msg." ".$msglink) <= ($max_char - 20)))
+               return(array("msg"=>trim($msg." ".$msglink)."\n", "image"=>$image));
+       else
+               return(array("msg"=>trim($msg." ".$msglink), "image"=>""));
 }
 
 function statusnet_post_hook(&$a,&$b) {
@@ -697,18 +724,25 @@ function statusnet_post_hook(&$a,&$b) {
                        $msg = $msgarr["msg"];
                        $image = $msgarr["image"];
                        if ($image != "") {
-                               $imagedata = file_get_contents($image);
-                               $tempfile = tempnam(get_config("system","temppath"), "upload");
-                               file_put_contents($tempfile, $imagedata);
-                               $postdata = array("status"=>$msg, "media"=>"@".$tempfile);
+                               $img_str = fetch_url($image);
+                               $tempfile = tempnam(get_config("system","temppath"), "cache");
+                               file_put_contents($tempfile, $img_str);
+                               $postdata = array("status" => $msg, "media[]" => $tempfile);
                        } else
                                $postdata = array("status"=>$msg);
                }
 
                // and now dent it :-)
                if(strlen($msg)) {
-                    //$result = $dent->post('statuses/update', array('status' => $msg));
-                    $result = $dent->post('statuses/update', $postdata);
+
+                   // New code that is able to post pictures
+                   require_once("addon/statusnet/codebird.php");
+                   $cb = \CodebirdSN\CodebirdSN::getInstance();
+                   $cb->setAPIEndpoint($api);
+                   $cb->setConsumerKey($ckey, $csecret);
+                   $cb->setToken($otoken, $osecret);
+                   $result = $cb->statuses_update($postdata);
+                    //$result = $dent->post('statuses/update', $postdata);
                     logger('statusnet_post send, result: ' . print_r($result, true).
                            "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true));
                     if ($result->error) {
@@ -721,9 +755,9 @@ function statusnet_post_hook(&$a,&$b) {
 }
 
 function statusnet_plugin_admin_post(&$a){
-       
+
        $sites = array();
-       
+
        foreach($_POST['sitename'] as $id=>$sitename){
                $sitename=trim($sitename);
                $apiurl=trim($_POST['apiurl'][$id]);
@@ -855,6 +889,9 @@ function statusnet_fetchtimeline($a, $uid) {
                if ($first_time)
                        continue;
 
+               if ($post->source == "activity")
+                       continue;
+
                if (is_object($post->retweeted_status))
                        continue;
 
@@ -865,6 +902,7 @@ function statusnet_fetchtimeline($a, $uid) {
                        $_SESSION["authenticated"] = true;
                        $_SESSION["uid"] = $uid;
 
+                       unset($_REQUEST);
                        $_REQUEST["type"] = "wall";
                        $_REQUEST["api_source"] = true;
                        $_REQUEST["profile_uid"] = $uid;
@@ -872,6 +910,8 @@ function statusnet_fetchtimeline($a, $uid) {
 
                        //$_REQUEST["date"] = $post->created_at;
 
+                       $_REQUEST["title"] = "";
+
                        $_REQUEST["body"] = $post->text;
                        if (is_string($post->place->name))
                                $_REQUEST["location"] = $post->place->name;