sekretaerbaer/friendica-addons-sekb
1
0
Fork 0
forked from Friendica/friendica-addons
Code Pull requests Activity

Merge pull request #143 from annando/master

Browse source 
twitter: Improvements for tweets with pictures and links.
This commit is contained in:
tobiasd 2013-07-27 22:04:34 -07:00
commit ea5eac67dc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
twitter/twitter.php
View file

@ -432,7 +432,7 @@ function twitter_shortenmsg($b) {
return(array("msg"=>trim($origmsg), "image"=>"")); return(array("msg"=>trim($origmsg), "image"=>""));
// If the message is short enough and contains a picture then post the picture as well // If the message is short enough and contains a picture then post the picture as well
if ((strlen(trim($origmsg)) <= ($max_char - 40)) AND strpos($origmsg, $msglink)) if ((strlen(trim($origmsg)) <= ($max_char - 20)) AND strpos($origmsg, $msglink))
return(array("msg"=>trim($origmsg), "image"=>$image)); 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 the message is short enough and the link exists in the original message don't modify it as well
@ -467,7 +467,7 @@ function twitter_shortenmsg($b) {
// if the post contains a picture and a link then the system tries to cut the post earlier. // if the post contains a picture and a link then the system tries to cut the post earlier.
// So the link and the picture can be posted. // So the link and the picture can be posted.
if (($image != "") AND ($orig_link != $image)) { if (($image != "") AND ($orig_link != $image)) {
$msg2 = substr($msg, 0, ($max_char - 40) - (strlen($msglink))); $msg2 = substr($msg, 0, ($max_char - 20) - (strlen($msglink)));
$lastchar = substr($msg2, -1); $lastchar = substr($msg2, -1);
$msg2 = substr($msg2, 0, -1); $msg2 = substr($msg2, 0, -1);
$pos = strrpos($msg2, "\n"); $pos = strrpos($msg2, "\n");
@ -498,7 +498,7 @@ function twitter_shortenmsg($b) {
if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/")) if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
return(array("msg"=>trim($msg), "image"=>$orig_link)); return(array("msg"=>trim($msg), "image"=>$orig_link));
else if (($image != $orig_link) AND ($image != "") AND (strlen($msg."\n".$orig_link) <= 100)) else if (($image != $orig_link) AND ($image != "") AND (strlen($msg."\n".$msglink) <= ($max_char - 20)))
return(array("msg"=>trim($msg."\n".$orig_link), "image"=>$image)); return(array("msg"=>trim($msg."\n".$orig_link), "image"=>$image));
else else
return(array("msg"=>trim($msg."\n".$orig_link), "image"=>"")); return(array("msg"=>trim($msg."\n".$orig_link), "image"=>""));