X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=d7a5eec50b0cd5c21d8c917e4720e7667b765286;hb=e98c299cd2b3f2f855c31c8fca4fd5659f53cced;hp=2669c46d3e79919a1eb61e141e4e51e7cc47a26b;hpb=39cc0fe4cb909a52b3bb75b685ca7142863a6027;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 2669c46d..d7a5eec5 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -438,6 +438,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;
 
@@ -503,6 +506,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) . '"');
 
@@ -528,6 +535,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) . '"');
 
@@ -561,7 +572,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){
@@ -572,7 +583,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'))
 	));
 }
 
@@ -600,10 +611,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"]);
 
@@ -709,6 +733,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);
@@ -735,7 +760,7 @@ function twitter_fetchtimeline($a, $uid) {
 		if ($first_time)
 			continue;
 
-		if (!strpos($post->source, $application_name)) {
+		if (!stristr($post->source, $application_name)) {
 			$_SESSION["authenticated"] = true;
 			$_SESSION["uid"] = $uid;
 
@@ -743,7 +768,9 @@ 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;
 
 			//$_REQUEST["date"] = $post->created_at;
 
@@ -772,11 +799,20 @@ function twitter_fetchtimeline($a, $uid) {
 				$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;
@@ -919,6 +955,12 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 			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));
 
@@ -935,7 +977,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),
@@ -992,6 +1034,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.
 
@@ -1033,6 +1084,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'])
+				);
 		}
 	}
 
@@ -1396,6 +1456,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 			$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.
+				"' 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."']".
 				$postarray['body'];
 			$postarray['body'] .= "[/share]";