X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=5168aa0ecfda12c57df03abcb4ea64f2ffa13173;hb=f1514063559930de791c0bff18a3f6ae4b455f7c;hp=ca5da52ff0bcb69f57f596ad08e41e6e657dec01;hpb=2cbf89c0f5e15774ebd0d08fe7914e7a633aca89;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index ca5da52f..5168aa0e 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: Twitter Connector
  * Description: Bidirectional (posting, relaying and reading) connector for Twitter.
@@ -33,7 +32,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-/*   Twitter Plugin for Friendica
+/*   Twitter Addon for Friendica
  *
  *   Author: Tobias Diekershoff
  *           tobias.diekershoff@gmx.net
@@ -41,7 +40,7 @@
  *   License:3-clause BSD license
  *
  *   Configuration:
- *     To use this plugin you need a OAuth Consumer key pair (key & secret)
+ *     To use this addon you need a OAuth Consumer key pair (key & secret)
  *     you can get it from Twitter at https://twitter.com/apps
  *
  *     Register your Friendica site as "Client" application with "Read & Write" access
@@ -53,23 +52,29 @@
  *     $a->config['twitter']['consumerkey'] = 'your consumer_key here';
  *     $a->config['twitter']['consumersecret'] = 'your consumer_secret here';
  *
- *     To activate the plugin itself add it to the $a->config['system']['addon']
+ *     To activate the addon itself add it to the $a->config['system']['addon']
  *     setting. After this, your user can configure their Twitter account settings
- *     from "Settings -> Plugin Settings".
+ *     from "Settings -> Addon Settings".
  *
  *     Requirements: PHP5, curl [Slinky library]
  */
 
 use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Photo;
+use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Object\Image;
+use Friendica\Util\Network;
 
 require_once 'include/enotify.php';
 
@@ -78,38 +83,38 @@ define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 function twitter_install()
 {
 	//  we need some hooks, for the configuration and for sending tweets
-	register_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
-	register_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
-	register_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
-	register_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
-	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');
-	register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
-	register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
-	register_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
+	Addon::registerHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
+	Addon::registerHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
+	Addon::registerHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
+	Addon::registerHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
+	Addon::registerHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
+	Addon::registerHook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
+	Addon::registerHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
+	Addon::registerHook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
+	Addon::registerHook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
+	Addon::registerHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
+	Addon::registerHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
 	logger("installed twitter");
 }
 
 function twitter_uninstall()
 {
-	unregister_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
-	unregister_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
-	unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
-	unregister_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
-	unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
-	unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
-	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');
-	unregister_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
+	Addon::unregisterHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
+	Addon::unregisterHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
+	Addon::unregisterHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
+	Addon::unregisterHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
+	Addon::unregisterHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
+	Addon::unregisterHook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
+	Addon::unregisterHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
+	Addon::unregisterHook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
+	Addon::unregisterHook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
+	Addon::unregisterHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
+	Addon::unregisterHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
 
 	// old setting - remove only
-	unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
-	unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings');
-	unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
+	Addon::unregisterHook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
+	Addon::unregisterHook('addon_settings', 'addon/twitter/twitter.php', 'twitter_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
 }
 
 function twitter_check_item_notification(App $a, &$notification_data)
@@ -151,7 +156,7 @@ function twitter_follow(App $a, &$contact)
 	$cb->setConsumerKey($ckey, $csecret);
 	$cb->setToken($otoken, $osecret);
 
-	$parameters = array();
+	$parameters = [];
 	$parameters["screen_name"] = $nickname;
 
 	$user = $cb->friendships_create($parameters);
@@ -178,7 +183,7 @@ function twitter_jot_nets(App $a, &$b)
 		$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" /> '
-			. t('Post to Twitter') . '</div>';
+			. L10n::t('Post to Twitter') . '</div>';
 	}
 }
 
@@ -225,7 +230,7 @@ function twitter_settings_post(App $a, $post)
 			PConfig::set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']);
 			PConfig::set(local_user(), 'twitter', 'post', 1);
 			//  reload the Addon Settings page, if we don't do it see Bug #42
-			goaway($a->get_baseurl() . '/settings/connectors');
+			goaway('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
@@ -239,7 +244,7 @@ function twitter_settings_post(App $a, $post)
 				PConfig::delete(local_user(), 'twitter', 'lastid');
 			}
 
-			info(t('Twitter settings updated.') . EOL);
+			info(L10n::t('Twitter settings updated.') . EOL);
 		}
 	}
 }
@@ -259,25 +264,21 @@ function twitter_settings(App $a, &$s)
 	$csecret = Config::get('twitter', 'consumersecret' );
 	$otoken  = PConfig::get(local_user(), 'twitter', 'oauthtoken'  );
 	$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
-	$enabled = PConfig::get(local_user(), 'twitter', 'post');
-	$checked = (($enabled) ? ' checked="checked" ' : '');
-	$defenabled = PConfig::get(local_user(), 'twitter', 'post_by_default');
-	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
-	$mirrorenabled = PConfig::get(local_user(), 'twitter', 'mirror_posts');
-	$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-	$importenabled = PConfig::get(local_user(), 'twitter', 'import');
-	$importchecked = (($importenabled) ? ' checked="checked" ' : '');
-	$create_userenabled = PConfig::get(local_user(), 'twitter', 'create_user');
-	$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
+
+	$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'));
 
 	$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">' . t('Twitter Import/Export/Mirror') . '</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . 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">' . t('Twitter Import/Export/Mirror') . '</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . L10n::t('Twitter Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 
 	if ((!$ckey) && (!$csecret)) {
@@ -285,7 +286,7 @@ function twitter_settings(App $a, &$s)
 		 * no global consumer keys
 		 * display warning and skip personal config
 		 */
-		$s .= '<p>' . t('No consumer key pair for Twitter found. Please contact your site administrator.') . '</p>';
+		$s .= '<p>' . 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
@@ -304,15 +305,15 @@ function twitter_settings(App $a, &$s)
 			/*			 * *
 			 *  make some nice form
 			 */
-			$s .= '<p>' . t('At this Friendica instance the Twitter plugin 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->getAuthorizeURL($token) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . t('Log in with Twitter') . '"></a>';
+			$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->getAuthorizeURL($token) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
 			$s .= '<div id="twitter-pin-wrapper">';
-			$s .= '<label id="twitter-pin-label" for="twitter-pin">' . t('Copy the PIN from Twitter here') . '</label>';
+			$s .= '<label id="twitter-pin-label" for="twitter-pin">' . 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="' . $token . '" />';
 			$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $request_token['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="' . t('Save Settings') . '" /></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
 		} else {
 			/*			 * *
 			 *  we have an OAuth key / secret pair for the user
@@ -321,37 +322,41 @@ function twitter_settings(App $a, &$s)
 			require_once 'library/twitteroauth.php';
 			$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 			$details = $connection->get('account/verify_credentials');
-			$s .= '<div id="twitter-info" ><img id="twitter-avatar" src="' . $details->profile_image_url . '" /><p id="twitter-info-block">' . t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
-			$s .= '<p>' . 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.') . '</p>';
-			if ($a->user['hidewall']) {
-				$s .= '<p>' . t('<strong>Note</strong>: Due 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 .= '<div id="twitter-enable-wrapper">';
-			$s .= '<label id="twitter-enable-label" for="twitter-checkbox">' . t('Allow posting to Twitter') . '</label>';
-			$s .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
-			$s .= '<div class="clear"></div>';
-			$s .= '<label id="twitter-default-label" for="twitter-default">' . t('Send public postings to Twitter by default') . '</label>';
-			$s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
-			$s .= '<div class="clear"></div>';
 
-			$s .= '<label id="twitter-mirror-label" for="twitter-mirror">' . t('Mirror all posts from twitter that are no replies') . '</label>';
-			$s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" ' . $mirrorchecked . '/>';
+			$field_checkbox = get_markup_template('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>
+				</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>';
 			$s .= '<div class="clear"></div>';
-			$s .= '</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 .= replace_macros($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.')]
+			]);
+			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 .= replace_macros($field_checkbox, [
+				'$field' => ['twitter-default', L10n::t('Send public postings to Twitter by default'), $defenabled, '']
+			]);
+			$s .= replace_macros($field_checkbox, [
+				'$field' => ['twitter-mirror', L10n::t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
+			]);
+			$s .= replace_macros($field_checkbox, [
+				'$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
+			]);
+			$s .= replace_macros($field_checkbox, [
+				'$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, '']
+			]);
 
-			$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" />';
-			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
 		}
 	}
 	$s .= '</div><div class="clear"></div>';
@@ -399,7 +404,7 @@ function twitter_action(App $a, $uid, $pid, $action)
 	$cb->setConsumerKey($ckey, $csecret);
 	$cb->setToken($otoken, $osecret);
 
-	$post = array('id' => $pid);
+	$post = ['id' => $pid];
 
 	logger("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), LOGGER_DATA);
 
@@ -420,8 +425,6 @@ function twitter_action(App $a, $uid, $pid, $action)
 function twitter_post_hook(App $a, &$b)
 {
 	// Post to Twitter
-	require_once "include/network.php";
-
 	if (!PConfig::get($b["uid"], 'twitter', 'import')
 		&& ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
 		return;
@@ -468,7 +471,7 @@ function twitter_post_hook(App $a, &$b)
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
@@ -522,12 +525,11 @@ function twitter_post_hook(App $a, &$b)
 		$tweet = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 		$max_char = 280;
-		require_once "include/plaintext.php";
-		$msgarr = plaintext($a, $b, $max_char, true, 8);
+		$msgarr = BBCode::toPlaintext($b, $max_char, true, 8);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") && isset($msgarr["title"])) {
-			$msg = shortenmsg($msgarr["title"], $max_char - 50);
+			$msg = Plaintext::shorten($msgarr["title"], $max_char - 50);
 		}
 
 		$image = "";
@@ -542,7 +544,7 @@ function twitter_post_hook(App $a, &$b)
 
 		// and now tweet it :-)
 		if (strlen($msg) && ($image != "")) {
-			$img_str = fetch_url($image);
+			$img_str = Network::fetchUrl($image);
 
 			$tempfile = tempnam(get_temppath(), "cache");
 			file_put_contents($tempfile, $img_str);
@@ -557,7 +559,7 @@ function twitter_post_hook(App $a, &$b)
 			$cb->setConsumerKey($ckey, $csecret);
 			$cb->setToken($otoken, $osecret);
 
-			$post = array('status' => $msg, 'media[]' => $tempfile);
+			$post = ['status' => $msg, 'media[]' => $tempfile];
 
 			if ($iscomment) {
 				$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
@@ -591,12 +593,11 @@ function twitter_post_hook(App $a, &$b)
 		if (strlen($msg) && ($image == "")) {
 // -----------------
 			$max_char = 280;
-			require_once "include/plaintext.php";
-			$msgarr = plaintext($a, $b, $max_char, true, 8);
+			$msgarr = BBCode::toPlaintext($b, $max_char, true, 8);
 			$msg = $msgarr["text"];
 
 			if (($msg == "") && isset($msgarr["title"])) {
-				$msg = shortenmsg($msgarr["title"], $max_char - 50);
+				$msg = Plaintext::shorten($msgarr["title"], $max_char - 50);
 			}
 
 			if (isset($msgarr["url"])) {
@@ -604,7 +605,7 @@ function twitter_post_hook(App $a, &$b)
 			}
 // -----------------
 			$url = 'statuses/update';
-			$post = array('status' => $msg, 'weighted_character_count' => 'true');
+			$post = ['status' => $msg, 'weighted_character_count' => 'true'];
 
 			if ($iscomment) {
 				$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
@@ -625,10 +626,10 @@ function twitter_post_hook(App $a, &$b)
 					$a->contact = $r[0]["id"];
 				}
 
-				$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $post));
-				require_once 'include/queue_fn.php';
-				add_to_queue($a->contact, NETWORK_TWITTER, $s);
-				notice(t('Twitter post failed. Queued for retry.') . EOL);
+				$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]);
+				
+				Queue::add($a->contact, NETWORK_TWITTER, $s);
+				notice(L10n::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' WHERE `id` = %d",
@@ -640,25 +641,25 @@ function twitter_post_hook(App $a, &$b)
 	}
 }
 
-function twitter_plugin_admin_post(App $a)
+function twitter_addon_admin_post(App $a)
 {
 	$consumerkey     = x($_POST, 'consumerkey')     ? notags(trim($_POST['consumerkey']))     : '';
 	$consumersecret  = x($_POST, 'consumersecret')  ? notags(trim($_POST['consumersecret']))  : '';
 	Config::set('twitter', 'consumerkey', $consumerkey);
 	Config::set('twitter', 'consumersecret', $consumersecret);
-	info(t('Settings updated.') . EOL);
+	info(L10n::t('Settings updated.') . EOL);
 }
 
-function twitter_plugin_admin(App $a, &$o)
+function twitter_addon_admin(App $a, &$o)
 {
 	$t = get_markup_template("admin.tpl", "addon/twitter/");
 
-	$o = replace_macros($t, array(
-		'$submit' => t('Save Settings'),
+	$o = replace_macros($t, [
+		'$submit' => L10n::t('Save Settings'),
 		// name, label, value, help, [extra values]
-		'$consumerkey' => array('consumerkey', t('Consumer key'), Config::get('twitter', 'consumerkey'), ''),
-		'$consumersecret' => array('consumersecret', t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''),
-	));
+		'$consumerkey' => ['consumerkey', L10n::t('Consumer key'), Config::get('twitter', 'consumerkey'), ''],
+		'$consumersecret' => ['consumersecret', L10n::t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''],
+	]);
 }
 
 function twitter_cron(App $a, $b)
@@ -737,9 +738,9 @@ function twitter_expire(App $a, $b)
 	}
 
 	if (method_exists('dba', 'delete')) {
-		$r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER));
+		$r = dba::select('item', ['id'], ['deleted' => true, 'network' => NETWORK_TWITTER]);
 		while ($row = dba::fetch($r)) {
-			dba::delete('item', array('id' => $row['id']));
+			dba::delete('item', ['id' => $row['id']]);
 		}
 		dba::close($r);
 	} else {
@@ -769,7 +770,6 @@ function twitter_prepare_body(App $a, &$b)
 
 	if ($b["preview"]) {
 		$max_char = 280;
-		require_once "include/plaintext.php";
 		$item = $b["item"];
 		$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
 
@@ -789,7 +789,7 @@ function twitter_prepare_body(App $a, &$b)
 			}
 		}
 
-		$msgarr = plaintext($a, $item, $max_char, true, 8);
+		$msgarr = BBCode::toPlaintext($item, $max_char, true, 8);
 		$msg = $msgarr["text"];
 
 		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
@@ -825,13 +825,13 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
 
 	if (is_object($post->retweeted_status)) {
 		// We don't support nested shares, so we mustn't show quotes as shares on retweets
-		$item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true);
+		$item = twitter_createpost($a, $uid, $post->retweeted_status, ['id' => 0], false, false, true);
 
 		$datarray['body'] = "\n" . share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", $item['created'], $item['plink']);
 
 		$datarray['body'] .= $item['body'] . '[/share]';
 	} else {
-		$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
+		$item = twitter_createpost($a, $uid, $post, ['id' => 0], false, false, false);
 
 		$datarray['body'] = $item['body'];
 	}
@@ -873,7 +873,7 @@ function twitter_fetchtimeline(App $a, $uid)
 	require_once 'library/twitteroauth.php';
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
-	$parameters = array("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"];
 
 	$first_time = ($lastid == "");
 
@@ -924,8 +924,6 @@ function twitter_queue_hook(App $a, &$b)
 		return;
 	}
 
-	require_once 'include/queue_fn.php';
-
 	foreach ($qi as $x) {
 		if ($x['network'] !== NETWORK_TWITTER) {
 			continue;
@@ -971,7 +969,7 @@ function twitter_queue_hook(App $a, &$b)
 				logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 			} else {
 				$success = true;
-				remove_queue_item($x['id']);
+				Queue::removeItem($x['id']);
 			}
 		} else {
 			logger("twitter_queue: Error getting tokens for user " . $user['uid']);
@@ -979,7 +977,7 @@ function twitter_queue_hook(App $a, &$b)
 
 		if (!$success) {
 			logger('twitter_queue: delayed');
-			update_queue_time($x['id']);
+			Queue::updateTime($x['id']);
 		}
 	}
 }
@@ -1004,11 +1002,11 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 
 	$avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-	GContact::update(array("url" => "https://twitter.com/" . $contact->screen_name,
+	GContact::update(["url" => "https://twitter.com/" . $contact->screen_name,
 		"network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true,
 		"name" => $contact->name, "nick" => $contact->screen_name,
 		"location" => $contact->location, "about" => $contact->description,
-		"addr" => $contact->screen_name . "@twitter.com", "generation" => 2));
+		"addr" => $contact->screen_name . "@twitter.com", "generation" => 2]);
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
 		intval($uid), dbesc("twitter::" . $contact->id_str));
@@ -1149,7 +1147,7 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 		return;
 	}
 
-	$parameters = array();
+	$parameters = [];
 
 	if ($screen_name != "") {
 		$parameters["screen_name"] = $screen_name;
@@ -1173,8 +1171,6 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 
 function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $picture)
 {
-	require_once "include/network.php";
-
 	$tags = "";
 
 	$plain = $body;
@@ -1185,11 +1181,11 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
 		$footerlink = "";
 		$footer = "";
 
-		foreach ($item->entities->urls AS $url) {
+		foreach ($item->entities->urls as $url) {
 			$plain = str_replace($url->url, '', $plain);
 
 			if ($url->url && $url->expanded_url && $url->display_url) {
-				$expanded_url = original_url($url->expanded_url);
+				$expanded_url = Network::finalUrl($url->expanded_url);
 
 				$oembed_data = OEmbed::fetchURL($expanded_url);
 
@@ -1218,7 +1214,7 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
 				} elseif ($oembed_data->type != "link") {
 					$body = str_replace($url->url, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
 				} else {
-					$img_str = fetch_url($expanded_url, true, $redirects, 4);
+					$img_str = Network::fetchUrl($expanded_url, true, $redirects, 4);
 
 					$tempfile = tempnam(get_temppath(), "cache");
 					file_put_contents($tempfile, $img_str);
@@ -1261,10 +1257,10 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
 		}
 
 		if ($no_tags) {
-			return array("body" => $body, "tags" => "", "plain" => $plain);
+			return ["body" => $body, "tags" => "", "plain" => $plain];
 		}
 
-		$tags_arr = array();
+		$tags_arr = [];
 
 		foreach ($item->entities->hashtags AS $hashtag) {
 			$url = "#[url=" . $a->get_baseurl() . "/search?tag=" . rawurlencode($hashtag->text) . "]" . $hashtag->text . "[/url]";
@@ -1319,7 +1315,7 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
 
 		$tags = implode($tags_arr, ",");
 	}
-	return array("body" => $body, "tags" => $tags, "plain" => $plain);
+	return ["body" => $body, "tags" => $tags, "plain" => $plain];
 }
 
 /**
@@ -1351,7 +1347,7 @@ function twitter_media_entities($post, &$postarray)
 	}
 
 	// This is a pure media post, first search for all media urls
-	$media = array();
+	$media = [];
 	foreach ($post->extended_entities->media AS $medium) {
 		switch ($medium->type) {
 			case 'photo':
@@ -1388,7 +1384,7 @@ function twitter_media_entities($post, &$postarray)
 
 function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote)
 {
-	$postarray = array();
+	$postarray = [];
 	$postarray['network'] = NETWORK_TWITTER;
 	$postarray['gravity'] = 0;
 	$postarray['uid'] = $uid;
@@ -1404,7 +1400,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
 
 	if (count($r)) {
 		logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
-		return array();
+		return [];
 	}
 
 	$contactid = 0;
@@ -1453,7 +1449,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
 				$postarray['owner-avatar'] = $r[0]["photo"];
 			} else {
 				logger("No self contact for user " . $uid, LOGGER_DEBUG);
-				return array();
+				return [];
 			}
 		}
 		// Don't create accounts of people who just comment something
@@ -1475,7 +1471,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
 		$contactid = $self['id'];
 	} elseif ($contactid <= 0) {
 		logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
-		return array();
+		return [];
 	}
 
 	$postarray['contact-id'] = $contactid;
@@ -1599,7 +1595,7 @@ function twitter_checknotification(App $a, $uid, $own_id, $top_item, $postarray)
 
 			$conv_parent = $conv['parent'];
 
-			notification(array(
+			notification([
 				'type' => NOTIFY_COMMENT,
 				'notify_flags' => $user[0]['notify-flags'],
 				'language' => $user[0]['language'],
@@ -1614,7 +1610,7 @@ function twitter_checknotification(App $a, $uid, $own_id, $top_item, $postarray)
 				'verb' => ACTIVITY_POST,
 				'otype' => 'item',
 				'parent' => $conv_parent,
-			));
+			]);
 
 			// only send one notification
 			break;
@@ -1626,10 +1622,10 @@ function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_
 {
 	logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
 
-	$posts = array();
+	$posts = [];
 
 	while ($post->in_reply_to_status_id_str != "") {
-		$parameters = array("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];
 
 		$post = $connection->get('statuses/show', $parameters);
 
@@ -1725,7 +1721,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 		return;
 	}
 
-	$parameters = array("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"];
 	//$parameters["count"] = 200;
 	// Fetching timeline
 	$lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
@@ -1857,7 +1853,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 
 			if (($item != 0) && !function_exists("check_item_notification")) {
 				require_once 'include/enotify.php';
-				notification(array(
+				notification([
 					'type'         => NOTIFY_TAGSELF,
 					'notify_flags' => $u[0]['notify-flags'],
 					'language'     => $u[0]['language'],
@@ -1872,7 +1868,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 					'verb'         => ACTIVITY_TAG,
 					'otype'        => 'item',
 					'parent'       => $parent_id
-				));
+				]);
 			}
 		}
 	}