From d04fd5fb6f02e18791e2ebd40e06567da16aa5d5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 22 Jul 2013 23:25:23 +0200 Subject: [PATCH 1/3] twitter: Now pictures are posted to twitpic so that they are embedded in the standard twitter clients --- twitter/twitter.php | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 5e01db959..e4fbaa6a3 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -414,12 +414,12 @@ function twitter_shortenmsg($b) { // If the message is short enough then don't modify it. if ((strlen(trim($origmsg)) <= $max_char) AND ($msglink == "")) - return(trim($origmsg)); + return(array("msg"=>trim($origmsg), "image"=>"")); // 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)); + return(array("msg"=>trim($origmsg), "image"=>"")); // Preserve the unshortened link $orig_link = $msglink; @@ -451,8 +451,10 @@ function twitter_shortenmsg($b) { while (strpos($msg, " ") !== false) $msg = str_replace(" ", " ", $msg); - //return(trim($msg." ".$msglink)); - return(trim($msg."\n".$orig_link)); + if ($image == $orig_link) + return(array("msg"=>trim($msg), "image"=>$image)); + else + return(array("msg"=>trim($msg."\n".$orig_link), "image"=>"")); } function twitter_post_hook(&$a,&$b) { @@ -574,15 +576,33 @@ function twitter_post_hook(&$a,&$b) { $msg = trim($msg); } else - $msg = twitter_shortenmsg($b); + $msgarr = twitter_shortenmsg($b); + $msg = $msgarr["msg"]; + $image = $msgarr["image"]; // and now tweet it :-) - if(strlen($msg)) { + if(strlen($msg) and ($image == "")) { $result = $tweet->post('statuses/update', array('status' => $msg)); logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG); if ($result->error) { logger('Send to Twitter failed: "' . $result->error . '"'); } + } else if(strlen($msg) and ($image != "")) { + $img_str = fetch_url($image); + + $tempfile = tempnam(get_config("system","temppath"), "cache"); + file_put_contents($tempfile, $img_str); + $mime = image_type_to_mime_type(exif_imagetype($tempfile)); + unlink($tempfile); + + $filename = "upload"; + + $result = $tweet->post('statuses/update_with_media', array('media[]' => "{$img_str};type=".$mime.";filename={$filename}" , 'status' => $msg)); + + logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG); + if ($result->error) { + logger('Send to Twitter failed: "' . $result->error . '"'); + } } } } From adb0219e1077e7d632ec133c62c0936e7ec4fe33 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 23 Jul 2013 01:09:19 +0200 Subject: [PATCH 2/3] twitter: Better detection if a picture is posted. --- twitter/twitter.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index e4fbaa6a3..997f30a96 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -451,8 +451,16 @@ function twitter_shortenmsg($b) { while (strpos($msg, " ") !== false) $msg = str_replace(" ", " ", $msg); - if ($image == $orig_link) - return(array("msg"=>trim($msg), "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 return(array("msg"=>trim($msg."\n".$orig_link), "image"=>"")); } From 6790681b1ba0a2a61ec5e1da923604685fa05c61 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 24 Jul 2013 08:10:20 +0200 Subject: [PATCH 3/3] twitter: If a post contains an image and a link then both will be posted. --- twitter/twitter.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/twitter/twitter.php b/twitter/twitter.php index 997f30a96..f84ab96da 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -392,6 +392,21 @@ function twitter_shortenmsg($b) { // If there is no bookmark element then take the first link if ($link == '') { $links = collecturls($html); + + foreach($links AS $singlelink) { + $img_str = fetch_url($singlelink); + + $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 (substr($mime, 0, 6) == "image/") { + $image = $singlelink; + unset($links[$singlelink]); + } + } + if (sizeof($links) > 0) { reset($links); $link = current($links); @@ -416,6 +431,10 @@ function twitter_shortenmsg($b) { if ((strlen(trim($origmsg)) <= $max_char) AND ($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 - 40)) 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 // -3 because of the bad shortener of twitter if ((strlen(trim($origmsg)) <= ($max_char - 3)) AND strpos($origmsg, $msglink)) @@ -444,6 +463,20 @@ function twitter_shortenmsg($b) { $msg = substr($msg, 0, $pos); else if ($lastchar != "\n") $msg = substr($msg, 0, -3)."..."; + + // 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. + if (($image != "") AND ($orig_link != $image)) { + $msg2 = substr($msg, 0, ($max_char - 40) - (strlen($msglink))); + $lastchar = substr($msg2, -1); + $msg2 = substr($msg2, 0, -1); + $pos = strrpos($msg2, "\n"); + if ($pos > 0) + $msg = substr($msg2, 0, $pos); + else if ($lastchar == "\n") + $msg = trim($msg2); + } + } //$msg = str_replace("\n", " ", $msg); @@ -451,6 +484,10 @@ function twitter_shortenmsg($b) { while (strpos($msg, " ") !== false) $msg = str_replace(" ", " ", $msg); + // Removing multiple newlines + //while (strpos($msg, "\n\n") !== false) + // $msg = str_replace("\n\n", "\n", $msg); + // Looking if the link points to an image $img_str = fetch_url($orig_link); @@ -461,6 +498,8 @@ function twitter_shortenmsg($b) { 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."\n".$orig_link) <= 100)) + return(array("msg"=>trim($msg."\n".$orig_link), "image"=>$image)); else return(array("msg"=>trim($msg."\n".$orig_link), "image"=>"")); }