pumpio: Added README

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

diff --git a/twitter/twitter.php b/twitter/twitter.php
index c07d3b58cb3986169b39c4b606f71292e3df2465..223f69bd73a27c5dcc62eee1112337f1078ac68d 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -389,15 +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 the link exists in the original message)
-       if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
+       // 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");