X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=statusnet%2Fstatusnet.php;h=b16dedf846144dcbd350b8dbe623cb1fb4ac35b6;hb=49e383e78adc9174950f80900f4686455561c7c3;hp=ca0b17da66667ea1d4dc38bea844b5cc73820b2c;hpb=ac581239f64056ca0c4731ec38d1fdc5eec52953;p=friendica-addons.git diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index ca0b17da..b16dedf8 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -3,26 +3,36 @@ * Name: StatusNet Connector * Description: Relay public postings to a connected StatusNet account * Version: 1.0.5 - * Author: Tobias Diekershoff + * Author: Tobias Diekershoff * Author: Michael Vogel - */ - -/* StatusNet Plugin for Friendica - * - * Author: Tobias Diekershoff - * tobias.diekershoff@gmx.net * - * License:3-clause BSD license + * Copyright (c) 2011-2013 Tobias Diekershoff, Michael Vogel + * All rights reserved. * - * Configuration: - * To activate the plugin itself add it to the $a->config['system']['addon'] - * setting. After this, your user can configure their Twitter account settings - * from "Settings -> Plugin Settings". + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * * copyright notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the distribution. + * * Neither the name of the nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * Requirements: PHP5, curl [Slinky library] + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Documentation: http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/StatusNet_Plugin */ + /*** * We have to alter the TwitterOAuth class a little bit to work with any StatusNet @@ -303,11 +313,12 @@ function statusnet_settings(&$a,&$s) { $s .= '
'; $s .= ''; $s .= '
'; - $s .= '

'; + $s .= '
'; $s .= ''; $s .= '
'; - $s .= '

'; + $s .= '

'; $s .= '
'; + $s .= ''; } else { /*** * ok we have a consumer key pair now look into the OAuth stuff @@ -380,7 +391,7 @@ function statusnet_settings(&$a,&$s) { $s .= '
'; } } - $s .= '
'; + $s .= '
'; } @@ -481,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)); @@ -537,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); @@ -553,13 +575,28 @@ function statusnet_shortenmsg($b, $max_char) { else if ($lastchar != "\n") $msg = substr($msg, 0, -3)."..."; } - $msg = str_replace("\n", " ", $msg); + //$msg = str_replace("\n", " ", $msg); // Removing multiple spaces - again 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) { @@ -687,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) { @@ -711,12 +755,14 @@ 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]); + if (! (substr($apiurl, -1)=='/')) + $apiurl=$apiurl.'/'; $secret=trim($_POST['secret'][$id]); $key=trim($_POST['key'][$id]); $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):''); @@ -748,7 +794,7 @@ function statusnet_plugin_admin(&$a, &$o){ foreach($sites as $id=>$s){ $sitesform[] = Array( 'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""), - 'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], ""), + 'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29") ), 'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""), 'key' => Array("key[$id]", "Key", $s['consumerkey'], ""), 'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""), @@ -760,7 +806,7 @@ function statusnet_plugin_admin(&$a, &$o){ $id++; $sitesform[] = Array( 'sitename' => Array("sitename[$id]", t("Site name"), "", ""), - 'apiurl' => Array("apiurl[$id]", t("API URL"), "", ""), + 'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29") ), 'secret' => Array("secret[$id]", t("Consumer Secret"), "", ""), 'key' => Array("key[$id]", t("Consumer Key"), "", ""), 'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""), @@ -843,6 +889,9 @@ function statusnet_fetchtimeline($a, $uid) { if ($first_time) continue; + if ($post->source == "activity") + continue; + if (is_object($post->retweeted_status)) continue; @@ -853,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; @@ -860,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;