]> git.mxchange.org Git - friendica-addons.git/blobdiff - twitter/twitter.php
Merge pull request #392 from annando/1612-twitter-video
[friendica-addons.git] / twitter / twitter.php
old mode 100755 (executable)
new mode 100644 (file)
index 16debcb..253ed4a
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Twitter Connector
- * Description: Relay public postings to a connected Twitter account
+ * Description: Bidirectional (posting, relaying and reading) connector for Twitter.
  * Version: 1.0.4
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
@@ -60,6 +60,9 @@
  *     Requirements: PHP5, curl [Slinky library]
  */
 
+require_once('include/enotify.php');
+require_once("include/socgraph.php");
+
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 function twitter_install() {
@@ -73,6 +76,8 @@ function twitter_install() {
        register_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
        register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
        register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
+       register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
+       register_hook('check_item_notification','addon/twitter/twitter.php', 'twitter_check_item_notification');
        logger("installed twitter");
 }
 
@@ -87,6 +92,8 @@ function twitter_uninstall() {
        unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
        unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
        unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
+       unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
+       unregister_hook('check_item_notification','addon/twitter/twitter.php', 'twitter_check_item_notification');
 
        // old setting - remove only
        unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
@@ -95,6 +102,18 @@ function twitter_uninstall() {
 
 }
 
+function twitter_check_item_notification($a, &$notification_data) {
+       $own_id = get_pconfig($notification_data["uid"], 'twitter', 'own_id');
+
+       $own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+                       intval($notification_data["uid"]),
+                       dbesc("twitter::".$own_id)
+               );
+
+       if ($own_user)
+               $notification_data["profiles"][] = $own_user[0]["url"];
+}
+
 function twitter_follow($a, &$contact) {
 
        logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
@@ -161,10 +180,10 @@ function twitter_settings_post ($a,$post) {
                 */
                del_pconfig(local_user(), 'twitter', 'consumerkey');
                del_pconfig(local_user(), 'twitter', 'consumersecret');
-                del_pconfig(local_user(), 'twitter', 'oauthtoken');
-                del_pconfig(local_user(), 'twitter', 'oauthsecret');
-                del_pconfig(local_user(), 'twitter', 'post');
-                del_pconfig(local_user(), 'twitter', 'post_by_default');
+               del_pconfig(local_user(), 'twitter', 'oauthtoken');
+               del_pconfig(local_user(), 'twitter', 'oauthsecret');
+               del_pconfig(local_user(), 'twitter', 'post');
+               del_pconfig(local_user(), 'twitter', 'post_by_default');
                del_pconfig(local_user(), 'twitter', 'lastid');
                del_pconfig(local_user(), 'twitter', 'mirror_posts');
                del_pconfig(local_user(), 'twitter', 'import');
@@ -183,30 +202,30 @@ function twitter_settings_post ($a,$post) {
                $connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
                $token   = $connection->getAccessToken( $_POST['twitter-pin'] );
                //  ok, now that we have the Access Token, save them in the user config
-               set_pconfig(local_user(),'twitter', 'oauthtoken',  $token['oauth_token']);
+               set_pconfig(local_user(),'twitter', 'oauthtoken',  $token['oauth_token']);
                set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
-                set_pconfig(local_user(),'twitter', 'post', 1);
-                //  reload the Addon Settings page, if we don't do it see Bug #42
-                goaway($a->get_baseurl().'/settings/connectors');
+               set_pconfig(local_user(),'twitter', 'post', 1);
+               //  reload the Addon Settings page, if we don't do it see Bug #42
+               goaway($a->get_baseurl().'/settings/connectors');
        } else {
                //  if no PIN is supplied in the POST variables, the user has changed the setting
                //  to post a tweet for every new __public__ posting to the wall
                set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
-                set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
+               set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
                set_pconfig(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
                set_pconfig(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
                set_pconfig(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
 
-                if (!intval($_POST['twitter-mirror']))
-                        del_pconfig(local_user(),'twitter','lastid');
+               if (!intval($_POST['twitter-mirror']))
+                       del_pconfig(local_user(),'twitter','lastid');
 
-                info(t('Twitter settings updated.') . EOL);
+               info(t('Twitter settings updated.') . EOL);
        }}
 }
 function twitter_settings(&$a,&$s) {
-        if(! local_user())
-                return;
-        $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
+       if(! local_user())
+               return;
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
        /***
         * 1) Check that we have global consumer key & secret
         * 2) If no OAuthtoken & stuff is present, generate button to get some
@@ -216,16 +235,16 @@ function twitter_settings(&$a,&$s) {
        $csecret = get_config('twitter', 'consumersecret' );
        $otoken  = get_pconfig(local_user(), 'twitter', 'oauthtoken'  );
        $osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
-        $enabled = get_pconfig(local_user(), 'twitter', 'post');
+       $enabled = get_pconfig(local_user(), 'twitter', 'post');
        $checked = (($enabled) ? ' checked="checked" ' : '');
-        $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
+       $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
        $defchecked = (($defenabled) ? ' checked="checked" ' : '');
-        $mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
-        $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-        $importenabled = get_pconfig(local_user(),'twitter','import');
-        $importchecked = (($importenabled) ? ' checked="checked" ' : '');
-        $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
-        $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
+       $mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
+       $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
+       $importenabled = get_pconfig(local_user(),'twitter','import');
+       $importchecked = (($importenabled) ? ' checked="checked" ' : '');
+       $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
+       $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
        $css = (($enabled) ? '' : '-disabled');
 
@@ -254,7 +273,7 @@ function twitter_settings(&$a,&$s) {
                         * which the user can request a PIN to connect the account to a
                         * account at Twitter.
                         */
-                       require_once('library/twitteroauth.php');
+                       require_once('library/twitteroauth.php');
                        $connection = new TwitterOAuth($ckey, $csecret);
                        $request_token = $connection->getRequestToken();
                        $token = $request_token['oauth_token'];
@@ -268,50 +287,50 @@ function twitter_settings(&$a,&$s) {
                        $s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
                        $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="'.$token.'" />';
                        $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />';
-            $s .= '</div><div class="clear"></div>';
-            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+           $s .= '</div><div class="clear"></div>';
+           $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
                } else {
                        /***
                         *  we have an OAuth key / secret pair for the user
                         *  so let's give a chance to disable the postings to Twitter
                         */
-                        require_once('library/twitteroauth.php');
+                       require_once('library/twitteroauth.php');
                        $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
                        $details = $connection->get('account/verify_credentials');
                        $s .= '<div id="twitter-info" ><img id="twitter-avatar" src="'.$details->profile_image_url.'" /><p id="twitter-info-block">'. t('Currently connected to: ') .'<a href="https://twitter.com/'.$details->screen_name.'" target="_twitter">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
                        $s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
-                        if ($a->user['hidewall']) {
-                            $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
-                        }
+                       if ($a->user['hidewall']) {
+                           $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
+                       }
                        $s .= '<div id="twitter-enable-wrapper">';
                        $s .= '<label id="twitter-enable-label" for="twitter-checkbox">'. t('Allow posting to Twitter'). '</label>';
                        $s .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
-                        $s .= '<div class="clear"></div>';
-                        $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
-                        $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
+                       $s .= '<div class="clear"></div>';
+                       $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
+                       $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
                        $s .= '<div class="clear"></div>';
 
-                        $s .= '<label id="twitter-mirror-label" for="twitter-mirror">'.t('Mirror all posts from twitter that are no replies').'</label>';
-                        $s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
+                       $s .= '<label id="twitter-mirror-label" for="twitter-mirror">'.t('Mirror all posts from twitter that are no replies').'</label>';
+                       $s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
                        $s .= '<div class="clear"></div>';
                        $s .= '</div>';
 
-                        $s .= '<label id="twitter-import-label" for="twitter-import">'.t('Import the remote timeline').'</label>';
-                        $s .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" '. $importchecked . '/>';
+                       $s .= '<label id="twitter-import-label" for="twitter-import">'.t('Import the remote timeline').'</label>';
+                       $s .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" '. $importchecked . '/>';
                        $s .= '<div class="clear"></div>';
 
-                        $s .= '<label id="twitter-create_user-label" for="twitter-create_user">'.t('Automatically create contacts').'</label>';
-                        $s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
+                       $s .= '<label id="twitter-create_user-label" for="twitter-create_user">'.t('Automatically create contacts').'</label>';
+                       $s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
                        $s .= '<div class="clear"></div>';
 
                        $s .= '<div id="twitter-disconnect-wrapper">';
-                        $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
-                        $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
+                       $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
+                       $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
                        $s .= '</div><div class="clear"></div>';
                        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
                }
        }
-        $s .= '</div><div class="clear"></div>';
+       $s .= '</div><div class="clear"></div>';
 }
 
 
@@ -329,12 +348,12 @@ function twitter_post_local(&$a,&$b) {
                if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'twitter','post_by_default')))
                        $twitter_enable = 1;
 
-        if(! $twitter_enable)
-            return;
+       if(! $twitter_enable)
+               return;
 
-        if(strlen($b['postopts']))
-            $b['postopts'] .= ',';
-        $b['postopts'] .= 'twitter';
+       if(strlen($b['postopts']))
+               $b['postopts'] .= ',';
+               $b['postopts'] .= 'twitter';
        }
 }
 
@@ -357,7 +376,7 @@ function twitter_action($a, $uid, $pid, $action) {
 
        switch ($action) {
                case "delete":
-                       $result = $cb->statuses_destroy($post);
+                       // To-Do: $result = $cb->statuses_destroy($post);
                        break;
                case "like":
                        $result = $cb->favorites_create($post);
@@ -385,29 +404,31 @@ function twitter_post_hook(&$a,&$b) {
        if($b['parent'] != $b['id']) {
                logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
 
-                // Looking if its a reply to a twitter post
+               // Looking if its a reply to a twitter post
                if ((substr($b["parent-uri"], 0, 9) != "twitter::") AND (substr($b["extid"], 0, 9) != "twitter::") AND (substr($b["thr-parent"], 0, 9) != "twitter::")) {
-                        logger("twitter_post_hook: no twitter post ".$b["parent"]);
-                        return;
+                       logger("twitter_post_hook: no twitter post ".$b["parent"]);
+                       return;
                }
 
-                $r = q("SELECT * FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
-                        dbesc($b["thr-parent"]),
-                        intval($b["uid"]));
+               $r = q("SELECT * FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
+                       dbesc($b["thr-parent"]),
+                       intval($b["uid"]));
 
-                if(!count($r)) {
-                        logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
-                        return;
-                } else {
-                        $iscomment = true;
-                        $orig_post = $r[0];
-                }
+               if(!count($r)) {
+                       logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
+                       return;
+               } else {
+                       $iscomment = true;
+                       $orig_post = $r[0];
+               }
 
-               $nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
-               $nickname = "@[url=".$orig_post["author-link"]."]".$nickname."[/url]";
 
-               logger("twitter_post_hook: comparing ".$nickname." with ".$b["body"], LOGGER_DEBUG);
-               if (strpos($b["body"], $nickname) === false)
+               $nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+               $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
+               $nicknameplain = "@".$nicknameplain;
+
+               logger("twitter_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
+               if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
                        $b["body"] = $nickname." ".$b["body"];
 
                logger("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DATA);
@@ -428,12 +449,15 @@ function twitter_post_hook(&$a,&$b) {
                else
                        twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "like");
                return;
-        }
+       }
 
        if($b['deleted'] || ($b['created'] !== $b['edited']))
-                return;
+               return;
 
        // if post comes from twitter don't send it back
+       if($b['extid'] == NETWORK_TWITTER)
+               return;
+
        if($b['app'] == "Twitter")
                return;
 
@@ -460,7 +484,7 @@ function twitter_post_hook(&$a,&$b) {
 
                $max_char = 140;
                require_once("include/plaintext.php");
-               $msgarr = plaintext($a, $b, $max_char, true);
+               $msgarr = plaintext($a, $b, $max_char, true, 8);
                $msg = $msgarr["text"];
 
                if (($msg == "") AND isset($msgarr["title"]))
@@ -468,23 +492,23 @@ function twitter_post_hook(&$a,&$b) {
 
                $image = "";
 
-               if (isset($msgarr["url"]))
+               if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
                        $msg .= "\n".$msgarr["url"];
-               elseif (isset($msgarr["image"]))
+               elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
                        $image = $msgarr["image"];
 
                // and now tweet it :-)
                if(strlen($msg) and ($image != "")) {
                        $img_str = fetch_url($image);
 
-                       $tempfile = tempnam(get_config("system","temppath"), "cache");
+                       $tempfile = tempnam(get_temppath(), "cache");
                        file_put_contents($tempfile, $img_str);
 
                        // Twitter had changed something so that the old library doesn't work anymore
                        // so we are using a new library for twitter
                        // To-Do:
                        // Switching completely to this library with all functions
-                       require_once("addon/twitter/codebird.php");
+                       require_once("addon/twitter/codebird.php");
 
                        $cb = \Codebird\Codebird::getInstance();
                        $cb->setConsumerKey($ckey, $csecret);
@@ -499,6 +523,10 @@ function twitter_post_hook(&$a,&$b) {
                        unlink($tempfile);
 
                        logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
+
+                       if ($result->source)
+                               set_config("twitter", "application_name", strip_tags($result->source));
+
                        if ($result->errors OR $result->error) {
                                logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
@@ -524,6 +552,10 @@ function twitter_post_hook(&$a,&$b) {
 
                        $result = $tweet->post($url, $post);
                        logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
+
+                       if ($result->source)
+                               set_config("twitter", "application_name", strip_tags($result->source));
+
                        if ($result->errors) {
                                logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
@@ -554,10 +586,10 @@ function twitter_post_hook(&$a,&$b) {
 function twitter_plugin_admin_post(&$a){
        $consumerkey    =       ((x($_POST,'consumerkey'))              ? notags(trim($_POST['consumerkey']))   : '');
        $consumersecret =       ((x($_POST,'consumersecret'))   ? notags(trim($_POST['consumersecret'])): '');
-        $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
+       $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
        set_config('twitter','consumerkey',$consumerkey);
        set_config('twitter','consumersecret',$consumersecret);
-       set_config('twitter','application_name',$applicationname);
+       //set_config('twitter','application_name',$applicationname);
        info( t('Settings updated.'). EOL );
 }
 function twitter_plugin_admin(&$a, &$o){
@@ -567,8 +599,8 @@ function twitter_plugin_admin(&$a, &$o){
                '$submit' => t('Save Settings'),
                                                                // name, label, value, help, [extra values]
                '$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),
-                '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), ''),
-                '$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','application_name'),t('set this to avoid mirroring postings from ~friendica back to ~friendica'))
+               '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), ''),
+               //'$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
        ));
 }
 
@@ -596,30 +628,43 @@ function twitter_cron($a,$b) {
                }
        }
 
+       $abandon_days = intval(get_config('system','account_abandon_days'));
+       if ($abandon_days < 1)
+               $abandon_days = 0;
+
+       $abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
 
        $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
        if(count($r)) {
                foreach($r as $rr) {
+                       if ($abandon_days != 0) {
+                               $user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+                               if (!count($user)) {
+                                       logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+                                       continue;
+                               }
+                       }
+
                        logger('twitter: importing timeline from user '.$rr['uid']);
                        twitter_fetchhometimeline($a, $rr["uid"]);
 
 /*
                        // To-Do
-                        // check for new contacts once a day
-                        $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
-                        if($last_contact_check)
-                                $next_contact_check = $last_contact_check + 86400;
-                        else
-                                $next_contact_check = 0;
-
-                        if($next_contact_check <= time()) {
-                                pumpio_getallusers($a, $rr["uid"]);
-                                set_pconfig($rr['uid'],'pumpio','contact_check',time());
-                        }
+                       // check for new contacts once a day
+                       $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+                       if($last_contact_check)
+                               $next_contact_check = $last_contact_check + 86400;
+                       else
+                               $next_contact_check = 0;
+
+                       if($next_contact_check <= time()) {
+                               pumpio_getallusers($a, $rr["uid"]);
+                               set_pconfig($rr['uid'],'pumpio','contact_check',time());
+                       }
 */
 
-                }
-        }
+               }
+       }
 
        logger('twitter: cron_end');
 
@@ -628,26 +673,110 @@ function twitter_cron($a,$b) {
 
 function twitter_expire($a,$b) {
 
-        $days = get_config('twitter', 'expire');
+       $days = get_config('twitter', 'expire');
 
-        if ($days == 0)
-                return;
+       if ($days == 0)
+               return;
 
        $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
 
-        require_once("include/items.php");
+       require_once("include/items.php");
+
+       logger('twitter_expire: expire_start');
+
+       $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
+       if(count($r)) {
+               foreach($r as $rr) {
+                       logger('twitter_expire: user '.$rr['uid']);
+                       item_expire($rr['uid'], $days, NETWORK_TWITTER, true);
+               }
+       }
+
+       logger('twitter_expire: expire_end');
+}
+
+function twitter_prepare_body(&$a,&$b) {
+       if ($b["item"]["network"] != NETWORK_TWITTER)
+               return;
+
+       if ($b["preview"]) {
+               $max_char = 140;
+               require_once("include/plaintext.php");
+               $item = $b["item"];
+               $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+
+               $r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
+                       dbesc($item["thr-parent"]),
+                       intval(local_user()));
 
-        logger('twitter_expire: expire_start');
+               if(count($r)) {
+                       $orig_post = $r[0];
 
-        $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
-        if(count($r)) {
-                foreach($r as $rr) {
-                        logger('twitter_expire: user '.$rr['uid']);
-                        item_expire($rr['uid'], $days, NETWORK_TWITTER, true);
-                }
-        }
+                       $nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+                       $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
+                       $nicknameplain = "@".$nicknameplain;
 
-        logger('twitter_expire: expire_end');
+                       if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
+                               $item["body"] = $nickname." ".$item["body"];
+               }
+
+
+               $msgarr = plaintext($a, $item, $max_char, true, 8);
+               $msg = $msgarr["text"];
+
+               if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
+                       $msg .= " ".$msgarr["url"];
+
+               if (isset($msgarr["image"]))
+                       $msg .= " ".$msgarr["image"];
+
+                $b['html'] = nl2br(htmlspecialchars($msg));
+       }
+}
+
+/**
+ * @brief Build the item array for the mirrored post
+ *
+ * @param object $a Application class
+ * @param integer $uid User id
+ * @param object $post Twitter object with the post
+ *
+ * @return array item data to be posted
+ */
+function twitter_do_mirrorpost($a, $uid, $post) {
+       $datarray["type"] = "wall";
+       $datarray["api_source"] = true;
+       $datarray["profile_uid"] = $uid;
+       $datarray["extid"] = NETWORK_TWITTER;
+       $datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
+       $datarray["title"] = "";
+
+       if (is_object($post->retweeted_status)) {
+               // We don't support nested shares, so we mustn't show quotes as shares on retweets
+               $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, true);
+
+               $datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "",
+                                       $item['created'], $item['plink']);
+
+               $datarray['body'] .= $item['body'].'[/share]';
+       } else {
+               $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
+
+               $datarray['body'] = $item['body'];
+       }
+
+       $datarray["source"] = $item['app'];
+       $datarray["verb"] = $item['verb'];
+
+       if (isset($item["location"])) {
+               $datarray["location"] = $item["location"];
+       }
+
+       if (isset($item["coord"])) {
+               $datarray["coord"] = $item["coord"];
+       }
+
+       return $datarray;
 }
 
 function twitter_fetchtimeline($a, $uid) {
@@ -666,11 +795,12 @@ function twitter_fetchtimeline($a, $uid) {
 
        require_once('mod/item.php');
        require_once('include/items.php');
+       require_once('mod/share.php');
 
        require_once('library/twitteroauth.php');
        $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
 
-       $parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true);
+       $parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
 
        $first_time = ($lastid == "");
 
@@ -684,91 +814,28 @@ function twitter_fetchtimeline($a, $uid) {
 
        $posts = array_reverse($items);
 
-        if (count($posts)) {
+       if (count($posts)) {
            foreach ($posts as $post) {
-               if ($post->id_str > $lastid)
+               if ($post->id_str > $lastid) {
                        $lastid = $post->id_str;
+                       set_pconfig($uid, 'twitter', 'lastid', $lastid);
+               }
 
                if ($first_time)
                        continue;
 
-               if (!strpos($post->source, $application_name)) {
+               if (!stristr($post->source, $application_name)) {
+
                        $_SESSION["authenticated"] = true;
                        $_SESSION["uid"] = $uid;
 
-                       unset($_REQUEST);
-                       $_REQUEST["type"] = "wall";
-                       $_REQUEST["api_source"] = true;
-                       $_REQUEST["profile_uid"] = $uid;
-                       $_REQUEST["source"] = "Twitter";
-
-                       //$_REQUEST["date"] = $post->created_at;
-
-                       $_REQUEST["title"] = "";
-
-                       if (is_object($post->retweeted_status)) {
-
-                               $_REQUEST['body'] = $post->retweeted_status->text;
-
-                               // media
-                               if (is_array($post->retweeted_status->entities->media)) {
-                                       foreach($post->retweeted_status->entities->media AS $media) {
-                                               switch($media->type) {
-                                                       case 'photo':
-                                                               $_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
-                                                               $has_picture = true;
-                                                               break;
-                                               }
-                                       }
-                               }
-
-                               $converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $has_picture);
-                               $_REQUEST['body'] = $converted["body"];
-
-                               $_REQUEST['body'] = "[share author='".$post->retweeted_status->user->name.
-                                       "' profile='https://twitter.com/".$post->retweeted_status->user->screen_name.
-                                       "' avatar='".$post->retweeted_status->user->profile_image_url_https.
-                                       "' link='https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str."']".
-                                       $_REQUEST['body'];
-                               $_REQUEST['body'] .= "[/share]";
-                       } else {
-                               $_REQUEST["body"] = $post->text;
-
-                               if (is_array($post->entities->media)) {
-                                       foreach($post->entities->media AS $media) {
-                                               switch($media->type) {
-                                                       case 'photo':
-                                                               $_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
-                                                               $has_picture = true;
-                                                               break;
-                                               }
-                                       }
-                               }
-
-                               $converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $has_picture);
-                               $_REQUEST['body'] = $converted["body"];
-                       }
-
-                       if (is_string($post->place->name))
-                               $_REQUEST["location"] = $post->place->name;
-
-                       if (is_string($post->place->full_name))
-                               $_REQUEST["location"] = $post->place->full_name;
-
-                       if (is_array($post->geo->coordinates))
-                               $_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+                       $_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
 
-                       if (is_array($post->coordinates->coordinates))
-                               $_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
-
-                       //print_r($_REQUEST);
                        logger('twitter: posting for user '.$uid);
 
-//                     require_once('mod/item.php');
-
                        item_post($a);
-                }
-            }
+               }
+           }
        }
        set_pconfig($uid, 'twitter', 'lastid', $lastid);
 }
@@ -838,25 +905,55 @@ function twitter_queue_hook(&$a,&$b) {
        }
 }
 
+function twitter_fix_avatar($avatar) {
+       require_once("include/Photo.php");
+
+       $new_avatar = str_replace("_normal.", ".", $avatar);
+
+       $info = get_photo_info($new_avatar);
+       if (!$info)
+               $new_avatar = $avatar;
+
+       return $new_avatar;
+}
+
 function twitter_fetch_contact($uid, $contact, $create_user) {
 
-       // Check if the unique contact is existing
-       // To-Do: only update once a while
-        $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+       if ($contact->id_str == "")
+               return(-1);
 
-       if (count($r) == 0)
-               q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
-                       dbesc($contact->name),
-                       dbesc($contact->screen_name),
-                       dbesc($contact->profile_image_url_https));
-       else
-               q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-                       dbesc($contact->name),
-                       dbesc($contact->screen_name),
-                       dbesc($contact->profile_image_url_https),
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+       $avatar = twitter_fix_avatar($contact->profile_image_url_https);
+
+       if (function_exists("update_gcontact"))
+               update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
+                               "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
+                               "name" => $contact->name, "nick" => $contact->screen_name,
+                               "location" => $contact->location, "about" => $contact->description,
+                               "addr" => $contact->screen_name."@twitter.com", "generation" => 2));
+       else {
+               // Old Code
+               $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+
+               if (count($r) == 0)
+                       q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
+                               dbesc($contact->name),
+                               dbesc($contact->screen_name),
+                               dbesc($avatar));
+               else
+                       q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
+                               dbesc($contact->name),
+                               dbesc($contact->screen_name),
+                               dbesc($avatar),
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+
+               if (DB_UPDATE_VERSION >= "1177")
+                       q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
+                               dbesc($contact->location),
+                               dbesc($contact->description),
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+       }
 
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
                intval($uid), dbesc("twitter::".$contact->id_str));
@@ -874,7 +971,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
                q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
                                        `name`, `nick`, `photo`, `network`, `rel`, `priority`,
                                        `writable`, `blocked`, `readonly`, `pending` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0) ",
                        intval($uid),
                        dbesc(datetime_convert()),
                        dbesc("https://twitter.com/".$contact->screen_name),
@@ -885,7 +982,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
                        dbesc("twitter::".$contact->id_str),
                        dbesc($contact->name),
                        dbesc($contact->screen_name),
-                       dbesc($contact->profile_image_url_https),
+                       dbesc($avatar),
                        dbesc(NETWORK_TWITTER),
                        intval(CONTACT_IS_FRIEND),
                        intval(1),
@@ -913,7 +1010,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                require_once("Photo.php");
 
-               $photos = import_profile_photo($contact->profile_image_url_https,$uid,$contact_id);
+               $photos = import_profile_photo($avatar,$uid,$contact_id);
 
                q("UPDATE `contact` SET `photo` = '%s',
                                        `thumb` = '%s',
@@ -931,6 +1028,15 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
                        intval($contact_id)
                );
 
+               if (DB_UPDATE_VERSION >= "1177")
+                       q("UPDATE `contact` SET `location` = '%s',
+                                               `about` = '%s'
+                                       WHERE `id` = %d",
+                               dbesc($contact->location),
+                               dbesc($contact->description),
+                               intval($contact_id)
+                       );
+
        } else {
                // update profile photos once every two weeks as we have no notification of when they change.
 
@@ -945,7 +1051,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                        require_once("Photo.php");
 
-                       $photos = import_profile_photo($contact->profile_image_url_https, $uid, $r[0]['id']);
+                       $photos = import_profile_photo($avatar, $uid, $r[0]['id']);
 
                        q("UPDATE `contact` SET `photo` = '%s',
                                                `thumb` = '%s',
@@ -972,6 +1078,15 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
                                dbesc($contact->screen_name),
                                intval($r[0]['id'])
                        );
+
+                       if (DB_UPDATE_VERSION >= "1177")
+                               q("UPDATE `contact` SET `location` = '%s',
+                                                       `about` = '%s'
+                                               WHERE `id` = %d",
+                                       dbesc($contact->location),
+                                       dbesc($contact->description),
+                                       intval($r[0]['id'])
+                               );
                }
        }
 
@@ -1017,12 +1132,14 @@ function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
        return $contact_id;
 }
 
-function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontincludemedia) {
+function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
        require_once("include/oembed.php");
        require_once("include/network.php");
 
        $tags = "";
 
+       $plain = $body;
+
        if (isset($item->entities->urls)) {
                $type = "";
                $footerurl = "";
@@ -1030,6 +1147,9 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                $footer = "";
 
                foreach ($item->entities->urls AS $url) {
+
+                       $plain = str_replace($url->url, '', $plain);
+
                        if ($url->url AND $url->expanded_url AND $url->display_url) {
 
                                $expanded_url = original_url($url->expanded_url);
@@ -1052,11 +1172,12 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                                        $footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
 
                                        $body = str_replace($url->url, $footerlink, $body);
-                               } elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
+                               //} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
+                               } elseif (($oembed_data->type == "photo") AND isset($oembed_data->url)) {
                                        $body = str_replace($url->url,
                                                        "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
                                                        $body);
-                                       $dontincludemedia = true;
+                                       //$dontincludemedia = true;
                                } elseif ($oembed_data->type != "link")
                                        $body = str_replace($url->url,
                                                        "[url=".$expanded_url."]".$expanded_url."[/url]",
@@ -1064,7 +1185,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                                else {
                                        $img_str = fetch_url($expanded_url, true, $redirects, 4);
 
-                                       $tempfile = tempnam(get_config("system","temppath"), "cache");
+                                       $tempfile = tempnam(get_temppath(), "cache");
                                        file_put_contents($tempfile, $img_str);
                                        $mime = image_type_to_mime_type(exif_imagetype($tempfile));
                                        unlink($tempfile);
@@ -1072,7 +1193,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                                        if (substr($mime, 0, 6) == "image/") {
                                                $type = "photo";
                                                $body = str_replace($url->url, "[img]".$expanded_url."[/img]", $body);
-                                               $dontincludemedia = true;
+                                               //$dontincludemedia = true;
                                        } else {
                                                $type = $oembed_data->type;
                                                $footerurl = $expanded_url;
@@ -1085,19 +1206,24 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                }
 
                if ($footerurl != "")
-                       $footer = add_page_info($footerurl);
+                       $footer = add_page_info($footerurl, false, $picture);
 
                if (($footerlink != "") AND (trim($footer) != "")) {
                        $removedlink = trim(str_replace($footerlink, "", $body));
 
-                       if (strstr($body, $removedlink))
+                       if (($removedlink == "") OR strstr($body, $removedlink))
                                $body = $removedlink;
 
                        $body .= $footer;
                }
 
+               if (($footer == "") AND ($picture != ""))
+                       $body .= "\n\n[img]".$picture."[/img]\n";
+               elseif (($footer == "") AND ($picture == ""))
+                       $body = add_page_info_to_body($body);
+
                if ($no_tags)
-                       return(array("body" => $body, "tags" => ""));
+                       return array("body" => $body, "tags" => "", "plain" => $plain);
 
                $tags_arr = array();
 
@@ -1114,16 +1240,16 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                }
 
                // it seems as if the entities aren't always covering all mentions. So the rest will be checked here
-               $tags = get_tags($body);
+               $tags = get_tags($body);
 
-               if(count($tags)) {
+               if(count($tags)) {
                        foreach($tags as $tag) {
                                if (strstr(trim($tag), " "))
                                        continue;
 
-                               if(strpos($tag,'#') === 0) {
-                                       if(strpos($tag,'[url='))
-                                               continue;
+                               if(strpos($tag,'#') === 0) {
+                                       if(strpos($tag,'[url='))
+                                               continue;
 
                                        // don't link tags that are already embedded in links
 
@@ -1138,8 +1264,8 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                                        $tags_arr["#".$basetag] = $url;
                                        continue;
                                } elseif(strpos($tag,'@') === 0) {
-                                       if(strpos($tag,'[url='))
-                                               continue;
+                                       if(strpos($tag,'[url='))
+                                               continue;
 
                                        $basetag = substr($tag,1);
                                        $url = '@[url=https://twitter.com/'.rawurlencode($basetag).']'.$basetag.'[/url]';
@@ -1153,12 +1279,74 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud
                $tags = implode($tags_arr, ",");
 
        }
-       return(array("body" => $body, "tags" => $tags));
+       return array("body" => $body, "tags" => $tags, "plain" => $plain);
 }
 
-function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) {
+/**
+ * @brief Fetch media entities and add media links to the body
+ *
+ * @param object $post Twitter object with the post
+ * @param array $postarray Array of the item that is about to be posted
+ *
+ * @return $picture string Returns a a single picture string if it isn't a media post
+ */
+function twitter_media_entities($post, &$postarray) {
+
+       // There are no media entities? So we quit.
+       if (!is_array($post->extended_entities->media)) {
+               return "";
+       }
 
-       $has_picture = false;
+       // When the post links to an external page, we only take one picture.
+       // We only do this when there is exactly one media.
+       if ((count($post->entities->urls) > 0) AND (count($post->extended_entities->media) == 1)) {
+               $picture = "";
+               foreach($post->extended_entities->media AS $medium) {
+                       if (isset($medium->media_url_https)) {
+                               $picture = $medium->media_url_https;
+                               $postarray['body'] = str_replace($medium->url, "", $postarray['body']);
+                       }
+               }
+               return $picture;
+       }
+
+       // This is a pure media post, first search for all media urls
+       $media = array();
+       foreach($post->extended_entities->media AS $medium) {
+               switch($medium->type) {
+                       case 'photo':
+                               $media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
+                               $postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
+                               break;
+                       case 'video':
+                       case 'animated_gif':
+                               $media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
+                               $postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
+                               if (is_array($medium->video_info->variants)) {
+                                       $bitrate = 0;
+                                       // We take the video with the highest bitrate
+                                       foreach ($medium->video_info->variants AS $variant) {
+                                               if (($variant->content_type == "video/mp4") AND ($variant->bitrate >= $bitrate)) {
+                                                       $media[$medium->url] = "\n[video]".$variant->url."[/video]";
+                                                       $bitrate = $variant->bitrate;
+                                               }
+                                       }
+                               }
+                               break;
+                       // The following code will only be activated for test reasons
+                       //default:
+                       //      $postarray['body'] .= print_r($medium, true);
+               }
+       }
+
+       // Now we replace the media urls.
+       foreach ($media AS $key => $value) {
+               $postarray['body'] = str_replace($key, "\n".$value."\n", $postarray['body']);
+       }
+       return "";
+}
+
+function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) {
 
        $postarray = array();
        $postarray['network'] = NETWORK_TWITTER;
@@ -1166,14 +1354,17 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
        $postarray['uid'] = $uid;
        $postarray['wall'] = 0;
        $postarray['uri'] = "twitter::".$post->id_str;
+       $postarray['object'] = json_encode($post);
 
+       // Don't import our own comments
        $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($postarray['uri']),
                        intval($uid)
                );
 
-       if (count($r))
+       if (count($r)) {
                return(array());
+       }
 
        $contactid = 0;
 
@@ -1188,6 +1379,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                if (count($r)) {
                        $postarray['thr-parent'] = $r[0]["uri"];
                        $postarray['parent-uri'] = $r[0]["parent-uri"];
+                       $postarray['parent'] = $r[0]["parent"];
+                       $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
                } else {
                        $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
                                        dbesc($parent),
@@ -1196,9 +1389,12 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                        if (count($r)) {
                                $postarray['thr-parent'] = $r[0]['uri'];
                                $postarray['parent-uri'] = $r[0]['parent-uri'];
+                               $postarray['parent'] = $r[0]['parent'];
+                               $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
                        } else {
                                $postarray['thr-parent'] = $postarray['uri'];
                                $postarray['parent-uri'] = $postarray['uri'];
+                               $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
                        }
                }
 
@@ -1215,24 +1411,30 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                                $postarray['owner-name'] =  $r[0]["name"];
                                $postarray['owner-link'] = $r[0]["url"];
                                $postarray['owner-avatar'] =  $r[0]["photo"];
-                       } else
+                       } else {
                                return(array());
+                       }
                }
-       } else
+               // Don't create accounts of people who just comment something
+               $create_user = false;
+       } else {
                $postarray['parent-uri'] = $postarray['uri'];
+               $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+       }
 
        if ($contactid == 0) {
                $contactid = twitter_fetch_contact($uid, $post->user, $create_user);
 
                $postarray['owner-name'] = $post->user->name;
                $postarray['owner-link'] = "https://twitter.com/".$post->user->screen_name;
-               $postarray['owner-avatar'] = $post->user->profile_image_url_https;
+               $postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
        }
 
-       if(($contactid == 0) AND !$only_existing_contact)
+       if(($contactid == 0) AND !$only_existing_contact) {
                $contactid = $self['id'];
-       elseif ($contactid <= 0)
+       } elseif ($contactid <= 0) {
                return(array());
+       }
 
        $postarray['contact-id'] = $contactid;
 
@@ -1248,90 +1450,72 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $postarray['allow_cid'] = '<' . $self['id'] . '>';
        }
 
-       $postarray['body'] = $post->text;
-
-       // media
-       if (is_array($post->entities->media)) {
-               foreach($post->entities->media AS $media) {
-                       switch($media->type) {
-                               case 'photo':
-                                       $postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
-                                       $has_picture = true;
-                                       break;
-                               default:
-                                       $postarray['body'] .= print_r($media, true);
-                       }
-               }
+       if (is_string($post->full_text)) {
+               $postarray['body'] = $post->full_text;
+       } else {
+               $postarray['body'] = $post->text;
+       }
+
+       // When the post contains links then use the correct object type
+       if (count($post->entities->urls) > 0) {
+               $postarray['object-type'] = ACTIVITY_OBJ_BOOKMARK;
        }
 
-       $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $has_picture);
+       // Search for media links
+       $picture = twitter_media_entities($post, $postarray);
+
+       $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
        $postarray['body'] = $converted["body"];
        $postarray['tag'] = $converted["tags"];
-
        $postarray['created'] = datetime_convert('UTC','UTC',$post->created_at);
        $postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at);
 
-       if (is_string($post->place->name))
-               $postarray["location"] = $post->place->name;
+       $statustext = $converted["plain"];
 
-       if (is_string($post->place->full_name))
+       if (is_string($post->place->name)) {
+               $postarray["location"] = $post->place->name;
+       }
+       if (is_string($post->place->full_name)) {
                $postarray["location"] = $post->place->full_name;
-
-       if (is_array($post->geo->coordinates))
+       }
+       if (is_array($post->geo->coordinates)) {
                $postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
-
-       if (is_array($post->coordinates->coordinates))
+       }
+       if (is_array($post->coordinates->coordinates)) {
                $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
-
+       }
        if (is_object($post->retweeted_status)) {
+               $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
 
-               $postarray['body'] = $post->retweeted_status->text;
-
-               // media
-               if (is_array($post->retweeted_status->entities->media)) {
-                       foreach($post->retweeted_status->entities->media AS $media) {
-                               switch($media->type) {
-                                       case 'photo':
-                                               $postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
-                                               $has_picture = true;
-                                               break;
-                                       default:
-                                               $postarray['body'] .= print_r($media, true);
-                               }
-                       }
-               }
+               $retweet['object'] = $postarray['object'];
+               $retweet['private'] = $postarray['private'];
+               $retweet['allow_cid'] = $postarray['allow_cid'];
+               $retweet['contact-id'] = $postarray['contact-id'];
+               $retweet['owner-name'] = $postarray['owner-name'];
+               $retweet['owner-link'] = $postarray['owner-link'];
+               $retweet['owner-avatar'] = $postarray['owner-avatar'];
+
+               $postarray = $retweet;
+       }
 
-               $converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $has_picture);
-               $postarray['body'] = $converted["body"];
-               $postarray['tag'] = $converted["tags"];
+       if (is_object($post->quoted_status) AND !$noquote) {
+               $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
 
-               twitter_fetch_contact($uid, $post->retweeted_status->user, false);
+               $postarray['body'] = $statustext;
 
-               // Deactivated at the moment, since there are problems with answers to retweets
-               if (false AND !intval(get_config('system','wall-to-wall_share'))) {
-                       $postarray['body'] = "[share author='".$post->retweeted_status->user->name.
-                               "' profile='https://twitter.com/".$post->retweeted_status->user->screen_name.
-                               "' avatar='".$post->retweeted_status->user->profile_image_url_https.
-                               "' link='https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str."']".
-                               $postarray['body'];
-                       $postarray['body'] .= "[/share]";
-               } else {
-                       // Let retweets look like wall-to-wall posts
-                       $postarray['author-name'] = $post->retweeted_status->user->name;
-                       $postarray['author-link'] = "https://twitter.com/".$post->retweeted_status->user->screen_name;
-                       $postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url_https;
-                       //if (($post->retweeted_status->user->screen_name != "") AND ($post->retweeted_status->id_str != "")) {
-                       //      $postarray['plink'] = "https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str;
-                       //      $postarray['uri'] = "twitter::".$post->retweeted_status->id_str;
-                       //}
-               }
+               $postarray['body'] .= "\n".share_header($quoted['author-name'], $quoted['author-link'], $quoted['author-avatar'], "",
+                                                       $quoted['created'], $quoted['plink']);
 
+               $postarray['body'] .= $quoted['body'].'[/share]';
        }
+
        return($postarray);
 }
 
 function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
 
+       // this whole function doesn't seem to work. Needs complete check
+
        $user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
                        intval($uid)
                );
@@ -1380,7 +1564,7 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
                                'to_email'     => $user[0]['email'],
                                'uid'          => $user[0]['uid'],
                                'item'         => $postarray,
-                               'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
+                               'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
                                'source_name'  => $postarray['author-name'],
                                'source_link'  => $postarray['author-link'],
                                'source_photo' => $postarray['author-avatar'],
@@ -1395,15 +1579,69 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
        }
 }
 
+function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) {
+       logger("twitter_fetchparentposts: Fetching for user ".$uid." and post ".$post->id_str, LOGGER_DEBUG);
+
+       $posts = array();
+
+       while ($post->in_reply_to_status_id_str != "") {
+               $parameters = array("trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str);
+
+               $post = $connection->get('statuses/show', $parameters);
+
+               if (!count($post)) {
+                       logger("twitter_fetchparentposts: Can't fetch post ".$parameters->id, LOGGER_DEBUG);
+                       break;
+               }
+
+               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                               dbesc("twitter::".$post->id_str),
+                               intval($uid)
+                       );
+
+               if (count($r))
+                       break;
+
+               $posts[] = $post;
+       }
+
+       logger("twitter_fetchparentposts: Fetching ".count($posts)." parents", LOGGER_DEBUG);
+
+       $posts = array_reverse($posts);
+
+       if (count($posts)) {
+               foreach ($posts as $post) {
+                       $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
+
+                       if (trim($postarray['body']) == "")
+                               continue;
+
+                       $item = item_store($postarray);
+                       $postarray["id"] = $item;
+
+                       logger('twitter_fetchparentpost: User '.$self["nick"].' posted parent timeline item '.$item);
+
+                       if ($item AND !function_exists("check_item_notification"))
+                               twitter_checknotification($a, $uid, $own_id, $item, $postarray);
+               }
+       }
+}
+
 function twitter_fetchhometimeline($a, $uid) {
        $ckey    = get_config('twitter', 'consumerkey');
        $csecret = get_config('twitter', 'consumersecret');
        $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
        $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
        $create_user = get_pconfig($uid, 'twitter', 'create_user');
+       $mirror_posts = get_pconfig($uid, 'twitter', 'mirror_posts');
 
        logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
 
+       $application_name  = get_config('twitter', 'application_name');
+
+       if ($application_name == "")
+               $application_name = $a->get_hostname();
+
        require_once('library/twitteroauth.php');
        require_once('include/items.php');
 
@@ -1439,7 +1677,7 @@ function twitter_fetchhometimeline($a, $uid) {
                return;
        }
 
-       $parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true);
+       $parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
        //$parameters["count"] = 200;
 
 
@@ -1458,28 +1696,44 @@ function twitter_fetchhometimeline($a, $uid) {
                return;
        }
 
-        $posts = array_reverse($items);
+       $posts = array_reverse($items);
 
        logger("twitter_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
 
        if (count($posts)) {
                foreach ($posts as $post) {
-                       if ($post->id_str > $lastid)
+                       if ($post->id_str > $lastid) {
                                $lastid = $post->id_str;
+                               set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+                       }
 
                        if ($first_time)
                                continue;
 
-                       $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true);
+                       if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
+                               logger("twitter_fetchhometimeline: Skip previously sended post", LOGGER_DEBUG);
+                               continue;
+                       }
+
+                       if ($mirror_posts && $post->user->screen_name == $own_id && $post->in_reply_to_status_id_str == "") {
+                               logger("twitter_fetchhometimeline: Skip post that will be mirrored", LOGGER_DEBUG);
+                               continue;
+                       }
+
+                       if ($post->in_reply_to_status_id_str != "")
+                               twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
+
+                       $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
 
                        if (trim($postarray['body']) == "")
                                continue;
 
                        $item = item_store($postarray);
+                       $postarray["id"] = $item;
 
                        logger('twitter_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
 
-                       if ($item != 0)
+                       if ($item AND !function_exists("check_item_notification"))
                                twitter_checknotification($a, $uid, $own_id, $item, $postarray);
 
                }
@@ -1501,7 +1755,7 @@ function twitter_fetchhometimeline($a, $uid) {
                return;
        }
 
-        $posts = array_reverse($items);
+       $posts = array_reverse($items);
 
        logger("twitter_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
 
@@ -1513,12 +1767,22 @@ function twitter_fetchhometimeline($a, $uid) {
                        if ($first_time)
                                continue;
 
-                       $postarray = twitter_createpost($a, $uid, $post, $self, false, false);
+                       if ($post->in_reply_to_status_id_str != "")
+                               twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
+
+                       $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
 
                        if (trim($postarray['body']) == "")
                                continue;
 
                        $item = item_store($postarray);
+                       $postarray["id"] = $item;
+
+                       if ($item AND function_exists("check_item_notification"))
+                               check_item_notification($item, $uid, NOTIFY_TAGSELF);
+
+                       if (!isset($postarray["parent"]) OR ($postarray["parent"] == 0))
+                               $postarray["parent"] = $item;
 
                        logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
 
@@ -1527,27 +1791,31 @@ function twitter_fetchhometimeline($a, $uid) {
                                        dbesc($postarray['uri']),
                                        intval($uid)
                                );
-                               if (count($r))
+                               if (count($r)) {
                                        $item = $r[0]['id'];
-                       }
+                                       $parent_id = $r[0]['parent'];
+                               }
+                       } else
+                               $parent_id = $postarray['parent'];
 
-                       if ($item != 0) {
+                       if (($item != 0) AND !function_exists("check_item_notification")) {
                                require_once('include/enotify.php');
                                notification(array(
                                        'type'         => NOTIFY_TAGSELF,
-                                       'notify_flags' => $u[0]['notify-flags'],
-                                       'language'     => $u[0]['language'],
-                                       'to_name'      => $u[0]['username'],
-                                       'to_email'     => $u[0]['email'],
-                                       'uid'          => $u[0]['uid'],
-                                       'item'         => $postarray,
-                                       'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item,
-                                       'source_name'  => $postarray['author-name'],
-                                       'source_link'  => $postarray['author-link'],
+                                       'notify_flags' => $u[0]['notify-flags'],
+                                       'language'     => $u[0]['language'],
+                                       'to_name'      => $u[0]['username'],
+                                       'to_email'     => $u[0]['email'],
+                                       'uid'          => $u[0]['uid'],
+                                       'item'         => $postarray,
+                                       'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+                                       'source_name'  => $postarray['author-name'],
+                                       'source_link'  => $postarray['author-link'],
                                        'source_photo' => $postarray['author-avatar'],
-                                       'verb'         => ACTIVITY_TAG,
-                                       'otype'        => 'item'
-                               ));
+                                       'verb'         => ACTIVITY_TAG,
+                                       'otype'        => 'item',
+                                       'parent'       => $parent_id
+                               ));
                        }
                }
        }
@@ -1578,8 +1846,8 @@ function twitter_fetch_own_contact($a, $uid) {
                $contact_id = twitter_fetch_contact($uid, $user, true);
 
        } else {
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-                       intval($uid), dbesc("twitter::".$own_id));
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+                       intval($uid), dbesc("twitter::".$own_id));
                if(count($r))
                        $contact_id = $r[0]["id"];
                else
@@ -1636,5 +1904,4 @@ function twitter_is_retweet($a, $uid, $body) {
 
        return(!isset($result->errors));
 }
-
 ?>