X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=8d7e21fbbfd083e9209cfdbf90e84beef8953a61;hb=6370953286e7db7f682b6391213cd5d21fdaeaf3;hp=d2dc4fd69c92551c78b79277d67915b07668faa3;hpb=0a6d1f9e492459aed2607b2432438b66b50bc4f8;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index d2dc4fd6..8d7e21fb 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -73,6 +73,7 @@ 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');
 	logger("installed twitter");
 }
 
@@ -87,6 +88,7 @@ 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');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
@@ -436,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;
 
@@ -462,7 +467,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"]))
@@ -472,7 +477,7 @@ function twitter_post_hook(&$a,&$b) {
 
 		if (isset($msgarr["url"]))
 			$msg .= "\n".$msgarr["url"];
-		elseif (isset($msgarr["image"]))
+		elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
 			$image = $msgarr["image"];
 
 		// and now tweet it :-)
@@ -501,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) . '"');
 
@@ -526,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) . '"');
 
@@ -559,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){
@@ -570,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'))
 	));
 }
 
@@ -598,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"]);
 
@@ -652,6 +678,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"]))
+			$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');
@@ -694,7 +759,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;
 
@@ -702,7 +767,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;
 
@@ -849,6 +916,16 @@ function twitter_queue_hook(&$a,&$b) {
 }
 
 function twitter_fetch_contact($uid, $contact, $create_user) {
+	require_once("include/Photo.php");
+
+	if ($contact->id_str == "")
+		return(-1);
+
+	$avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
+
+	$info = get_photo_info($avatar);
+	if (!$info)
+		$avatar = $contact->profile_image_url_https;
 
 	// Check if the unique contact is existing
 	// To-Do: only update once a while
@@ -860,12 +937,18 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 			dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
 			dbesc($contact->name),
 			dbesc($contact->screen_name),
-			dbesc($contact->profile_image_url_https));
+			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($contact->profile_image_url_https),
+			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",
@@ -884,7 +967,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),
@@ -895,7 +978,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),
@@ -923,7 +1006,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',
@@ -941,6 +1024,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.
 
@@ -955,7 +1047,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',
@@ -982,6 +1074,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'])
+				);
 		}
 	}
 
@@ -1101,7 +1202,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = 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;
@@ -1202,6 +1303,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),
@@ -1210,9 +1313,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;
 			}
 		}
 
@@ -1234,8 +1340,10 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		}
 		// Don't create accounts of people who just comment something
 		$create_user = false;
-	} else
+	} else {
 		$postarray['parent-uri'] = $postarray['uri'];
+		$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+	}
 
 	if ($contactid == 0) {
 		$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
@@ -1276,6 +1384,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 					//$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:
@@ -1317,6 +1426,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 						//$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:
@@ -1356,6 +1466,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
 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)
 		);
@@ -1404,7 +1516,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'],
@@ -1544,6 +1656,9 @@ function twitter_fetchhometimeline($a, $uid) {
 
 			$item = item_store($postarray);
 
+			if (!isset($postarray["parent"]) OR ($postarray["parent"] == 0))
+				$postarray["parent"] = $item;
+
 			logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
 
 			if ($item == 0) {
@@ -1551,9 +1666,12 @@ 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) {
 				require_once('include/enotify.php');
@@ -1565,12 +1683,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
 				));
 			}
 		}