X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=e0148a11c87c5ba19a8f2a76f11d314122a4059e;hb=91e2563cd1aaa6a4ec9513b2bc6589ff360df10d;hp=7c1674590f64cb880fd65f4a139e2a34fad379bc;hpb=ca9bd8b877d8ed2306bef76c93bcc6eb77ed1fd1;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 7c167459..e0148a11 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -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);
@@ -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);
@@ -436,6 +455,9 @@ function twitter_post_hook(&$a,&$b) {
 		return;
 
 	// if post comes from twitter don't send it back
+	if($b['extid'] == NETWORK_TWITTER)
+		return;
+
 	if($b['app'] == "Twitter")
 		return;
 
@@ -462,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"]))
@@ -470,16 +492,16 @@ 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
@@ -501,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) . '"');
 
@@ -526,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) . '"');
 
@@ -559,7 +589,7 @@ function twitter_plugin_admin_post(&$a){
 	$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){
@@ -570,7 +600,7 @@ function twitter_plugin_admin(&$a, &$o){
 								// 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'))
+		//'$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'))
 	));
 }
 
@@ -598,10 +628,23 @@ 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"]);
 
@@ -652,6 +695,45 @@ function twitter_expire($a,$b) {
 	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()));
+
+		if(count($r)) {
+			$orig_post = $r[0];
+
+			$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+			$nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
+			$nicknameplain = "@".$nicknameplain;
+
+			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));
+	}
+}
+
 function twitter_fetchtimeline($a, $uid) {
 	$ckey    = get_config('twitter', 'consumerkey');
 	$csecret = get_config('twitter', 'consumersecret');
@@ -668,6 +750,7 @@ 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);
@@ -688,13 +771,15 @@ function twitter_fetchtimeline($a, $uid) {
 
 	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;
 
@@ -702,7 +787,13 @@ function twitter_fetchtimeline($a, $uid) {
 			$_REQUEST["type"] = "wall";
 			$_REQUEST["api_source"] = true;
 			$_REQUEST["profile_uid"] = $uid;
-			$_REQUEST["source"] = "Twitter";
+			//$_REQUEST["source"] = "Twitter";
+			$_REQUEST["source"] = $post->source;
+			$_REQUEST["extid"] = NETWORK_TWITTER;
+
+			if (isset($post->id)) {
+				$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
+			}
 
 			//$_REQUEST["date"] = $post->created_at;
 
@@ -712,42 +803,59 @@ function twitter_fetchtimeline($a, $uid) {
 
 				$_REQUEST['body'] = $post->retweeted_status->text;
 
+				$picture = "";
+
 				// 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;
+								//$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
+								//$has_picture = true;
+								$_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
+								$picture = $media->media_url_https;
 								break;
 						}
 					}
 				}
 
-				$converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $has_picture);
+				$converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $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'];
+				if (function_exists("share_header"))
+					$_REQUEST['body'] = share_header($post->retweeted_status->user->name, "https://twitter.com/".$post->retweeted_status->user->screen_name,
+									$post->retweeted_status->user->profile_image_url_https, "",
+									datetime_convert('UTC','UTC',$post->retweeted_status->created_at),
+									"https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str).
+								$_REQUEST['body'];
+				else
+					$_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.
+						"' posted='".datetime_convert('UTC','UTC',$post->retweeted_status->created_at).
+						"' 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;
 
+				$picture = "";
+
 				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;
+								//$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
+								//$has_picture = true;
+								$_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
+								$picture = $media->media_url_https;
 								break;
 						}
 					}
 				}
 
-				$converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $has_picture);
+				$converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $picture);
 				$_REQUEST['body'] = $converted["body"];
 			}
 
@@ -840,25 +948,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));
@@ -876,7 +1014,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),
@@ -887,7 +1025,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),
@@ -915,7 +1053,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',
@@ -933,6 +1071,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.
 
@@ -947,7 +1094,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',
@@ -974,6 +1121,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'])
+				);
 		}
 	}
 
@@ -1019,12 +1175,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 = "";
@@ -1032,6 +1190,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);
@@ -1054,11 +1215,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]",
@@ -1066,7 +1228,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);
@@ -1074,7 +1236,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;
@@ -1087,19 +1249,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();
 
@@ -1155,7 +1322,7 @@ 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) {
@@ -1168,14 +1335,16 @@ 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);
 
 	$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;
 
@@ -1190,6 +1359,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),
@@ -1198,9 +1369,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;
 			}
 		}
 
@@ -1217,24 +1391,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;
 
@@ -1250,15 +1430,24 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		$postarray['allow_cid'] = '<' . $self['id'] . '>';
 	}
 
-	$postarray['body'] = $post->text;
+	if (is_string($post->full_text)) {
+		$postarray['body'] = $post->full_text;
+	} else {
+		$postarray['body'] = $post->text;
+	}
+
+	$picture = "";
 
 	// 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;
+					//$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+					//$has_picture = true;
+					$postarray['body'] = str_replace($media->url, "", $postarray['body']);
+					$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
+					$picture = $media->media_url_https;
 					break;
 				default:
 					$postarray['body'] .= print_r($media, true);
@@ -1266,74 +1455,55 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		}
 	}
 
-	$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $has_picture);
+	$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);
 
-		$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['contact-id'] = $postarray['contact-id'];
+		$retweet['owner-name'] = $postarray['owner-name'];
+		$retweet['owner-link'] = $postarray['owner-link'];
+		$retweet['owner-avatar'] = $postarray['owner-avatar'];
 
-		$converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $has_picture);
-		$postarray['body'] = $converted["body"];
-		$postarray['tag'] = $converted["tags"];
+		$postarray = $retweet;
+	}
 
-		twitter_fetch_contact($uid, $post->retweeted_status->user, false);
+	if (is_object($post->quoted_status)) {
+		$quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false);
 
-		// 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'] = $statustext;
+
+		$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)
 		);
@@ -1382,7 +1552,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'],
@@ -1397,15 +1567,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, "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);
+
+			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');
 
@@ -1441,7 +1665,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;
 
 
@@ -1466,22 +1690,38 @@ function twitter_fetchhometimeline($a, $uid) {
 
 	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;
 
+			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);
 
 			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);
 
 		}
@@ -1515,12 +1755,22 @@ function twitter_fetchhometimeline($a, $uid) {
 			if ($first_time)
 				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, 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);
 
@@ -1529,11 +1779,14 @@ 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,
@@ -1543,12 +1796,13 @@ function twitter_fetchhometimeline($a, $uid) {
 					'to_email'     => $u[0]['email'],
 					'uid'          => $u[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item,
+					'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'
+					'otype'        => 'item',
+					'parent'       => $parent_id
 				));
 			}
 		}