fromgplus: Bigger images for notes.

Twitter: When a post with a media failes then it is posted as a post without media.

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 94b12af345647ce815c0ab1d8026bd0dcd53ed3c..dcfeff86d871baa441d9c3fc68d867f604de1c6e 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -239,9 +239,11 @@ function fromgplus_handleattachments($item, $displaytext) {
                                $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-                               if ($images["preview"] != "")
-                                       $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
-                               elseif ($images["full"] != "")
+                               //if ($images["preview"] != "")
+                               //      $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
+                               //elseif ($images["full"] != "")
+                               //      $post .= "\n[img]".$images["full"]."[/img]\n";
+                               if ($images["full"] != "")
                                        $post .= "\n[img]".$images["full"]."[/img]\n";
 
                                //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";

diff --git a/twitter/twitter.php b/twitter/twitter.php
index bd9eb18c32acac196bbb1deb94fc6e6c791744e7..7a4c491aeda8035519323d641f9a8ef58bfcf9ff 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -641,8 +641,8 @@ function twitter_post_hook(&$a,&$b) {
                        $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 . '"');
+                       if ($result->errors OR $result->error) {
+                               logger('Send to Twitter failed: "' . $result->errors . '"');
                                // Workaround: Remove the picture link so that the post can be reposted without it
                                $image = "";
                        }
@@ -651,8 +651,8 @@ function twitter_post_hook(&$a,&$b) {
                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 . '"');
+                       if ($result->errors OR $result->error)
+                               logger('Send to Twitter failed: "' . $result->errors . '"');
                }
        }
 }