PL translation blackout THX waldis

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

diff --git a/twitter/twitter.php b/twitter/twitter.php
index b13656eadcb49930c002c9c093ce644600d8cafe..9de7b47d8b4dbf62b766d056eb58a35fbbce521a 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -73,6 +73,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -809,11 +810,12 @@ function twitter_prepare_body(App $a, array &$b)
  */
 function twitter_do_mirrorpost(App $a, $uid, $post)
 {
-       // $datarray['object'] = json_encode($post); // Activate for debugging
        $datarray['api_source'] = true;
        $datarray['profile_uid'] = $uid;
        $datarray['extid'] = NETWORK_TWITTER;
        $datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ':' . $post->id);
+       $datarray['protocol'] = Conversation::PARCEL_TWITTER;
+       $datarray['source'] = json_encode($post);
        $datarray['title'] = '';
 
        if (!empty($post->retweeted_status)) {
@@ -1181,7 +1183,14 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 
                                        $tempfile = tempnam(get_temppath(), "cache");
                                        file_put_contents($tempfile, $img_str);
-                                       $mime = image_type_to_mime_type(exif_imagetype($tempfile));
+
+                                       // See http://php.net/manual/en/function.exif-imagetype.php#79283
+                                       if (filesize($tempfile) > 11) {
+                                               $mime = image_type_to_mime_type(exif_imagetype($tempfile));
+                                       } else {
+                                               $mime = false;
+                                       }
+
                                        unlink($tempfile);
 
                                        if (substr($mime, 0, 6) == "image/") {
@@ -1338,7 +1347,8 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
        $postarray['uid'] = $uid;
        $postarray['wall'] = 0;
        $postarray['uri'] = "twitter::" . $post->id_str;
-       // $postarray['object'] = json_encode($post); // Activate for debugging
+       $postarray['protocol'] = Conversation::PARCEL_TWITTER;
+       $postarray['source'] = json_encode($post);
 
        // Don't import our own comments
        if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
@@ -1462,7 +1472,7 @@ 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);
 
-               //$retweet['object'] = $postarray['object']; // Activate for debugging
+               $retweet['source'] = $postarray['source'];
                $retweet['private'] = $postarray['private'];
                $retweet['allow_cid'] = $postarray['allow_cid'];
                $retweet['contact-id'] = $postarray['contact-id'];