Issue 4475: Don't create empty twitter quotes

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 74828a842941b15f9300bb2d99a1fd643c40e37b..bc81144f19f5f56e7430579de04fb5e085c91cde 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -817,6 +817,10 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
                // We don't support nested shares, so we mustn't show quotes as shares on retweets
                $item = twitter_createpost($a, $uid, $post->retweeted_status, ['id' => 0], false, false, true);
 
+               if (empty($item['body'])) {
+                       return [];
+               }
+
                $datarray['body'] = "\n" . share_header(
                        $item['author-name'],
                        $item['author-link'],
@@ -830,6 +834,10 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
        } else {
                $item = twitter_createpost($a, $uid, $post, ['id' => 0], false, false, false);
 
+               if (empty($item['body'])) {
+                       return [];
+               }
+
                $datarray['body'] = $item['body'];
        }
 
@@ -907,6 +915,10 @@ function twitter_fetchtimeline(App $a, $uid)
 
                                $_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
 
+                               if (empty($_REQUEST['body'])) {
+                                       continue;
+                               }
+
                                logger('twitter: posting for user ' . $uid);
 
                                item_post($a);
@@ -1467,6 +1479,10 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
        if (!empty($post->retweeted_status)) {
                $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
 
+               if (empty($retweet['body'])) {
+                       return [];
+               }
+
                $retweet['source'] = $postarray['source'];
                $retweet['private'] = $postarray['private'];
                $retweet['allow_cid'] = $postarray['allow_cid'];
@@ -1481,6 +1497,10 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
        if (!empty($post->quoted_status) && !$noquote) {
                $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
 
+               if (empty($quoted['body'])) {
+                       return [];
+               }
+
                $postarray['body'] = $statustext;
 
                $postarray['body'] .= "\n" . share_header(