facebook, statusnet and twitter: Now shared messages are clearly marked with the...

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

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index b3450d956393997d0317cd4e5f3281b9826451df..d168955cd4deec2e3d95350e8da7b12ad1d48f35 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -491,10 +491,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));
@@ -563,13 +563,13 @@ 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));
 }
 
 function statusnet_post_hook(&$a,&$b) {
@@ -855,6 +855,9 @@ function statusnet_fetchtimeline($a, $uid) {
                if ($first_time)
                        continue;
 
+               if ($post->source == "activity")
+                       continue;
+
                if (is_object($post->retweeted_status))
                        continue;
 
@@ -865,6 +868,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 +876,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;