X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=673b3b75301f56a05c6b54f7defca0f206eb3aec;hb=81dc1e5eb1bc4a42fa485cb668b200a63fb1feaa;hp=bb2d38abb4df2b4494cbe07d0cb2ea92ea9b8f49;hpb=a1254b4c856bfe6ce2459a9ce00f6a7f7bd65ec6;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index bb2d38ab..673b3b75 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -64,30 +64,28 @@
 
 use Abraham\TwitterOAuth\TwitterOAuth;
 use Abraham\TwitterOAuth\TwitterOAuthException;
+use Codebird\Codebird;
 use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 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\Queue;
 use Friendica\Model\User;
-use Friendica\Object\Image;
+use Friendica\Protocol\Activity;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
@@ -106,12 +104,11 @@ function twitter_install()
 	Hook::register('notifier_normal'        , __FILE__, 'twitter_post_hook');
 	Hook::register('jot_networks'           , __FILE__, 'twitter_jot_nets');
 	Hook::register('cron'                   , __FILE__, 'twitter_cron');
-	Hook::register('queue_predeliver'       , __FILE__, 'twitter_queue_hook');
 	Hook::register('follow'                 , __FILE__, 'twitter_follow');
 	Hook::register('expire'                 , __FILE__, 'twitter_expire');
 	Hook::register('prepare_body'           , __FILE__, 'twitter_prepare_body');
 	Hook::register('check_item_notification', __FILE__, 'twitter_check_item_notification');
-	Logger::log("installed twitter");
+	Logger::info("installed twitter");
 }
 
 function twitter_uninstall()
@@ -124,7 +121,6 @@ function twitter_uninstall()
 	Hook::unregister('notifier_normal'        , __FILE__, 'twitter_post_hook');
 	Hook::unregister('jot_networks'           , __FILE__, 'twitter_jot_nets');
 	Hook::unregister('cron'                   , __FILE__, 'twitter_cron');
-	Hook::unregister('queue_predeliver'       , __FILE__, 'twitter_queue_hook');
 	Hook::unregister('follow'                 , __FILE__, 'twitter_follow');
 	Hook::unregister('expire'                 , __FILE__, 'twitter_expire');
 	Hook::unregister('prepare_body'           , __FILE__, 'twitter_prepare_body');
@@ -136,14 +132,14 @@ function twitter_uninstall()
 	Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post');
 }
 
-function twitter_load_config(App $a)
+function twitter_load_config(App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__ . '/config/twitter.config.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)
 {
-	$own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
+	$own_id = DI::pConfig()->get($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"]),
@@ -157,7 +153,7 @@ function twitter_check_item_notification(App $a, array &$notification_data)
 
 function twitter_follow(App $a, array &$contact)
 {
-	Logger::log("twitter_follow: Check if contact is twitter contact. " . $contact["url"], Logger::DEBUG);
+	Logger::info('Check if contact is twitter contact', ['url' => $contact["url"]]);
 
 	if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com")) {
 		return;
@@ -169,10 +165,10 @@ function twitter_follow(App $a, array &$contact)
 
 	$uid = $a->user["uid"];
 
-	$ckey = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$ckey = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
 
 	// If the addon is not configured (general or for this user) quit here
 	if (empty($ckey) || empty($csecret) || empty($otoken) || empty($osecret)) {
@@ -194,21 +190,25 @@ function twitter_follow(App $a, array &$contact)
 	}
 }
 
-function twitter_jot_nets(App $a, &$b)
+function twitter_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$tw_post = PConfig::get(local_user(), 'twitter', 'post');
-	if (intval($tw_post) == 1) {
-		$tw_defpost = PConfig::get(local_user(), 'twitter', 'post_by_default');
-		$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
-			. L10n::t('Post to Twitter') . '</div>';
+	if (DI::pConfig()->get(local_user(), 'twitter', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'twitter_enable',
+				DI::l10n()->t('Post to Twitter'),
+				DI::pConfig()->get(local_user(), 'twitter', 'post_by_default')
+			]
+		];
 	}
 }
 
+
 function twitter_settings_post(App $a)
 {
 	if (!local_user()) {
@@ -224,58 +224,58 @@ function twitter_settings_post(App $a)
 		 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
 		 * from the user configuration
 		 */
-		PConfig::delete(local_user(), 'twitter', 'consumerkey');
-		PConfig::delete(local_user(), 'twitter', 'consumersecret');
-		PConfig::delete(local_user(), 'twitter', 'oauthtoken');
-		PConfig::delete(local_user(), 'twitter', 'oauthsecret');
-		PConfig::delete(local_user(), 'twitter', 'post');
-		PConfig::delete(local_user(), 'twitter', 'post_by_default');
-		PConfig::delete(local_user(), 'twitter', 'lastid');
-		PConfig::delete(local_user(), 'twitter', 'mirror_posts');
-		PConfig::delete(local_user(), 'twitter', 'import');
-		PConfig::delete(local_user(), 'twitter', 'create_user');
-		PConfig::delete(local_user(), 'twitter', 'own_id');
+		DI::pConfig()->delete(local_user(), 'twitter', 'consumerkey');
+		DI::pConfig()->delete(local_user(), 'twitter', 'consumersecret');
+		DI::pConfig()->delete(local_user(), 'twitter', 'oauthtoken');
+		DI::pConfig()->delete(local_user(), 'twitter', 'oauthsecret');
+		DI::pConfig()->delete(local_user(), 'twitter', 'post');
+		DI::pConfig()->delete(local_user(), 'twitter', 'post_by_default');
+		DI::pConfig()->delete(local_user(), 'twitter', 'lastid');
+		DI::pConfig()->delete(local_user(), 'twitter', 'mirror_posts');
+		DI::pConfig()->delete(local_user(), 'twitter', 'import');
+		DI::pConfig()->delete(local_user(), 'twitter', 'create_user');
+		DI::pConfig()->delete(local_user(), 'twitter', 'own_id');
 	} else {
 		if (isset($_POST['twitter-pin'])) {
 			//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
-			Logger::log('got a Twitter PIN');
-			$ckey    = Config::get('twitter', 'consumerkey');
-			$csecret = Config::get('twitter', 'consumersecret');
+			Logger::notice('got a Twitter PIN');
+			$ckey    = DI::config()->get('twitter', 'consumerkey');
+			$csecret = DI::config()->get('twitter', 'consumersecret');
 			//  the token and secret for which the PIN was generated were hidden in the settings
 			//  form as token and token2, we need a new connection to Twitter using these token
 			//  and secret to request a Access Token with the PIN
 			try {
 				if (empty($_POST['twitter-pin'])) {
-					throw new Exception(L10n::t('You submitted an empty PIN, please Sign In with Twitter again to get a new one.'));
+					throw new Exception(DI::l10n()->t('You submitted an empty PIN, please Sign In with Twitter again to get a new one.'));
 				}
 
 				$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
 				$token = $connection->oauth("oauth/access_token", ["oauth_verifier" => $_POST['twitter-pin']]);
 				//  ok, now that we have the Access Token, save them in the user config
-				PConfig::set(local_user(), 'twitter', 'oauthtoken', $token['oauth_token']);
-				PConfig::set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']);
-				PConfig::set(local_user(), 'twitter', 'post', 1);
+				DI::pConfig()->set(local_user(), 'twitter', 'oauthtoken', $token['oauth_token']);
+				DI::pConfig()->set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']);
+				DI::pConfig()->set(local_user(), 'twitter', 'post', 1);
 			} catch(Exception $e) {
 				info($e->getMessage());
 			} catch(TwitterOAuthException $e) {
 				info($e->getMessage());
 			}
 			//  reload the Addon Settings page, if we don't do it see Bug #42
-			System::redirectTo('settings/connectors');
+			DI::baseUrl()->redirect('settings/connectors');
 		} else {
 			//  if no PIN is supplied in the POST variables, the user has changed the setting
 			//  to post a tweet for every new __public__ posting to the wall
-			PConfig::set(local_user(), 'twitter', 'post', intval($_POST['twitter-enable']));
-			PConfig::set(local_user(), 'twitter', 'post_by_default', intval($_POST['twitter-default']));
-			PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
-			PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
-			PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
+			DI::pConfig()->set(local_user(), 'twitter', 'post', intval($_POST['twitter-enable']));
+			DI::pConfig()->set(local_user(), 'twitter', 'post_by_default', intval($_POST['twitter-default']));
+			DI::pConfig()->set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
+			DI::pConfig()->set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
+			DI::pConfig()->set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
 
 			if (!intval($_POST['twitter-mirror'])) {
-				PConfig::delete(local_user(), 'twitter', 'lastid');
+				DI::pConfig()->delete(local_user(), 'twitter', 'lastid');
 			}
 
-			info(L10n::t('Twitter settings updated.') . EOL);
+			info(DI::l10n()->t('Twitter settings updated.') . EOL);
 		}
 	}
 }
@@ -285,38 +285,38 @@ function twitter_settings(App $a, &$s)
 	if (!local_user()) {
 		return;
 	}
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
 	/*	 * *
 	 * 1) Check that we have global consumer key & secret
 	 * 2) If no OAuthtoken & stuff is present, generate button to get some
 	 * 3) Checkbox for "Send public notices (280 chars only)
 	 */
-	$ckey    = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get(local_user(), 'twitter', 'oauthtoken');
-	$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret');
+	$ckey    = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken  = DI::pConfig()->get(local_user(), 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get(local_user(), 'twitter', 'oauthsecret');
 
-	$enabled            = intval(PConfig::get(local_user(), 'twitter', 'post'));
-	$defenabled         = intval(PConfig::get(local_user(), 'twitter', 'post_by_default'));
-	$mirrorenabled      = intval(PConfig::get(local_user(), 'twitter', 'mirror_posts'));
-	$importenabled      = intval(PConfig::get(local_user(), 'twitter', 'import'));
-	$create_userenabled = intval(PConfig::get(local_user(), 'twitter', 'create_user'));
+	$enabled            = intval(DI::pConfig()->get(local_user(), 'twitter', 'post'));
+	$defenabled         = intval(DI::pConfig()->get(local_user(), 'twitter', 'post_by_default'));
+	$mirrorenabled      = intval(DI::pConfig()->get(local_user(), 'twitter', 'mirror_posts'));
+	$importenabled      = intval(DI::pConfig()->get(local_user(), 'twitter', 'import'));
+	$create_userenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'create_user'));
 
 	$css = (($enabled) ? '' : '-disabled');
 
 	$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . L10n::t('Twitter Import/Export/Mirror') . '</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . DI::l10n()->t('Twitter Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . L10n::t('Twitter Import/Export/Mirror') . '</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . DI::l10n()->t('Twitter Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 
 	if ((!$ckey) && (!$csecret)) {
 		/* no global consumer keys
 		 * display warning and skip personal config
 		 */
-		$s .= '<p>' . L10n::t('No consumer key pair for Twitter found. Please contact your site administrator.') . '</p>';
+		$s .= '<p>' . DI::l10n()->t('No consumer key pair for Twitter found. Please contact your site administrator.') . '</p>';
 	} else {
 		// ok we have a consumer key pair now look into the OAuth stuff
 		if ((!$otoken) && (!$osecret)) {
@@ -328,17 +328,17 @@ function twitter_settings(App $a, &$s)
 			$connection = new TwitterOAuth($ckey, $csecret);
 			try {
 				$result = $connection->oauth('oauth/request_token', ['oauth_callback' => 'oob']);
-				$s .= '<p>' . L10n::t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
-				$s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $result['oauth_token']]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
+				$s .= '<p>' . DI::l10n()->t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
+				$s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $result['oauth_token']]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . DI::l10n()->t('Log in with Twitter') . '"></a>';
 				$s .= '<div id="twitter-pin-wrapper">';
-				$s .= '<label id="twitter-pin-label" for="twitter-pin">' . L10n::t('Copy the PIN from Twitter here') . '</label>';
+				$s .= '<label id="twitter-pin-label" for="twitter-pin">' . DI::l10n()->t('Copy the PIN from Twitter here') . '</label>';
 				$s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
 				$s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $result['oauth_token'] . '" />';
 				$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $result['oauth_token_secret'] . '" />';
 				$s .= '</div><div class="clear"></div>';
-				$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+				$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
 			} catch (TwitterOAuthException $e) {
-				$s .= '<p>' . L10n::t('An error occured: ') . $e->getMessage() . '</p>';
+				$s .= '<p>' . DI::l10n()->t('An error occured: ') . $e->getMessage() . '</p>';
 			}
 		} else {
 			/*			 * *
@@ -351,39 +351,48 @@ function twitter_settings(App $a, &$s)
 
 				$field_checkbox = Renderer::getMarkupTemplate('field_checkbox.tpl');
 
-				$s .= '<div id="twitter-info" >
-					<p>' . L10n::t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a>
-						<button type="submit" name="twitter-disconnect" value="1">' . L10n::t('Disconnect') . '</button>
+				if (property_exists($details, 'screen_name') &&
+				    property_exists($details, 'description') &&
+				    property_exists($details, 'profile_image_url')) {
+					$s .= '<div id="twitter-info" >
+					<p>' . DI::l10n()->t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a>
+						<button type="submit" name="twitter-disconnect" value="1">' . DI::l10n()->t('Disconnect') . '</button>
 					</p>
 					<p id="twitter-info-block">
 						<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter"><img id="twitter-avatar" src="' . $details->profile_image_url . '" /></a>
 						<em>' . $details->description . '</em>
 					</p>
 				</div>';
+				} else {
+					$s .= '<div id="twitter-info" >
+					<p>Invalid Twitter info</p>
+				</div>';
+					Logger::info('Invalid twitter info (verify credentials).', ['auth' => TwitterOAuth::class]);
+				}
 				$s .= '<div class="clear"></div>';
 
 				$s .= Renderer::replaceMacros($field_checkbox, [
-					'$field' => ['twitter-enable', L10n::t('Allow posting to Twitter'), $enabled, L10n::t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')]
+					'$field' => ['twitter-enable', DI::l10n()->t('Allow posting to Twitter'), $enabled, DI::l10n()->t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')]
 				]);
 				if ($a->user['hidewall']) {
-					$s .= '<p>' . L10n::t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
+					$s .= '<p>' . DI::l10n()->t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
 				}
 				$s .= Renderer::replaceMacros($field_checkbox, [
-					'$field' => ['twitter-default', L10n::t('Send public postings to Twitter by default'), $defenabled, '']
+					'$field' => ['twitter-default', DI::l10n()->t('Send public postings to Twitter by default'), $defenabled, '']
 				]);
 				$s .= Renderer::replaceMacros($field_checkbox, [
-					'$field' => ['twitter-mirror', L10n::t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
+					'$field' => ['twitter-mirror', DI::l10n()->t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
 				]);
 				$s .= Renderer::replaceMacros($field_checkbox, [
-					'$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
+					'$field' => ['twitter-import', DI::l10n()->t('Import the remote timeline'), $importenabled, '']
 				]);
 				$s .= Renderer::replaceMacros($field_checkbox, [
-					'$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, L10n::t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.')]
+					'$field' => ['twitter-create_user', DI::l10n()->t('Automatically create contacts'), $create_userenabled, DI::l10n()->t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.')]
 				]);
 				$s .= '<div class="clear"></div>';
-				$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+				$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
 			} catch (TwitterOAuthException $e) {
-				$s .= '<p>' . L10n::t('An error occured: ') . $e->getMessage() . '</p>';
+				$s .= '<p>' . DI::l10n()->t('An error occured: ') . $e->getMessage() . '</p>';
 			}
 		}
 	}
@@ -415,10 +424,10 @@ function twitter_hook_fork(App $a, array &$b)
 		return;
 	}
 
-	if (PConfig::get($post['uid'], 'twitter', 'import')) {
+	if (DI::pConfig()->get($post['uid'], 'twitter', 'import')) {
 		// Don't fork if it isn't a reply to a twitter post
 		if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::TWITTER])) {
-			Logger::log('No twitter parent found for item ' . $post['id']);
+			Logger::notice('No twitter parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -441,11 +450,11 @@ function twitter_post_local(App $a, array &$b)
 		return;
 	}
 
-	$twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
+	$twitter_post = intval(DI::pConfig()->get(local_user(), 'twitter', 'post'));
 	$twitter_enable = (($twitter_post && !empty($_REQUEST['twitter_enable'])) ? intval($_REQUEST['twitter_enable']) : 0);
 
 	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'twitter', 'post_by_default'))) {
 		$twitter_enable = 1;
 	}
 
@@ -462,10 +471,10 @@ function twitter_post_local(App $a, array &$b)
 
 function twitter_action(App $a, $uid, $pid, $action)
 {
-	$ckey = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$ckey = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
@@ -494,7 +503,7 @@ function twitter_action(App $a, $uid, $pid, $action)
 function twitter_post_hook(App $a, array &$b)
 {
 	// Post to Twitter
-	if (!PConfig::get($b["uid"], 'twitter', 'import')
+	if (!DI::pConfig()->get($b["uid"], 'twitter', 'import')
 		&& ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
 		return;
 	}
@@ -546,11 +555,11 @@ function twitter_post_hook(App $a, array &$b)
 		}
 	}
 
-	if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
+	if (($b['verb'] == Activity::POST) && $b['deleted']) {
 		twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
 	}
 
-	if ($b['verb'] == ACTIVITY_LIKE) {
+	if ($b['verb'] == Activity::LIKE) {
 		Logger::log("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");
@@ -574,14 +583,14 @@ 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');
+	DI::pConfig()->load($b['uid'], 'twitter');
 
-	$ckey    = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
+	$ckey    = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken  = DI::pConfig()->get($b['uid'], 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($b['uid'], 'twitter', 'oauthsecret');
 
 	if ($ckey && $csecret && $otoken && $osecret) {
 		Logger::log('twitter: we have customer key and oauth stuff, going to send.', Logger::DEBUG);
@@ -591,6 +600,10 @@ function twitter_post_hook(App $a, array &$b)
 			return;
 		}
 
+		Codebird::setConsumerKey($ckey, $csecret);
+		$cb = Codebird::getInstance();
+		$cb->setToken($otoken, $osecret);
+
 		$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 		// Set the timeout for upload to 30 seconds
@@ -609,58 +622,68 @@ 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', ['id' => $b['id'], 'message' => $msgarr]);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") && isset($msgarr["title"])) {
 			$msg = Plaintext::shorten($msgarr["title"], $max_char - 50);
 		}
 
-		$image = "";
-
-		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+		if (!empty($msgarr['url']) && ($msgarr['url'] == $b['plink']) && !empty($msgarr['images']) && (count($msgarr['images']) <= 4)) {
+			$url_added = false;
+		} elseif (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
 			$msg .= "\n" . $msgarr["url"];
 			$url_added = true;
 		} else {
 			$url_added = false;
 		}
 
-		if (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
-			$image = $msgarr["image"];
-		}
-
 		if (empty($msg)) {
+			Logger::info('Empty message', ['id' => $b['id']]);
 			return;
 		}
 
 		// and now tweet it :-)
 		$post = [];
 
-		if (!empty($image)) {
+		if (!empty($msgarr['images'])) {
+			Logger::info('Got images', ['id' => $b['id'], 'images' => $msgarr['images']]);
 			try {
-				$img_str = Network::fetchUrl($image);
+				$media_ids = [];
+				foreach ($msgarr['images'] as $image) {
+					if (count($media_ids) == 4) {
+						continue;
+					}
 
-				$tempfile = tempnam(get_temppath(), 'cache');
-				file_put_contents($tempfile, $img_str);
+					$img_str = Network::fetchUrl($image['url']);
 
-				$media = $connection->upload('media/upload', ['media' => $tempfile]);
+					$tempfile = tempnam(get_temppath(), 'cache');
+					file_put_contents($tempfile, $img_str);
 
-				unlink($tempfile);
+					Logger::info('Uploading', ['id' => $b['id'], 'image' => $image['url']]);
+					$media = $connection->upload('media/upload', ['media' => $tempfile]);
 
-				if (isset($media->media_id_string)) {
-					$post['media_ids'] = $media->media_id_string;
-				} else {
-					throw new Exception('Failed upload of ' . $image);
-				}
-			} catch (Exception $e) {
-				Logger::log('Exception when trying to send to Twitter: ' . $e->getMessage());
+					unlink($tempfile);
 
-				// Workaround: Remove the picture link so that the post can be reposted without it
-				// When there is another url already added, a second url would be superfluous.
-				if (!$url_added) {
-					$msg .= "\n" . $image;
-				}
+					if (isset($media->media_id_string)) {
+						$media_ids[] = $media->media_id_string;
 
-				$image = "";
+						if (!empty($image['description'])) {
+							$data = ['media_id' => $media->media_id_string,
+								'alt_text' => ['text' => substr($image['description'], 0, 420)]];
+							$ret = $cb->media_metadata_create($data);
+							Logger::info('Metadata create', ['id' => $b['id'], 'data' => $data, 'return' => json_encode($ret)]);
+						}
+					} else {
+						throw new Exception('Failed upload', ['id' => $b['id'], 'image' => $image['url']]);
+					}
+				}
+				$post['media_ids'] = implode(',', $media_ids);
+				if (empty($post['media_ids'])) {
+					unset($post['media_ids']);
+				}
+			} catch (Exception $e) {
+				Logger::info('Exception when trying to send to Twitter', ['id' => $b['id'], 'message' => $e->getMessage()]);
 			}
 		}
 
@@ -672,26 +695,17 @@ function twitter_post_hook(App $a, array &$b)
 
 		$url = 'statuses/update';
 		$result = $connection->post($url, $post);
-		Logger::log('twitter_post send, result: ' . print_r($result, true), Logger::DEBUG);
+		Logger::info('twitter_post send', ['id' => $b['id'], 'result' => $result]);
 
 		if (!empty($result->source)) {
-			Config::set("twitter", "application_name", strip_tags($result->source));
+			DI::config()->set("twitter", "application_name", strip_tags($result->source));
 		}
 
 		if (!empty($result->errors)) {
-			Logger::log('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
-
-			$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
-			if (DBA::isResult($r)) {
-				$a->contact = $r[0]["id"];
-			}
-
-			$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]);
-
-			Queue::add($a->contact, Protocol::TWITTER, $s);
-			notice(L10n::t('Twitter post failed. Queued for retry.') . EOL);
+			Logger::info('Send to Twitter failed', ['id' => $b['id'], 'error' => $result->errors]);
+			Worker::defer();
 		} elseif ($iscomment) {
-			Logger::log('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
+			Logger::info('Update extid', ['id' => $b['id'], 'extid' => $result->id_str]);
 			Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);
 		}
 	}
@@ -701,9 +715,9 @@ function twitter_addon_admin_post(App $a)
 {
 	$consumerkey    = !empty($_POST['consumerkey'])    ? Strings::escapeTags(trim($_POST['consumerkey']))    : '';
 	$consumersecret = !empty($_POST['consumersecret']) ? Strings::escapeTags(trim($_POST['consumersecret'])) : '';
-	Config::set('twitter', 'consumerkey', $consumerkey);
-	Config::set('twitter', 'consumersecret', $consumersecret);
-	info(L10n::t('Settings updated.') . EOL);
+	DI::config()->set('twitter', 'consumerkey', $consumerkey);
+	DI::config()->set('twitter', 'consumersecret', $consumersecret);
+	info(DI::l10n()->t('Settings updated.') . EOL);
 }
 
 function twitter_addon_admin(App $a, &$o)
@@ -711,18 +725,18 @@ function twitter_addon_admin(App $a, &$o)
 	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/twitter/");
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => L10n::t('Save Settings'),
+		'$submit' => DI::l10n()->t('Save Settings'),
 		// name, label, value, help, [extra values]
-		'$consumerkey' => ['consumerkey', L10n::t('Consumer key'), Config::get('twitter', 'consumerkey'), ''],
-		'$consumersecret' => ['consumersecret', L10n::t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''],
+		'$consumerkey' => ['consumerkey', DI::l10n()->t('Consumer key'), DI::config()->get('twitter', 'consumerkey'), ''],
+		'$consumersecret' => ['consumersecret', DI::l10n()->t('Consumer secret'), DI::config()->get('twitter', 'consumersecret'), ''],
 	]);
 }
 
 function twitter_cron(App $a)
 {
-	$last = Config::get('twitter', 'last_poll');
+	$last = DI::config()->get('twitter', 'last_poll');
 
-	$poll_interval = intval(Config::get('twitter', 'poll_interval'));
+	$poll_interval = intval(DI::config()->get('twitter', 'poll_interval'));
 	if (!$poll_interval) {
 		$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
 	}
@@ -730,21 +744,21 @@ function twitter_cron(App $a)
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::log('twitter: poll intervall not reached');
+			Logger::notice('twitter: poll intervall not reached');
 			return;
 		}
 	}
-	Logger::log('twitter: cron_start');
+	Logger::notice('twitter: cron_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			Logger::log('twitter: fetching for user ' . $rr['uid']);
-			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
+			Logger::notice('Fetching', ['user' => $rr['uid']]);
+			Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
 		}
 	}
 
-	$abandon_days = intval(Config::get('system', 'account_abandon_days'));
+	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
 		$abandon_days = 0;
 	}
@@ -757,17 +771,17 @@ function twitter_cron(App $a)
 			if ($abandon_days != 0) {
 				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
 				if (!DBA::isResult($user)) {
-					Logger::log('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
+					Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $rr['uid']]);
 					continue;
 				}
 			}
 
-			Logger::log('twitter: importing timeline from user ' . $rr['uid']);
-			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
+			Logger::notice('importing timeline', ['user' => $rr['uid']]);
+			Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
 			/*
 			  // To-Do
 			  // check for new contacts once a day
-			  $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
+			  $last_contact_check = DI::pConfig()->get($rr['uid'],'pumpio','contact_check');
 			  if($last_contact_check)
 			  $next_contact_check = $last_contact_check + 86400;
 			  else
@@ -775,20 +789,20 @@ function twitter_cron(App $a)
 
 			  if($next_contact_check <= time()) {
 			  pumpio_getallusers($a, $rr["uid"]);
-			  PConfig::set($rr['uid'],'pumpio','contact_check',time());
+			  DI::pConfig()->set($rr['uid'],'pumpio','contact_check',time());
 			  }
 			 */
 		}
 	}
 
-	Logger::log('twitter: cron_end');
+	Logger::notice('twitter: cron_end');
 
-	Config::set('twitter', 'last_poll', time());
+	DI::config()->set('twitter', 'last_poll', time());
 }
 
 function twitter_expire(App $a)
 {
-	$days = Config::get('twitter', 'expire');
+	$days = DI::config()->get('twitter', 'expire');
 
 	if ($days == 0) {
 		return;
@@ -800,17 +814,17 @@ function twitter_expire(App $a)
 	}
 	DBA::close($r);
 
-	Logger::log('twitter_expire: expire_start');
+	Logger::notice('twitter_expire: expire_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			Logger::log('twitter_expire: user ' . $rr['uid']);
+			Logger::notice('twitter_expire', ['user' => $rr['uid']]);
 			Item::expire($rr['uid'], $days, Protocol::TWITTER, true);
 		}
 	}
 
-	Logger::log('twitter_expire: expire_end');
+	Logger::notice('twitter_expire: expire_end');
 }
 
 function twitter_prepare_body(App $a, array &$b)
@@ -822,7 +836,7 @@ function twitter_prepare_body(App $a, array &$b)
 	if ($b["preview"]) {
 		$max_char = 280;
 		$item = $b["item"];
-		$item["plink"] = $a->getBaseURL() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
+		$item["plink"] = DI::baseUrl()->get() . "/display/" . $item["guid"];
 
 		$condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
 		$orig_post = Item::selectFirst(['author-link'], $condition);
@@ -914,16 +928,16 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
 
 function twitter_fetchtimeline(App $a, $uid)
 {
-	$ckey    = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
-	$lastid  = PConfig::get($uid, 'twitter', 'lastid');
+	$ckey    = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken  = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
+	$lastid  = DI::pConfig()->get($uid, 'twitter', 'lastid');
 
-	$application_name = Config::get('twitter', 'application_name');
+	$application_name = DI::config()->get('twitter', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$has_picture = false;
@@ -933,7 +947,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 == "");
 
@@ -944,12 +958,12 @@ function twitter_fetchtimeline(App $a, $uid)
 	try {
 		$items = $connection->get('statuses/user_timeline', $parameters);
 	} catch (TwitterOAuthException $e) {
-		Logger::log('Error fetching timeline for user ' . $uid . ': ' . $e->getMessage());
+		Logger::notice('Error fetching timeline', ['user' => $uid, 'message' => $e->getMessage()]);
 		return;
 	}
 
 	if (!is_array($items)) {
-		Logger::log('No items for user ' . $uid, Logger::INFO);
+		Logger::notice('No items', ['user' => $uid]);
 		return;
 	}
 
@@ -961,7 +975,7 @@ function twitter_fetchtimeline(App $a, $uid)
 		foreach ($posts as $post) {
 			if ($post->id_str > $lastid) {
 				$lastid = $post->id_str;
-				PConfig::set($uid, 'twitter', 'lastid', $lastid);
+				DI::pConfig()->set($uid, 'twitter', 'lastid', $lastid);
 			}
 
 			if ($first_time) {
@@ -986,75 +1000,15 @@ function twitter_fetchtimeline(App $a, $uid)
 			}
 		}
 	}
-	PConfig::set($uid, 'twitter', 'lastid', $lastid);
+	DI::pConfig()->set($uid, 'twitter', 'lastid', $lastid);
 	Logger::log('Last ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG);
 }
 
-function twitter_queue_hook(App $a)
-{
-	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
-		DBA::escape(Protocol::TWITTER)
-	);
-	if (!DBA::isResult($qi)) {
-		return;
-	}
-
-	foreach ($qi as $x) {
-		if ($x['network'] !== Protocol::TWITTER) {
-			continue;
-		}
-
-		Logger::log('twitter_queue: run');
-
-		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
-			intval($x['cid'])
-		);
-		if (!DBA::isResult($r)) {
-			continue;
-		}
-
-		$user = $r[0];
-
-		$ckey    = Config::get('twitter', 'consumerkey');
-		$csecret = Config::get('twitter', 'consumersecret');
-		$otoken  = PConfig::get($user['uid'], 'twitter', 'oauthtoken');
-		$osecret = PConfig::get($user['uid'], 'twitter', 'oauthsecret');
-
-		$success = false;
-
-		if ($ckey && $csecret && $otoken && $osecret) {
-			Logger::log('twitter_queue: able to post');
-
-			$z = unserialize($x['content']);
-
-			$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
-			$result = $connection->post($z['url'], $z['post']);
-
-			Logger::log('twitter_queue: post result: ' . print_r($result, true), Logger::DEBUG);
-
-			if ($result->errors) {
-				Logger::log('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
-			} else {
-				$success = true;
-				Queue::removeItem($x['id']);
-			}
-		} else {
-			Logger::log("twitter_queue: Error getting tokens for user " . $user['uid']);
-		}
-
-		if (!$success) {
-			Logger::log('twitter_queue: delayed');
-			Queue::updateTime($x['id']);
-		}
-	}
-}
-
 function twitter_fix_avatar($avatar)
 {
 	$new_avatar = str_replace("_normal.", ".", $avatar);
 
-	$info = Image::getInfoFromURL($new_avatar);
+	$info = Images::getInfoFromURLCached($new_avatar);
 	if (!$info) {
 		$new_avatar = $avatar;
 	}
@@ -1072,12 +1026,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];
@@ -1090,6 +1038,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 
 	$contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]);
 	if (!DBA::isResult($contact) && !$create_user) {
+		Logger::info('User contact not found', ['uid' => $uid, 'twitter-id' => $data->id_str]);
 		return 0;
 	}
 
@@ -1145,10 +1094,10 @@ function twitter_fetch_contact($uid, $data, $create_user)
 
 function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 {
-	$ckey = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$ckey = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
 
 	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid));
@@ -1194,7 +1143,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 	$tags_arr = [];
 
 	foreach ($item->entities->hashtags AS $hashtag) {
-		$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]';
+		$url = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]';
 		$tags_arr['#' . $hashtag->text] = $url;
 		$body = str_replace('#' . $hashtag->text, $url, $body);
 	}
@@ -1216,7 +1165,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 
 			if ($url->url && $url->expanded_url && $url->display_url) {
 				// Quote tweet, we just remove the quoted tweet URL from the body, the share block will be added later.
-				if (isset($item->quoted_status_id_str)
+				if (!empty($item->quoted_status) && isset($item->quoted_status_id_str)
 					&& substr($url->expanded_url, -strlen($item->quoted_status_id_str)) == $item->quoted_status_id_str ) {
 					$body = str_replace($url->url, '', $body);
 					continue;
@@ -1252,7 +1201,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 				} elseif ($oembed_data->type != 'link') {
 					$body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body);
 				} else {
-					$img_str = Network::fetchUrl($final_url, true, $redirects, 4);
+					$img_str = Network::fetchUrl($final_url, true, 4);
 
 					$tempfile = tempnam(get_temppath(), 'cache');
 					file_put_contents($tempfile, $img_str);
@@ -1327,7 +1276,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 				}
 
 				$basetag = str_replace('_', ' ', substr($tag, 1));
-				$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
+				$url = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
 				$body = str_replace($tag, $url, $body);
 				$tags_arr['#' . $basetag] = $url;
 			} elseif (strpos($tag, '@') === 0) {
@@ -1386,13 +1335,25 @@ function twitter_media_entities($post, array &$postarray)
 		}
 		switch ($medium->type) {
 			case 'photo':
-				$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
-				$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
+				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\ObjectType::IMAGE;
 				break;
 			case 'video':
 			case 'animated_gif':
-				$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
-				$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
+				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\ObjectType::VIDEO;
 				if (is_array($medium->video_info->variants)) {
 					$bitrate = 0;
 					// We take the video with the highest bitrate
@@ -1449,15 +1410,15 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 			$postarray['thr-parent'] = $parent_item['uri'];
 			$postarray['parent-uri'] = $parent_item['parent-uri'];
 			$postarray['parent'] = $parent_item['parent'];
-			$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
+			$postarray['object-type'] = Activity\ObjectType::COMMENT;
 		} else {
 			$postarray['thr-parent'] = $postarray['uri'];
 			$postarray['parent-uri'] = $postarray['uri'];
-			$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+			$postarray['object-type'] = Activity\ObjectType::NOTE;
 		}
 
 		// Is it me?
-		$own_id = PConfig::get($uid, 'twitter', 'own_id');
+		$own_id = DI::pConfig()->get($uid, 'twitter', 'own_id');
 
 		if ($post->user->id_str == $own_id) {
 			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
@@ -1478,7 +1439,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 		$create_user = false;
 	} else {
 		$postarray['parent-uri'] = $postarray['uri'];
-		$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+		$postarray['object-type'] = Activity\ObjectType::NOTE;
 	}
 
 	if ($contactid == 0) {
@@ -1498,7 +1459,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 
 	$postarray['contact-id'] = $contactid;
 
-	$postarray['verb'] = ACTIVITY_POST;
+	$postarray['verb'] = Activity::POST;
 	$postarray['author-name'] = $postarray['owner-name'];
 	$postarray['author-link'] = $postarray['owner-link'];
 	$postarray['author-avatar'] = $postarray['owner-avatar'];
@@ -1521,7 +1482,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 
 	// When the post contains links then use the correct object type
 	if (count($post->entities->urls) > 0) {
-		$postarray['object-type'] = ACTIVITY_OBJ_BOOKMARK;
+		$postarray['object-type'] = Activity\ObjectType::BOOKMARK;
 	}
 
 	// Search for media links
@@ -1554,34 +1515,48 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 			return [];
 		}
 
-		$retweet['source'] = $postarray['source'];
-		$retweet['private'] = $postarray['private'];
-		$retweet['allow_cid'] = $postarray['allow_cid'];
-		$retweet['contact-id'] = $postarray['contact-id'];
-		$retweet['owner-name'] = $postarray['owner-name'];
-		$retweet['owner-link'] = $postarray['owner-link'];
-		$retweet['owner-avatar'] = $postarray['owner-avatar'];
+		if (!$noquote) {
+			// Store the original tweet
+			Item::insert($retweet);
+
+			// CHange the other post into a reshare activity
+			$postarray['verb'] = Activity::ANNOUNCE;
+			$postarray['gravity'] = GRAVITY_ACTIVITY;
+			$postarray['object-type'] = Activity\ObjectType::NOTE;
 
-		$postarray = $retweet;
+			$postarray['thr-parent'] = $retweet['uri'];
+			$postarray['parent-uri'] = $retweet['uri'];
+		} else {
+			$retweet['source'] = $postarray['source'];
+			$retweet['private'] = $postarray['private'];
+			$retweet['allow_cid'] = $postarray['allow_cid'];
+			$retweet['contact-id'] = $postarray['contact-id'];
+			$retweet['owner-name'] = $postarray['owner-name'];
+			$retweet['owner-link'] = $postarray['owner-link'];
+			$retweet['owner-avatar'] = $postarray['owner-avatar'];
+
+			$postarray = $retweet;
+		}
 	}
 
 	if (!empty($post->quoted_status) && !$noquote) {
 		$quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
 
-		if (empty($quoted['body'])) {
-			return [];
+		if (!empty($quoted['body'])) {
+			$postarray['body'] .= "\n" . share_header(
+				$quoted['author-name'],
+				$quoted['author-link'],
+				$quoted['author-avatar'],
+				"",
+				$quoted['created'],
+				$quoted['plink']
+			);
+
+			$postarray['body'] .= $quoted['body'] . '[/share]';
+		} else {
+			// Quoted post author is blocked/ignored, so we just provide the link to avoid removing quote context.
+			$postarray['body'] .= "\n\nhttps://twitter.com/" . $post->quoted_status->user->screen_name . "/status/" . $post->quoted_status->id_str;
 		}
-
-		$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;
@@ -1594,7 +1569,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);
@@ -1604,7 +1579,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 		}
 
 		if (empty($post)) {
-			Logger::log("twitter_fetchparentposts: Can't fetch post " . $parameters->id, Logger::DEBUG);
+			Logger::log("twitter_fetchparentposts: Can't fetch post " . $parameters['id'], Logger::DEBUG);
 			break;
 		}
 
@@ -1626,7 +1601,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 
 	if (!empty($posts)) {
 		foreach ($posts as $post) {
-			$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
+			$postarray = twitter_createpost($a, $uid, $post, $self, false, !DI::pConfig()->get($uid, 'twitter', 'create_user'), false);
 
 			if (empty($postarray['body'])) {
 				continue;
@@ -1643,19 +1618,19 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 
 function twitter_fetchhometimeline(App $a, $uid)
 {
-	$ckey    = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
-	$create_user = PConfig::get($uid, 'twitter', 'create_user');
-	$mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
+	$ckey    = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken  = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
+	$create_user = DI::pConfig()->get($uid, 'twitter', 'create_user');
+	$mirror_posts = DI::pConfig()->get($uid, 'twitter', 'mirror_posts');
 
 	Logger::log("Fetching timeline for user " . $uid, Logger::DEBUG);
 
-	$application_name = Config::get('twitter', 'application_name');
+	$application_name = DI::config()->get('twitter', 'application_name');
 
 	if ($application_name == "") {
-		$application_name = $a->getHostName();
+		$application_name = DI::baseUrl()->getHostname();
 	}
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
@@ -1684,10 +1659,10 @@ 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');
+	$lastid = DI::pConfig()->get($uid, 'twitter', 'lasthometimelineid');
 
 	$first_time = ($lastid == "");
 
@@ -1720,7 +1695,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 		foreach ($posts as $post) {
 			if ($post->id_str > $lastid) {
 				$lastid = $post->id_str;
-				PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
+				DI::pConfig()->set($uid, 'twitter', 'lasthometimelineid', $lastid);
 			}
 
 			if ($first_time) {
@@ -1765,12 +1740,12 @@ function twitter_fetchhometimeline(App $a, $uid)
 			Logger::log('User ' . $uid . ' posted home timeline item ' . $item);
 		}
 	}
-	PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
+	DI::pConfig()->set($uid, 'twitter', 'lasthometimelineid', $lastid);
 
 	Logger::log('Last timeline ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG);
 
 	// Fetching mentions
-	$lastid = PConfig::get($uid, 'twitter', 'lastmentionid');
+	$lastid = DI::pConfig()->get($uid, 'twitter', 'lastmentionid');
 
 	$first_time = ($lastid == "");
 
@@ -1808,7 +1783,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 				twitter_fetchparentposts($a, $uid, $post, $connection, $self);
 			}
 
-			$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
+			$postarray = twitter_createpost($a, $uid, $post, $self, false, !$create_user, false);
 
 			if (empty($postarray['body'])) {
 				continue;
@@ -1820,19 +1795,19 @@ function twitter_fetchhometimeline(App $a, $uid)
 		}
 	}
 
-	PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
+	DI::pConfig()->set($uid, 'twitter', 'lastmentionid', $lastid);
 
 	Logger::log('Last mentions ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG);
 }
 
 function twitter_fetch_own_contact(App $a, $uid)
 {
-	$ckey    = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$ckey    = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken  = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
 
-	$own_id = PConfig::get($uid, 'twitter', 'own_id');
+	$own_id = DI::pConfig()->get($uid, 'twitter', 'own_id');
 
 	$contact_id = 0;
 
@@ -1846,7 +1821,7 @@ function twitter_fetch_own_contact(App $a, $uid)
 			return false;
 		}
 
-		PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
+		DI::pConfig()->set($uid, 'twitter', 'own_id', $user->id_str);
 
 		$contact_id = twitter_fetch_contact($uid, $user, true);
 	} else {
@@ -1856,7 +1831,7 @@ function twitter_fetch_own_contact(App $a, $uid)
 		if (DBA::isResult($r)) {
 			$contact_id = $r[0]["id"];
 		} else {
-			PConfig::delete($uid, 'twitter', 'own_id');
+			DI::pConfig()->delete($uid, 'twitter', 'own_id');
 		}
 	}
 
@@ -1902,10 +1877,10 @@ function twitter_is_retweet(App $a, $uid, $body)
 
 	Logger::log('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, Logger::DEBUG);
 
-	$ckey    = Config::get('twitter', 'consumerkey');
-	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
-	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$ckey    = DI::config()->get('twitter', 'consumerkey');
+	$csecret = DI::config()->get('twitter', 'consumersecret');
+	$otoken  = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
+	$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 	$result = $connection->post('statuses/retweet/' . $id);
@@ -1938,7 +1913,7 @@ function twitter_update_mentions($body)
 function twitter_convert_share(array $attributes, array $author_contact, $content, $is_quote_share)
 {
 	if ($author_contact['network'] == Protocol::TWITTER) {
-		$mention = '@' . $author_contact['nickname'];
+		$mention = '@' . $author_contact['nick'];
 	} else {
 		$mention = $author_contact['addr'];
 	}