X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=twitter%2Ftwitter.php;h=206b32b94a8c541ed94ce7438e558cc22e37f950;hb=94e240af742303c1e46d72a7ecffbc247dbfbd94;hp=b38ee92d0fa71ad36447542cbb4e4a0d6920ea4a;hpb=5e6fcb1f956a1df4c46b17bc3d4263e609d574d1;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index b38ee92d..206b32b9 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -79,13 +79,12 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
-use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\ItemContent;
 use Friendica\Model\User;
 use Friendica\Object\Image;
-use Friendica\Util\Config\ConfigFileLoader;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -575,7 +574,7 @@ function twitter_post_hook(App $a, array &$b)
 		return;
 	}
 
-	Logger::log('twitter post invoked');
+	Logger::notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]);
 
 	PConfig::load($b['uid'], 'twitter');
 
@@ -610,6 +609,7 @@ function twitter_post_hook(App $a, array &$b)
 		$b['body'] = twitter_update_mentions($b['body']);
 
 		$msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 8);
+		Logger::info('Got plaintext', $msgarr);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") && isset($msgarr["title"])) {
@@ -925,7 +925,7 @@ function twitter_fetchtimeline(App $a, $uid)
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
-	$parameters = ["exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"];
+	$parameters = ["exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended", "include_ext_alt_text" => true];
 
 	$first_time = ($lastid == "");
 
@@ -1004,12 +1004,6 @@ function twitter_fetch_contact($uid, $data, $create_user)
 	$url = "https://twitter.com/" . $data->screen_name;
 	$addr = $data->screen_name . "@twitter.com";
 
-	GContact::update(["url" => $url, "network" => Protocol::TWITTER,
-		"photo" => $avatar, "hide" => true,
-		"name" => $data->name, "nick" => $data->screen_name,
-		"location" => $data->location, "about" => $data->description,
-		"addr" => $addr, "generation" => 2]);
-
 	$fields = ['url' => $url, 'network' => Protocol::TWITTER,
 		'name' => $data->name, 'nick' => $data->screen_name, 'addr' => $addr,
                 'location' => $data->location, 'about' => $data->description];
@@ -1318,12 +1312,24 @@ function twitter_media_entities($post, array &$postarray)
 		}
 		switch ($medium->type) {
 			case 'photo':
-				$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
+				if (!empty($medium->ext_alt_text)) {
+					Logger::info('Got text description', ['alt_text' => $medium->ext_alt_text]);
+					$media[$medium->url] .= "\n[img=" . $medium->media_url_https .']' . $medium->ext_alt_text . '[/img]';
+				} else {
+					$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
+				}
+
 				$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
 				break;
 			case 'video':
 			case 'animated_gif':
-				$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
+				if (!empty($medium->ext_alt_text)) {
+					Logger::info('Got text description', ['alt_text' => $medium->ext_alt_text]);
+					$media[$medium->url] .= "\n[img=" . $medium->media_url_https .']' . $medium->ext_alt_text . '[/img]';
+				} else {
+					$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
+				}
+
 				$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
 				if (is_array($medium->video_info->variants)) {
 					$bitrate = 0;
@@ -1539,7 +1545,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 	$posts = [];
 
 	while (!empty($post->in_reply_to_status_id_str)) {
-		$parameters = ["trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str];
+		$parameters = ["trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str, "include_ext_alt_text" => true];
 
 		try {
 			$post = $connection->get('statuses/show', $parameters);
@@ -1629,7 +1635,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 		return;
 	}
 
-	$parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"];
+	$parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended", "include_ext_alt_text" => true];
 	//$parameters["count"] = 200;
 	// Fetching timeline
 	$lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');