diff --git a/twitter/twitter.css b/twitter/twitter.css
index 3ff37cda..99ee0bef 100755
--- a/twitter/twitter.css
+++ b/twitter/twitter.css
@@ -24,6 +24,8 @@
 #twitter-enable-label,
 #twitter-shortening-label, 
 #twitter-mirror-label,
+#twitter-import-label,
+#twitter-create_user-label,
 #twitter-pin-label {
         float: left;
         width: 250px;
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 1bee1bdf..83368f90 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -71,6 +71,7 @@ function twitter_install() {
 	register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
 	register_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
 	register_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
+	register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 	logger("installed twitter");
 }
 
@@ -91,6 +92,45 @@ function twitter_uninstall() {
 
 }
 
+function twitter_follow($a, &$contact) {
+
+	logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
+
+	if (!strstr($contact["url"], "://twitter.com") AND !strstr($contact["url"], "@twitter.com"))
+		return;
+
+	// contact seems to be a twitter contact, so continue
+	$nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]);
+	$nickname = str_replace("@twitter.com", "", $nickname);
+
+	$uid = $a->user["uid"];
+
+	$ckey    = get_config('twitter', 'consumerkey');
+	$csecret = get_config('twitter', 'consumersecret');
+	$otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
+	$osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+
+	require_once("addon/twitter/codebird.php");
+
+	$cb = \Codebird\Codebird::getInstance();
+	$cb->setConsumerKey($ckey, $csecret);
+	$cb->setToken($otoken, $osecret);
+
+	$parameters = array();
+	$parameters["screen_name"] = $nickname;
+
+	$user = $cb->friendships_create($parameters);
+
+	twitter_fetchuser($a, $uid, $nickname);
+
+	$r = q("SELECT name,nick,url,addr,batch,notify,poll,request,confirm,poco,photo,priority,network,alias,pubkey
+		FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
+				intval($uid),
+				dbesc($nickname));
+	if (count($r))
+		$contact["contact"] = $r[0];
+}
+
 function twitter_jot_nets(&$a,&$b) {
 	if(! local_user())
 		return;
@@ -107,9 +147,10 @@ function twitter_jot_nets(&$a,&$b) {
 function twitter_settings_post ($a,$post) {
 	if(! local_user())
 		return;
-	// don't check twitter settings if twitter submit button is not clicked	
-	if (!x($_POST,'twitter-submit')) return;
-	
+	// don't check twitter settings if twitter submit button is not clicked
+	if (!x($_POST,'twitter-submit'))
+		return;
+
 	if (isset($_POST['twitter-disconnect'])) {
 		/***
 		 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
@@ -125,6 +166,8 @@ function twitter_settings_post ($a,$post) {
 		del_pconfig(local_user(), 'twitter', 'lastid');
 		del_pconfig(local_user(), 'twitter', 'mirror_posts');
 		del_pconfig(local_user(), 'twitter', 'intelligent_shortening');
+		del_pconfig(local_user(), 'twitter', 'import');
+		del_pconfig(local_user(), 'twitter', 'create_user');
 	} else {
 	if (isset($_POST['twitter-pin'])) {
 		//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
@@ -152,6 +195,8 @@ function twitter_settings_post ($a,$post) {
                 set_pconfig(local_user(),'twitter','post_taglinks',intval($_POST['twitter-sendtaglinks']));
 		set_pconfig(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
 		set_pconfig(local_user(), 'twitter', 'intelligent_shortening', intval($_POST['twitter-shortening']));
+		set_pconfig(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
+		set_pconfig(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
                 info( t('Twitter settings updated.') . EOL);
 	}}
 }
@@ -178,6 +223,10 @@ function twitter_settings(&$a,&$s) {
         $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
         $shorteningenabled = get_pconfig(local_user(),'twitter','intelligent_shortening');
         $shorteningchecked = (($shorteningenabled) ? ' 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" ' : '');
 
 	$s .= '<div class="settings-block">';
 	$s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
@@ -248,6 +297,14 @@ function twitter_settings(&$a,&$s) {
                         $s .= '<input id="twitter-sendtaglinks" type="checkbox" name="twitter-sendtaglinks" value="1" '. $linkschecked . '/>';
 			$s .= '</div><div class="clear"></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 .= '<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 .= '<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" />';
@@ -506,20 +563,94 @@ function twitter_shortenmsg($b, $shortlink = false) {
 	}
 }
 
+function twitter_action($a, $uid, $pid, $action) {
+
+	$ckey    = get_config('twitter', 'consumerkey');
+	$csecret = get_config('twitter', 'consumersecret');
+	$otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
+	$osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+
+	require_once("addon/twitter/codebird.php");
+
+	$cb = \Codebird\Codebird::getInstance();
+	$cb->setConsumerKey($ckey, $csecret);
+	$cb->setToken($otoken, $osecret);
+
+	$post = array('id' => $pid);
+
+	logger("twitter_action '".$action."' ID: ".$pid." data: " . print_r($post, true), LOGGER_DEBUG);
+
+	switch ($action) {
+		case "delete":
+			$result = $cb->statuses_destroy($post);
+			break;
+		case "like":
+			$result = $cb->favorites_create($post);
+			break;
+		case "unlike":
+			$result = $cb->favorites_destroy($post);
+			break;
+	}
+	logger("twitter_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
+}
+
 function twitter_post_hook(&$a,&$b) {
 
 	/**
 	 * Post to Twitter
 	 */
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
-        return;
+	//if (!get_pconfig($b["uid"],'twitter','import')) {
+	//	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	//		return;
+	//}
 
-	if(! strstr($b['postopts'],'twitter'))
-		return;
+	if($b['parent'] != $b['id']) {
+		logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DEBUG);
 
-	if($b['parent'] != $b['id'])
+                // 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;
+		}
+
+                $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];
+                }
+
+		// To-Do: Ab dem letzten / nehmen
+		$b["body"] = "@".substr($orig_post["author-link"], 20)." ".$b["body"];
+
+		logger("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG);
+	} else {
+		$iscomment = false;
+
+		if($b['private'] OR !strstr($b['postopts'],'twitter'))
+			return;
+	}
+
+	if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
+		twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
+
+	if($b['verb'] == ACTIVITY_LIKE) {
+		logger("twitter_post_hook: parameter 2 ".substr($b["thr-parent"], 9), LOGGER_DEBUG);
+		if ($b['deleted'])
+			twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "unlike");
+		else
+			twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "like");
 		return;
+        }
+
+	if($b['deleted'] || ($b['created'] !== $b['edited']))
+                return;
 
 	// if post comes from twitter don't send it back
 	if($b['app'] == "Twitter")
@@ -646,7 +777,13 @@ function twitter_post_hook(&$a,&$b) {
 			$cb = \Codebird\Codebird::getInstance();
 			$cb->setConsumerKey($ckey, $csecret);
 			$cb->setToken($otoken, $osecret);
-			$result = $cb->statuses_updateWithMedia(array('status' => $msg, 'media[]' => $tempfile));
+
+			$post = array('status' => $msg, 'media[]' => $tempfile);
+
+			if ($iscomment)
+				$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+
+			$result = $cb->statuses_updateWithMedia($post);
 			unlink($tempfile);
 
 			/*
@@ -666,18 +803,29 @@ function twitter_post_hook(&$a,&$b) {
 				// Workaround: Remove the picture link so that the post can be reposted without it
 				$msg .= " ".$image;
 				$image = "";
+			} elseif ($iscomment) {
+				logger('twitter_post: Update extid '.$result->id_str." for post id ".$b['id']);
+				q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc("twitter::".$result->id_str),
+					dbesc($result->text),
+					intval($b['id'])
+				);
 			}
 		}
 
 		if(strlen($msg) and ($image == "")) {
 			$url = 'statuses/update';
 			$post = array('status' => $msg);
+
+			if ($iscomment)
+				$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+
 			$result = $tweet->post($url, $post);
 			logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
 			if ($result->errors) {
 				logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
-				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
+				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
 				if (count($r))
 					$a->contact = $r[0]["id"];
 
@@ -685,6 +833,13 @@ function twitter_post_hook(&$a,&$b) {
 				require_once('include/queue_fn.php');
 				add_to_queue($a->contact,NETWORK_TWITTER,$s);
 				notice(t('Twitter post failed. Queued for retry.').EOL);
+			} elseif ($iscomment) {
+				logger('twitter_post: Update extid '.$result->id_str." for post id ".$b['id']);
+				q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc("twitter::".$result->id_str),
+					dbesc($result->text),
+					intval($b['id'])
+				);
 			}
 		}
 	}
@@ -735,6 +890,31 @@ function twitter_cron($a,$b) {
 		}
 	}
 
+
+	$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: 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());
+                        }
+*/
+
+                }
+        }
+
 	logger('twitter: cron_end');
 
 	set_config('twitter','last_poll', time());
@@ -880,3 +1060,725 @@ function twitter_queue_hook(&$a,&$b) {
 		}
 	}
 }
+
+function twitter_fetch_contact($uid, $contact, $create_user) {
+
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+		intval($uid), dbesc("twitter::".$contact->id_str));
+
+	if(!count($r) AND !$create_user)
+		return(0);
+
+	if(!count($r)) {
+		// create contact record
+		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 ) ",
+			intval($uid),
+			dbesc(datetime_convert()),
+			dbesc("https://twitter.com/".$contact->screen_name),
+			dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
+			dbesc($contact->screen_name."@twitter.com"),
+			dbesc("twitter::".$contact->id_str),
+			dbesc(''),
+			dbesc("twitter::".$contact->id_str),
+			dbesc($contact->name),
+			dbesc($contact->screen_name),
+			dbesc($contact->profile_image_url_https),
+			dbesc(NETWORK_TWITTER),
+			intval(CONTACT_IS_FRIEND),
+			intval(1),
+			intval(1)
+		);
+
+		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc("twitter::".$contact->id_str),
+			intval($uid)
+			);
+
+		if(! count($r))
+			return(false);
+
+		$contact_id  = $r[0]['id'];
+
+		$g = q("select def_gid from user where uid = %d limit 1",
+			intval($uid)
+		);
+
+		if($g && intval($g[0]['def_gid'])) {
+			require_once('include/group.php');
+			group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+		}
+
+		require_once("Photo.php");
+
+		$photos = import_profile_photo($contact->profile_image_url_https,$uid,$contact_id);
+
+		q("UPDATE `contact` SET `photo` = '%s',
+					`thumb` = '%s',
+					`micro` = '%s',
+					`name-date` = '%s',
+					`uri-date` = '%s',
+					`avatar-date` = '%s'
+				WHERE `id` = %d LIMIT 1",
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($contact_id)
+		);
+	} else {
+		// update profile photos once every two weeks as we have no notification of when they change.
+
+		$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
+
+		// check that we have all the photos, this has been known to fail on occasion
+
+		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
+			require_once("Photo.php");
+
+			$photos = import_profile_photo($contact->profile_image_url_https, $uid, $r[0]['id']);
+
+			q("UPDATE `contact` SET `photo` = '%s',
+						`thumb` = '%s',
+						`micro` = '%s',
+						`name-date` = '%s',
+						`uri-date` = '%s',
+						`avatar-date` = '%s',
+						`url` = '%s',
+						`nurl` = '%s',
+						`addr` = '%s',
+						`name` = '%s',
+						`nick` = '%s',
+					WHERE `id` = %d LIMIT 1",
+				dbesc($photos[0]),
+				dbesc($photos[1]),
+				dbesc($photos[2]),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc("https://twitter.com/".$contact->screen_name),
+				dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
+				dbesc($contact->screen_name."@twitter.com"),
+				dbesc($contact->name),
+				dbesc($contact->screen_name),
+				intval($r[0]['id'])
+			);
+		}
+	}
+
+	return($r[0]["id"]);
+}
+
+function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
+	$ckey    = get_config('twitter', 'consumerkey');
+	$csecret = get_config('twitter', 'consumersecret');
+	$otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
+	$osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+
+	require_once("addon/twitter/codebird.php");
+
+	$cb = \Codebird\Codebird::getInstance();
+	$cb->setConsumerKey($ckey, $csecret);
+	$cb->setToken($otoken, $osecret);
+
+	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+	if(count($r)) {
+		$self = $r[0];
+	} else
+		return;
+
+	$parameters = array();
+
+	if ($screen_name != "")
+		$parameters["screen_name"] = $screen_name;
+
+	if ($user_id != "")
+		$parameters["user_id"] = $user_id;
+
+	// Fetching user data
+	$user = $cb->users_show($parameters);
+
+	if (!is_object($user))
+		return;
+
+	$contact_id = twitter_fetch_contact($uid, $user, true);
+
+	return $contact_id;
+}
+
+function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) {
+	$postarray = array();
+	$postarray['gravity'] = 0;
+	$postarray['uid'] = $uid;
+	$postarray['wall'] = 0;
+	$postarray['uri'] = "twitter::".$post->id_str;
+
+	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc($postarray['uri']),
+			intval($uid)
+		);
+
+	if (count($r))
+		return(array());
+
+	$contactid = 0;
+
+	if ($post->in_reply_to_status_id_str != "") {
+
+		$parent = "twitter::".$post->in_reply_to_status_id_str;
+
+		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($parent),
+				intval($uid)
+			);
+		if (count($r)) {
+			$postarray['thr-parent'] = $r[0]["uri"];
+			$postarray['parent-uri'] = $r[0]["parent-uri"];
+		} else {
+			$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($parent),
+					intval($uid)
+				);
+			if (count($r)) {
+				$postarray['thr-parent'] = $r[0]['uri'];
+				$postarray['parent-uri'] = $r[0]['parent-uri'];
+			} else {
+				$postarray['thr-parent'] = $postarray['uri'];
+				$postarray['parent-uri'] = $postarray['uri'];
+			}
+		}
+
+		// Is it me?
+		$own_id = get_pconfig($uid, 'twitter', 'own_id');
+
+		if ($post->user->id_str == $own_id) {
+			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+				intval($uid));
+
+			if(count($r)) {
+				$contactid = $r[0]["id"];
+
+				$postarray['owner-name'] =  $r[0]["name"];
+				$postarray['owner-link'] = $r[0]["url"];
+				$postarray['owner-avatar'] =  $r[0]["photo"];
+			} else
+				return(array());
+		}
+	} else
+		$postarray['parent-uri'] = $postarray['uri'];
+
+	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;
+	}
+
+	if(($contactid == 0) AND !$only_existing_contact)
+		$contactid = $self['id'];
+	elseif ($contactid == 0)
+		return(array());
+
+	$postarray['contact-id'] = $contactid;
+
+	$postarray['verb'] = ACTIVITY_POST;
+	$postarray['author-name'] = $postarray['owner-name'];
+	$postarray['author-link'] = $postarray['owner-link'];
+	$postarray['author-avatar'] = $postarray['owner-avatar'];
+	$postarray['plink'] = "https://twitter.com/".$post->user->screen_name."/status/".$post->id_str;
+	$postarray['app'] = strip_tags($post->source);
+
+	if ($post->user->protected) {
+		$postarray['private'] = 1;
+		$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[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+					break;
+				default:
+					$postarray['body'] .= print_r($media, true);
+			}
+		}
+	}
+
+	$converted = twitter_convertmsg($a, $postarray['body']);
+	$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;
+
+	if (is_string($post->place->full_name))
+		$postarray["location"] = $post->place->full_name;
+
+	if (is_array($post->geo->coordinates))
+		$postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+
+	if (is_array($post->coordinates->coordinates))
+		$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
+
+	if (is_object($post->retweeted_status)) {
+
+		$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[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+						break;
+					default:
+						$postarray['body'] .= print_r($media, true);
+				}
+			}
+		}
+
+		$converted = twitter_convertmsg($a, $postarray['body']);
+		$postarray['body'] = $converted["body"];
+		$postarray['tag'] = $converted["tags"];
+
+
+		if (!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;
+		}
+
+	}
+	return($postarray);
+}
+
+function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
+
+	$user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+			intval($uid)
+		);
+
+	if(!count($user))
+		return;
+
+	$importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
+	if (link_compare($own_id, $postarray['author-link']))
+		return;
+
+	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
+			dbesc($postarray['parent-uri']),
+			intval($uid)
+			);
+
+	if(count($myconv)) {
+
+		foreach($myconv as $conv) {
+			// now if we find a match, it means we're in this conversation
+
+			if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],"https://twitter.com/".$own_id))
+				continue;
+
+			require_once('include/enotify.php');
+
+			$conv_parent = $conv['parent'];
+
+			notification(array(
+				'type'         => NOTIFY_COMMENT,
+				'notify_flags' => $user[0]['notify-flags'],
+				'language'     => $user[0]['language'],
+				'to_name'      => $user[0]['username'],
+				'to_email'     => $user[0]['email'],
+				'uid'          => $user[0]['uid'],
+				'item'         => $postarray,
+				'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
+				'source_name'  => $postarray['author-name'],
+				'source_link'  => $postarray['author-link'],
+				'source_photo' => $postarray['author-avatar'],
+				'verb'         => ACTIVITY_POST,
+				'otype'        => 'item',
+				'parent'       => $conv_parent,
+			));
+
+			// only send one notification
+			break;
+		}
+	}
+}
+
+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');
+
+	logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
+
+	require_once('library/twitteroauth.php');
+	require_once('include/items.php');
+
+	$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+
+	$own_contact = twitter_fetch_own_contact($a, $uid);
+
+	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		intval($own_contact),
+		intval($uid));
+
+	if(count($r)) {
+		$own_id = $r[0]["nick"];
+	} else
+		return;
+
+	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+	if(count($r)) {
+		$self = $r[0];
+	} else
+		return;
+
+	$u = q("select * from user where uid = %d limit 1",
+		intval($uid));
+	if(!count($u))
+		return;
+
+	$parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true);
+	//$parameters["count"] = 200;
+
+
+	// Fetching timeline
+	$lastid  = get_pconfig($uid, 'twitter', 'lasthometimelineid');
+
+	$first_time = ($lastid == "");
+
+	if ($lastid <> "")
+		$parameters["since_id"] = $lastid;
+
+	$items = $connection->get('statuses/home_timeline', $parameters);
+
+	if (!is_array($items))
+		return;
+
+        $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)
+				$lastid = $post->id_str;
+
+			if ($first_time)
+				continue;
+
+			$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true);
+
+			if (trim($postarray['body']) == "")
+				continue;
+
+			$item = item_store($postarray);
+
+			logger('twitter_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
+
+			if ($item != 0)
+				twitter_checknotification($a, $uid, $own_id, $item, $postarray);
+
+		}
+	}
+	set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+
+	// Fetching mentions
+	$lastid  = get_pconfig($uid, 'twitter', 'lastmentionid');
+
+	$first_time = ($lastid == "");
+
+	if ($lastid <> "")
+		$parameters["since_id"] = $lastid;
+
+	$items = $connection->get('statuses/mentions_timeline', $parameters);
+
+	if (!is_array($items))
+		return;
+
+        $posts = array_reverse($items);
+
+	logger("twitter_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+
+	if (count($posts)) {
+		foreach ($posts as $post) {
+			if ($post->id_str > $lastid)
+				$lastid = $post->id_str;
+
+			if ($first_time)
+				continue;
+
+			$postarray = twitter_createpost($a, $uid, $post, $self, false, false);
+
+			if (trim($postarray['body']) == "")
+				continue;
+
+			$item = item_store($postarray);
+
+			logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
+
+			if ($item == 0) {
+				$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($postarray['uri']),
+					intval($uid)
+				);
+				if (count($r))
+					$item = $r[0]['id'];
+			}
+
+			if ($item != 0) {
+				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'],
+					'source_photo' => $postarray['author-avatar'],
+			                'verb'         => ACTIVITY_TAG,
+			                'otype'        => 'item'
+			        ));
+			}
+		}
+	}
+
+	set_pconfig($uid, 'twitter', 'lastmentionid', $lastid);
+}
+
+function twitter_original_url($url, $depth=1, $fetchbody = false) {
+        if ($depth > 10)
+                return($url);
+
+        $siteinfo = array();
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_HEADER, 1);
+
+	if ($fetchbody)
+	        curl_setopt($ch, CURLOPT_NOBODY, 0);
+	else
+	        curl_setopt($ch, CURLOPT_NOBODY, 1);
+
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch,CURLOPT_USERAGENT,'Opera/9.64(Windows NT 5.1; U; de) Presto/2.1.1');
+
+        $header = curl_exec($ch);
+        $curl_info = @curl_getinfo($ch);
+        $http_code = $curl_info['http_code'];
+        curl_close($ch);
+
+        if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302"))
+                AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
+                if ($curl_info['redirect_url'] != "")
+                        return(twitter_original_url($curl_info['redirect_url'], ++$depth, $fetchbody));
+                else
+                        return(twitter_original_url($curl_info['location'], ++$depth, $fetchbody));
+        }
+
+        $pos = strpos($header, "\r\n\r\n");
+
+        if ($pos)
+                $body = trim(substr($header, $pos));
+        else
+                $body = $header;
+
+	if (trim($body) == "")
+		return(twitter_original_url($url, ++$depth, true));
+
+        $doc = new DOMDocument();
+        @$doc->loadHTML($body);
+
+        $xpath = new DomXPath($doc);
+
+        $list = $xpath->query("//meta[@content]");
+        foreach ($list as $node) {
+                $attr = array();
+                if ($node->attributes->length)
+                        foreach ($node->attributes as $attribute)
+                                $attr[$attribute->name] = $attribute->value;
+
+                if (@$attr["http-equiv"] == 'refresh') {
+                        $path = $attr["content"];
+                        $pathinfo = explode(";", $path);
+                        $content = "";
+                        foreach ($pathinfo AS $value)
+                                if (substr(strtolower($value), 0, 4) == "url=")
+                                        return(twitter_original_url(substr($value, 4), ++$depth));
+                }
+        }
+
+        return($url);
+}
+
+function twitter_siteinfo($url) {
+	require_once("mod/parse_url.php");
+
+	$data = parseurl_getsiteinfo($url);
+
+	if (!is_string($data["text"]) AND (sizeof($data["images"]) == 0) AND ($data["title"] == $url))
+		return("");
+
+	if (is_string($data["title"]))
+		$text .= "[bookmark=".$url."]".$data["title"]."[/bookmark]\n";
+
+	if (sizeof($data["images"]) > 0) {
+		$imagedata = $data["images"][0];
+		$text .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n";
+	}
+
+	if (is_string($data["text"]))
+		$text .= "[quote]".$data["text"]."[/quote]";
+
+	return($text);
+
+}
+
+function twitter_convertmsg($a, $body) {
+
+	$links = preg_match_all("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", $body,$matches,PREG_SET_ORDER);
+
+	$footer = "";
+
+	if ($links) {
+		foreach ($matches AS $match) {
+			$expanded_url = twitter_original_url($match[2]);
+
+			if (strstr($expanded_url, "//www.youtube.com/"))
+				$body = str_replace($match[2], "\n[youtube]".$expanded_url."[/youtube]\n", $body);
+			elseif (strstr($expanded_url, "//player.vimeo.com/"))
+				$body = str_replace($match[2], "\n[vimeo]".$expanded_url."[/vimeo]\n", $body);
+			else {
+				$img_str = fetch_url($expanded_url, true, $redirects, 4);
+
+				$tempfile = tempnam(get_config("system","temppath"), "cache");
+				file_put_contents($tempfile, $img_str);
+				$mime = image_type_to_mime_type(exif_imagetype($tempfile));
+				unlink($tempfile);
+
+				if (substr($mime, 0, 6) == "image/")
+					$body = str_replace($match[2], "[img]".$expanded_url."[/img]", $body);
+				else {
+					$body = str_replace($match[2], "[url=".$expanded_url."]".$expanded_url."[/url]", $body);
+
+					if ($footer == "")
+						$footer = "\n\n".twitter_siteinfo($expanded_url);
+				}
+			}
+		}
+		$body .= $footer;
+	}
+
+	$str_tags = '';
+
+        $tags = get_tags($body);
+
+        if(count($tags)) {
+                foreach($tags as $tag) {
+			if (strstr(trim($tag), " "))
+				continue;
+
+                        if(strpos($tag,'#') === 0) {
+                                if(strpos($tag,'[url='))
+                                        continue;
+
+                                // don't link tags that are already embedded in links
+
+                                if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
+                                        continue;
+                                if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
+                                        continue;
+
+                                $basetag = str_replace('_',' ',substr($tag,1));
+                                $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+                                if(strlen($str_tags))
+                                        $str_tags .= ',';
+                                $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                                continue;
+                        } elseif(strpos($tag,'@') === 0) {
+                                $basetag = substr($tag,1);
+                                $body = str_replace($tag,'@[url=https://twitter.com/' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+			}
+
+                }
+        }
+
+        $cnt = preg_match_all('/@\[url=(.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER);
+        if($cnt) {
+                foreach($matches as $mtch) {
+                        if(strlen($str_tags))
+                                $str_tags .= ',';
+                        $str_tags .= '@[url=' . $mtch[1] . '[/url]';
+                }
+        }
+
+	return(array("body"=>$body, "tags"=>$str_tags));
+
+}
+
+function twitter_fetch_own_contact($a, $uid) {
+	$ckey    = get_config('twitter', 'consumerkey');
+	$csecret = get_config('twitter', 'consumersecret');
+	$otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
+	$osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+
+	$own_id = get_pconfig($uid, 'twitter', 'own_id');
+
+	$contact_id = 0;
+
+	if ($own_id == "") {
+		require_once('library/twitteroauth.php');
+
+		$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+
+		// Fetching user data
+		$user = $connection->get('account/verify_credentials');
+
+		set_pconfig($uid, 'twitter', 'own_id', $user->id_str);
+
+		$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));
+		if(count($r))
+			$contact_id = $r[0]["id"];
+	}
+
+	return($contact_id);
+}
+
+?>