pumpio: Added README

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

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 0452db60360876306ed31ac4b82fb7fb1c284db6..223f69bd73a27c5dcc62eee1112337f1078ac68d 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -4,6 +4,7 @@
  * Description: Relay public postings to a connected Twitter account
  * Version: 1.0.4
  * Author: Tobias Diekershoff <http://diekershoff.homeunix.net/friendika/profile/tobias>
+ * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
 
@@ -351,6 +352,8 @@ function twitter_shortenmsg($b) {
        while (strpos($msg, "  ") !== false)
                $msg = str_replace("  ", " ", $msg);
 
+       $origmsg = $msg;
+
        // Removing URLs
        $msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
 
@@ -386,11 +389,20 @@ function twitter_shortenmsg($b) {
        if (($msglink == "") and strlen($msg) > $max_char)
                $msglink = $b["plink"];
 
+       // If the message is short enough then don't modify it.
+       if ((strlen(trim($origmsg)) <= $max_char) AND ($msglink == ""))
+               return(trim($origmsg));
+
+       // If the message is short enough and the link exists in the original message don't modify it as well
+       // -3 because of the bad shortener of twitter
+       if ((strlen(trim($origmsg)) <= ($max_char - 3)) AND strpos($origmsg, $msglink))
+               return(trim($origmsg));
+
        if (strlen($msglink) > 20)
                $msglink = short_link($msglink);
 
-       if (strlen(trim($msg." ".$msglink)) > $max_char) {
-               $msg = substr($msg, 0, $max_char - (strlen($msglink)));
+       if (strlen(trim($msg." ".$msglink)) > ($max_char - 3)) {
+               $msg = substr($msg, 0, ($max_char - 3) - (strlen($msglink)));
                $lastchar = substr($msg, -1);
                $msg = substr($msg, 0, -1);
                $pos = strrpos($msg, "\n");
@@ -505,7 +517,7 @@ function twitter_post_hook(&$a,&$b) {
                        // ok, all the links we want to send out are save, now strip 
                        // away the remaining bbcode
                        //$msg = strip_tags(bbcode($tmp, false, false));
-                       $msg = bbcode($tmp, false, false);
+                       $msg = bbcode($tmp, false, false, true);
                        $msg = str_replace(array('<br>','<br />'),"\n",$msg);
                        $msg = strip_tags($msg);
 
@@ -613,9 +625,14 @@ function twitter_fetchtimeline($a, $uid) {
                $parameters["since_id"] = $lastid;
 
        $items = $connection->get('statuses/user_timeline', $parameters);
+
+       if (!is_array($items))
+               return;
+
        $posts = array_reverse($items);
 
-       foreach ($posts as $post) {
+        if (count($posts)) {
+           foreach ($posts as $post) {
                if ($post->id_str > $lastid)
                        $lastid = $post->id_str;
 
@@ -652,7 +669,8 @@ function twitter_fetchtimeline($a, $uid) {
                        require_once('mod/item.php');
                        item_post($a);
 
-               }
+                }
+            }
        }
        set_pconfig($uid, 'twitter', 'lastid', $lastid);
 }