X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=statusnet%2Fstatusnet.php;h=b2582b86e496dcf64b3cd98d8a93b60d9633fc0e;hb=631b45675579edfa041c1fc6cbfd15f11c4103d4;hp=6c7aec92f82e2cc17f04f202a504d6ca3c9a0680;hpb=adada10eb624860a165b0575174a615fefa0f5ed;p=friendica-addons.git

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 6c7aec92..b2582b86 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -47,6 +47,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -58,6 +59,7 @@ use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
+use GuzzleHttp\Exception\TransferException;
 
 function statusnet_install()
 {
@@ -71,7 +73,7 @@ function statusnet_install()
 	Hook::register('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
 	Hook::register('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
 	Hook::register('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
-	Logger::log("installed GNU Social");
+	Logger::notice("installed GNU Social");
 }
 
 function statusnet_check_item_notification(App $a, &$notification_data)
@@ -105,13 +107,13 @@ function statusnet_settings_post(App $a, $post)
 		return;
 	}
 	// don't check GNU Social settings if GNU Social submit button is not clicked
-	if (empty($_POST['statusnet-submit'])) {
+	if (empty($_POST['statusnet-submit']) && empty($_POST['statusnet-disconnect'])) {
 		return;
 	}
 
-	if (isset($_POST['statusnet-disconnect'])) {
+	if (!empty($_POST['statusnet-disconnect'])) {
 		/*		 * *
-		 * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
+		 * if the GNU Social-disconnect button is clicked, clear the GNU Social configuration
 		 */
 		DI::pConfig()->delete(local_user(), 'statusnet', 'consumerkey');
 		DI::pConfig()->delete(local_user(), 'statusnet', 'consumersecret');
@@ -147,7 +149,6 @@ function statusnet_settings_post(App $a, $post)
 					}
 				}
 			}
-			DI::baseUrl()->redirect('settings/connectors');
 		} else {
 			if (isset($_POST['statusnet-consumersecret'])) {
 				//  check if we can reach the API of the GNU Social server
@@ -175,7 +176,6 @@ function statusnet_settings_post(App $a, $post)
 						notice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.') . EOL);
 					}
 				}
-				DI::baseUrl()->redirect('settings/connectors');
 			} else {
 				if (isset($_POST['statusnet-pin'])) {
 					//  if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
@@ -193,7 +193,6 @@ function statusnet_settings_post(App $a, $post)
 					DI::pConfig()->set(local_user(), 'statusnet', 'post', 1);
 					DI::pConfig()->set(local_user(), 'statusnet', 'post_taglinks', 1);
 					//  reload the Addon Settings page, if we don't do it see Bug #42
-					DI::baseUrl()->redirect('settings/connectors');
 				} else {
 					//  if no PIN is supplied in the POST variables, the user has changed the setting
 					//  to post a dent for every new __public__ posting to the wall
@@ -211,171 +210,125 @@ function statusnet_settings_post(App $a, $post)
 	}
 }
 
-function statusnet_settings(App $a, &$s)
+function statusnet_settings(App $a, array &$data)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$user = User::getById(local_user());
+	DI::page()->registerStylesheet(__DIR__ . '/statusnet.css', 'all');
 
-	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
 	/*	 * *
 	 * 1) Check that we have a base api url and a consumer key & secret
 	 * 2) If no OAuthtoken & stuff is present, generate button to get some
 	 *    allow the user to cancel the connection process at this step
 	 * 3) Checkbox for "Send public notices (respect size limitation)
 	 */
-	$api     = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi');
-	$ckey    = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey');
-	$csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret');
-	$otoken  = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken');
-	$osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret');
-	$enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post');
-	$checked = (($enabled) ? ' checked="checked" ' : '');
-	$defenabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default');
-	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
-	$mirrorenabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts');
-	$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-	$import = DI::pConfig()->get(local_user(), 'statusnet', 'import');
-	$importselected = ["", "", ""];
-	$importselected[$import] = ' selected="selected"';
-	//$importenabled = DI::pConfig()->get(local_user(),'statusnet','import');
-	//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
-	$create_userenabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user');
-	$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
-
-	$css = (($enabled) ? '' : '-disabled');
-
-	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . DI::l10n()->t('GNU Social Import/Export/Mirror') . '</h3>';
-	$s .= '</span>';
-	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
-	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . DI::l10n()->t('GNU Social Import/Export/Mirror') . '</h3>';
-	$s .= '</span>';
-
-	if ((!$ckey) && (!$csecret)) {
-		/*		 * *
-		 * no consumer keys
-		 */
-		$globalsn = DI::config()->get('statusnet', 'sites');
-		/*		 * *
-		 * lets check if we have one or more globally configured GNU Social
-		 * server OAuth credentials in the configuration. If so offer them
-		 * with a little explanation to the user as choice - otherwise
-		 * ignore this option entirely.
-		 */
-		if (!$globalsn == null) {
-			$s .= '<h4>' . DI::l10n()->t('Globally Available GNU Social OAuthKeys') . '</h4>';
-			$s .= '<p>' . DI::l10n()->t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") . '</p>';
-			$s .= '<div id="statusnet-preconf-wrapper">';
-			foreach ($globalsn as $asn) {
-				$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="' . $asn['apiurl'] . '">' . $asn['sitename'] . '<br />';
-			}
-			$s .= '<p></p><div class="clear"></div></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
-		}
-		$s .= '<h4>' . DI::l10n()->t('Provide your own OAuth Credentials') . '</h4>';
-		$s .= '<p>' . DI::l10n()->t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') . '</p>';
-		$s .= '<div id="statusnet-consumer-wrapper">';
-		$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">' . DI::l10n()->t('OAuth Consumer Key') . '</label>';
-		$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
-		$s .= '<div class="clear"></div>';
-		$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">' . DI::l10n()->t('OAuth Consumer Secret') . '</label>';
-		$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
-		$s .= '<div class="clear"></div>';
-		$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">' . DI::l10n()->t("Base API Path \x28remember the trailing /\x29") . '</label>';
-		$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
-		$s .= '<div class="clear"></div>';
-		//$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.DI::l10n()->t('GNU Socialapplication name').'</label>';
-		//$s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
-		$s .= '<p></p><div class="clear"></div>';
-		$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
-		$s .= '</div>';
-	} else {
-		/*		 * *
-		 * ok we have a consumer key pair now look into the OAuth stuff
-		 */
-		if ((!$otoken) && (!$osecret)) {
-			/*			 * *
-			 * the user has not yet connected the account to GNU Social
-			 * get a temporary OAuth key/secret pair and display a button with
-			 * which the user can request a PIN to connect the account to a
-			 * account at GNU Social
-			 */
-			$connection = new StatusNetOAuth($api, $ckey, $csecret);
-			$request_token = $connection->getRequestToken('oob');
-			$token = $request_token['oauth_token'];
-			/*			 * *
-			 *  make some nice form
-			 */
-			$s .= '<p>' . DI::l10n()->t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') . '</p>';
-			$s .= '<a href="' . $connection->getAuthorizeURL($token, False) . '" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="' . DI::l10n()->t('Log in with GNU Social') . '"></a>';
-			$s .= '<div id="statusnet-pin-wrapper">';
-			$s .= '<label id="statusnet-pin-label" for="statusnet-pin">' . DI::l10n()->t('Copy the security code from GNU Social here') . '</label>';
-			$s .= '<input id="statusnet-pin" type="text" name="statusnet-pin" />';
-			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="' . $token . '" />';
-			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="' . $request_token['oauth_token_secret'] . '" />';
-			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
-			$s .= '<h4>' . DI::l10n()->t('Cancel Connection Process') . '</h4>';
-			$s .= '<div id="statusnet-cancel-wrapper">';
-			$s .= '<p>' . DI::l10n()->t('Current GNU Social API is') . ': ' . $api . '</p>';
-			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">' . DI::l10n()->t('Cancel GNU Social Connection') . '</label>';
-			$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
-			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
-		} else {
+	$baseapi            = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi');
+	$ckey               = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey');
+	$csecret            = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret');
+	$otoken             = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken');
+	$osecret            = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret');
+	$enabled            = DI::pConfig()->get(local_user(), 'statusnet', 'post', false);
+	$def_enabled        = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default', false);
+	$mirror_enabled     = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts', false);
+	$createuser_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user', false);
+	$import             = DI::pConfig()->get(local_user(), 'statusnet', 'import');
+
+	// Radio button list to select existing application credentials
+	$sites = array_map(function ($site) {
+		return ['statusnet-preconf-apiurl', $site['sitename'], $site['apiurl']];
+	}, DI::config()->get('statusnet', 'sites', []));
+
+	$submit = ['statusnet-submit' => DI::l10n()->t('Save Settings')];
+
+	if ($ckey && $csecret) {
+		if ($otoken && $osecret) {
 			/*			 * *
 			 *  we have an OAuth key / secret pair for the user
 			 *  so let's give a chance to disable the postings to GNU Social
 			 */
-			$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
-			$details = $connection->get('account/verify_credentials');
-			if (!empty($details)) {
-				$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="' . $details->profile_image_url . '" /><p id="statusnet-info-block">' . DI::l10n()->t('Currently connected to: ') . '<a href="' . $details->statusnet_profile_url . '" target="_statusnet">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
+			$connection = new StatusNetOAuth($baseapi, $ckey, $csecret, $otoken, $osecret);
+			$account    = $connection->get('account/verify_credentials');
+
+			if (!empty($account)) {
+				$connected_account = DI::l10n()->t('Currently connected to: <a href="%s" target="_statusnet">%s</a>', $account->statusnet_profile_url, $account->screen_name);
 			}
-			$s .= '<p>' . DI::l10n()->t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '</p>';
+
+			$user = User::getById(local_user());
 			if ($user['hidewall']) {
-				$s .= '<p>' . DI::l10n()->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 GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
+				$privacy_warning = DI::l10n()->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 GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.');
 			}
-			$s .= '<div id="statusnet-enable-wrapper">';
-			$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">' . DI::l10n()->t('Allow posting to GNU Social') . '</label>';
-			$s .= '<input id="statusnet-checkbox" type="checkbox" name="statusnet-enable" value="1" ' . $checked . '/>';
-			$s .= '<div class="clear"></div>';
-			$s .= '<label id="statusnet-default-label" for="statusnet-default">' . DI::l10n()->t('Send public postings to GNU Social by default') . '</label>';
-			$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
-			$s .= '<div class="clear"></div>';
-
-			$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">' . DI::l10n()->t('Mirror all posts from GNU Social that are no replies or repeated messages') . '</label>';
-			$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" ' . $mirrorchecked . '/>';
-
-			$s .= '<div class="clear"></div>';
-			$s .= '</div>';
-
-			$s .= '<label id="statusnet-import-label" for="statusnet-import">' . DI::l10n()->t('Import the remote timeline') . '</label>';
-			//$s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
-
-			$s .= '<select name="statusnet-import" id="statusnet-import" />';
-			$s .= '<option value="0" ' . $importselected[0] . '>' . DI::l10n()->t("Disabled") . '</option>';
-			$s .= '<option value="1" ' . $importselected[1] . '>' . DI::l10n()->t("Full Timeline") . '</option>';
-			$s .= '<option value="2" ' . $importselected[2] . '>' . DI::l10n()->t("Only Mentions") . '</option>';
-			$s .= '</select>';
-			$s .= '<div class="clear"></div>';
-			/*
-			  $s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.DI::l10n()->t('Automatically create contacts').'</label>';
-			  $s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
-			  $s .= '<div class="clear"></div>';
+
+			$submit['statusnet-disconnect'] = DI::l10n()->t('Clear OAuth configuration');
+		} else {
+			/*			 * *
+			 * the user has not yet connected the account to GNU Social
+			 * get a temporary OAuth key/secret pair and display a button with
+			 * which the user can request a PIN to connect the account to a
+			 * account at GNU Social
 			 */
-			$s .= '<div id="statusnet-disconnect-wrapper">';
-			$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">' . DI::l10n()->t('Clear OAuth configuration') . '</label>';
-			$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
-			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
+			$connection    = new StatusNetOAuth($baseapi, $ckey, $csecret);
+			$request_token = $connection->getRequestToken('oob');
+			$authorize_url = $connection->getAuthorizeURL($request_token['oauth_token'], false);
+
+			$submit['statusnet-disconnect'] = DI::l10n()->t('Cancel GNU Social Connection');
 		}
 	}
-	$s .= '</div><div class="clear"></div>';
+
+
+	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/statusnet/');
+	$html = Renderer::replaceMacros($t, [
+		'$l10n' => [
+			'global_title'      => DI::l10n()->t('Globally Available GNU Social OAuthKeys'),
+			'global_info'       => DI::l10n()->t(DI::l10n()->t('There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).')),
+			'credentials_title' => DI::l10n()->t('Provide your own OAuth Credentials'),
+			'credentials_info'  => DI::l10n()->t('No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'),
+			'oauth_info'        => DI::l10n()->t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'),
+			'oauth_alt'         => DI::l10n()->t('Log in with GNU Social'),
+			'oauth_cancel'      => DI::l10n()->t('Cancel Connection Process'),
+			'oauth_api'         => DI::l10n()->t('Current GNU Social API is: %s', $baseapi),
+			'connected_account' => $connected_account ?? '',
+			'privacy_warning'   => $privacy_warning ?? '',
+		],
+
+		'$ckey'    => $ckey,
+		'$csecret' => $csecret,
+		'$otoken'  => $otoken,
+		'$osecret' => $osecret,
+		'$sites'   => $sites,
+
+		'$authorize_url' => $authorize_url ?? '',
+		'$request_token' => $request_token ?? null,
+		'$account'       => $account ?? null,
+
+		'$authenticate_url' => DI::baseUrl()->get() . '/statusnet/connect',
+
+		'$consumerkey'    => ['statusnet-consumerkey', DI::l10n()->t('OAuth Consumer Key'), '', '', false, ' size="35'],
+		'$consumersecret' => ['statusnet-consumersecret', DI::l10n()->t('OAuth Consumer Secret'), '', '', false, ' size="35'],
+
+		'$baseapi' => ['statusnet-baseapi', DI::l10n()->t('Base API Path (remember the trailing /)'), '', '', false, ' size="35'],
+		'$pin'     => ['statusnet-pin', DI::l10n()->t('Copy the security code from GNU Social here')],
+
+		'$enable'      => ['statusnet-enabled', DI::l10n()->t('Allow posting to GNU Social'), $enabled, DI::l10n()->t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')],
+		'$default'     => ['statusnet-default', DI::l10n()->t('Post to GNU Social by default'), $def_enabled],
+		'$mirror'      => ['statusnet-mirror', DI::l10n()->t('Mirror all public posts'), $mirror_enabled],
+		'$create_user' => ['statusnet-create_user', DI::l10n()->t('Automatically create contacts'), $createuser_enabled],
+		'$import'      => ['statusnet-import', DI::l10n()->t('Import the remote timeline'), $import, '', [
+			0 => DI::l10n()->t('Disabled'),
+			1 => DI::l10n()->t('Full Timeline'),
+			2 => DI::l10n()->t('Only Mentions'),
+		]],
+	]);
+
+	$data = [
+		'connector' => 'statusnet',
+		'title'     => DI::l10n()->t('GNU Social Import/Export/Mirror'),
+		'image'     => 'images/gnusocial.png',
+		'enabled'   => $enabled,
+		'html'      => $html,
+		'submit'    => $submit,
+	];
 }
 
 function statusnet_hook_fork(App $a, array &$b)
@@ -406,7 +359,7 @@ function statusnet_hook_fork(App $a, array &$b)
 	if (DI::pConfig()->get($post['uid'], 'statusnet', 'import')) {
 		// Don't fork if it isn't a reply to a GNU Social post
 		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::STATUSNET])) {
-			Logger::log('No GNU Social parent found for item ' . $post['id']);
+			Logger::notice('No GNU Social parent found for item ' . $post['id']);
 			$b['execute'] = false;
 			return;
 		}
@@ -458,7 +411,7 @@ function statusnet_action(App $a, $uid, $pid, $action)
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
-	Logger::log("statusnet_action '" . $action . "' ID: " . $pid, Logger::DATA);
+	Logger::debug("statusnet_action '" . $action . "' ID: " . $pid);
 
 	switch ($action) {
 		case "delete":
@@ -471,7 +424,7 @@ function statusnet_action(App $a, $uid, $pid, $action)
 			$result = $connection->post("favorites/destroy/" . $pid);
 			break;
 	}
-	Logger::log("statusnet_action '" . $action . "' send, result: " . print_r($result, true), Logger::DEBUG);
+	Logger::info("statusnet_action '" . $action . "' send, result: " . print_r($result, true));
 }
 
 function statusnet_post_hook(App $a, &$b)
@@ -490,19 +443,19 @@ function statusnet_post_hook(App $a, &$b)
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
 	if ($b['parent'] != $b['id']) {
-		Logger::log("statusnet_post_hook: parameter " . print_r($b, true), Logger::DATA);
+		Logger::debug("statusnet_post_hook: parameter " . print_r($b, true));
 
 		// Looking if its a reply to a GNU Social post
 		$hostlength = strlen($hostname) + 2;
 		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) {
-			Logger::log("statusnet_post_hook: no GNU Social post " . $b["parent"]);
+			Logger::notice("statusnet_post_hook: no GNU Social post " . $b["parent"]);
 			return;
 		}
 
 		$condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
 		$orig_post = Post::selectFirst(['author-link', 'uri'], $condition);
 		if (!DBA::isResult($orig_post)) {
-			Logger::log("statusnet_post_hook: no parent found " . $b["thr-parent"]);
+			Logger::notice("statusnet_post_hook: no parent found " . $b["thr-parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -513,12 +466,12 @@ function statusnet_post_hook(App $a, &$b)
 		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
 		$nicknameplain = "@" . $nick;
 
-		Logger::log("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], Logger::DEBUG);
+		Logger::info("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"]);
 		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
 			$b["body"] = $nickname . " " . $b["body"];
 		}
 
-		Logger::log("statusnet_post_hook: parent found " . print_r($orig_post, true), Logger::DEBUG);
+		Logger::info("statusnet_post_hook: parent found " . print_r($orig_post, true));
 	} else {
 		$iscomment = false;
 
@@ -539,7 +492,7 @@ function statusnet_post_hook(App $a, &$b)
 	}
 
 	if ($b['verb'] == Activity::LIKE) {
-		Logger::log("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), Logger::DEBUG);
+		Logger::info("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength));
 		if ($b['deleted'])
 			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
 		else
@@ -560,7 +513,7 @@ function statusnet_post_hook(App $a, &$b)
 		return;
 	}
 
-	Logger::log('GNU Socialpost invoked');
+	Logger::notice('GNU Socialpost invoked');
 
 	DI::pConfig()->load($b['uid'], 'statusnet');
 
@@ -598,7 +551,7 @@ function statusnet_post_hook(App $a, &$b)
 
 		if ($image != "") {
 			$img_str = DI::httpClient()->fetch($image);
-			$tempfile = tempnam(get_temppath(), "cache");
+			$tempfile = tempnam(System::getTempPath(), "cache");
 			file_put_contents($tempfile, $img_str);
 			$postdata = ["status" => $msg, "media[]" => $tempfile];
 		} else {
@@ -609,7 +562,7 @@ function statusnet_post_hook(App $a, &$b)
 		if (strlen($msg)) {
 			if ($iscomment) {
 				$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
-				Logger::log('statusnet_post send reply ' . print_r($postdata, true), Logger::DEBUG);
+				Logger::info('statusnet_post send reply ' . print_r($postdata, true));
 			}
 
 			// New code that is able to post pictures
@@ -620,17 +573,17 @@ function statusnet_post_hook(App $a, &$b)
 			$cb->setToken($otoken, $osecret);
 			$result = $cb->statuses_update($postdata);
 			//$result = $dent->post('statuses/update', $postdata);
-			Logger::log('statusnet_post send, result: ' . print_r($result, true) .
-				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true), Logger::DEBUG);
+			Logger::info('statusnet_post send, result: ' . print_r($result, true) .
+				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true));
 
 			if (!empty($result->source)) {
 				DI::pConfig()->set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
 			}
 
 			if (!empty($result->error)) {
-				Logger::log('Send to GNU Social failed: "' . $result->error . '"');
+				Logger::notice('Send to GNU Social failed: "' . $result->error . '"');
 			} elseif ($iscomment) {
-				Logger::log('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
+				Logger::notice('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
 				Item::update(['extid' => $hostname . "::" . $result->id, 'body' => $result->text], ['id' => $b['id']]);
 			}
 		}
@@ -760,18 +713,16 @@ function statusnet_cron(App $a, $b)
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::log('statusnet: poll intervall not reached');
+			Logger::notice('statusnet: poll intervall not reached');
 			return;
 		}
 	}
-	Logger::log('statusnet: cron_start');
+	Logger::notice('statusnet: cron_start');
 
-	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
-	if (DBA::isResult($r)) {
-		foreach ($r as $rr) {
-			Logger::log('statusnet: fetching for user ' . $rr['uid']);
-			statusnet_fetchtimeline($a, $rr['uid']);
-		}
+	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'statusnet', 'k' => 'mirror_posts', 'v' => true]);
+	foreach ($pconfigs as $rr) {
+		Logger::notice('statusnet: fetching for user ' . $rr['uid']);
+		statusnet_fetchtimeline($a, $rr['uid']);
 	}
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
@@ -781,23 +732,20 @@ function statusnet_cron(App $a, $b)
 
 	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
-	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
-	if (DBA::isResult($r)) {
-		foreach ($r as $rr) {
-			if ($abandon_days != 0) {
-				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
-				if (!DBA::isResult($user)) {
-					Logger::log('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
-					continue;
-				}
+	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'statusnet', 'k' => 'import', 'v' => true]);
+	foreach ($pconfigs as $rr) {
+		if ($abandon_days != 0) {
+			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $rr['uid'], $abandon_limit])) {
+				Logger::notice('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
+				continue;
 			}
-
-			Logger::log('statusnet: importing timeline from user ' . $rr['uid']);
-			statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
 		}
+
+		Logger::notice('statusnet: importing timeline from user ' . $rr['uid']);
+		statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
 	}
 
-	Logger::log('statusnet: cron_end');
+	Logger::notice('statusnet: cron_end');
 
 	DI::config()->set('statusnet', 'last_poll', time());
 }
@@ -900,7 +848,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 
 				//print_r($_REQUEST);
 				if ($_REQUEST["body"] != "") {
-					Logger::log('statusnet: posting for user ' . $uid);
+					Logger::notice('statusnet: posting for user ' . $uid);
 
 					item_post($a);
 				}
@@ -928,112 +876,90 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 		return -1;
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET));
+	$contact_record = Contact::selectFirst([],
+		['alias' => Strings::normaliseLink($contact->statusnet_profile_url), 'uid' => $uid, 'network' => Protocol::STATUSNET]);
 
-	if (!DBA::isResult($r) && !$create_user) {
+	if (!DBA::isResult($contact_record) && !$create_user) {
 		return 0;
 	}
 
-	if (DBA::isResult($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
-		Logger::log("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", Logger::DEBUG);
+	if (DBA::isResult($contact_record) && ($contact_record["readonly"] || $contact_record["blocked"])) {
+		Logger::info("statusnet_fetch_contact: Contact '" . $contact_record["nick"] . "' is blocked or readonly.");
 		return -1;
 	}
 
-	if (!DBA::isResult($r)) {
-		// create contact record
-		q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
-					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
-					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
-					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
-			intval($uid),
-			DBA::escape(DateTimeFormat::utcNow()),
-			DBA::escape($contact->statusnet_profile_url),
-			DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
-			DBA::escape(statusnet_address($contact)),
-			DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
-			DBA::escape(''),
-			DBA::escape(''),
-			DBA::escape($contact->name),
-			DBA::escape($contact->screen_name),
-			DBA::escape($contact->profile_image_url),
-			DBA::escape(Protocol::STATUSNET),
-			intval(Contact::FRIEND),
-			intval(1),
-			DBA::escape($contact->location),
-			DBA::escape($contact->description),
-			intval(1)
-		);
-
-		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
-			DBA::escape($contact->statusnet_profile_url),
-			intval($uid),
-			DBA::escape(Protocol::STATUSNET));
-
-		if (!DBA::isResult($r)) {
+	if (!DBA::isResult($contact_record)) {
+		$fields = [
+			'uid'      => $uid,
+			'created'  => DateTimeFormat::utcNow(),
+			'url'      => $contact->statusnet_profile_url,
+			'nurl'     => Strings::normaliseLink($contact->statusnet_profile_url),
+			'addr'     => statusnet_address($contact),
+			'alias'    => Strings::normaliseLink($contact->statusnet_profile_url),
+			'notify'   => '',
+			'poll'     => '',
+			'name'     => $contact->name,
+			'nick'     => $contact->screen_name,
+			'photo'    => $contact->profile_image_url,
+			'network'  => Protocol::STATUSNET,
+			'rel'      => Contact::FRIEND,
+			'priority' => 1,
+			'location' => $contact->location,
+			'about'    => $contact->description,
+			'writable' => true,
+			'blocked'  => false,
+			'readonly' => false,
+			'pending'  => false,
+		];
+
+		if (!Contact::insert($fields)) {
 			return false;
 		}
 
-		$contact_id = $r[0]['id'];
+		$contact_record = Contact::selectFirst([],
+			['alias' => Strings::normaliseLink($contact->statusnet_profile_url), 'uid' => $uid, 'network' => Protocol::STATUSNET]);
+		if (!DBA::isResult($contact_record)) {
+			return false;
+		}
+
+		$contact_id = $contact_record['id'];
 
 		Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
 		$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
 
-		q("UPDATE `contact` SET `photo` = '%s',
-					`thumb` = '%s',
-					`micro` = '%s',
-					`avatar-date` = '%s'
-				WHERE `id` = %d",
-			DBA::escape($photos[0]),
-			DBA::escape($photos[1]),
-			DBA::escape($photos[2]),
-			DBA::escape(DateTimeFormat::utcNow()),
-			intval($contact_id)
-		);
+		Contact::update(['photo' => $photos[0], 'thumb' => $photos[1],
+			'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()], ['id' => $contact_id]);
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.
-		//$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
-		$update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
+		//$update_photo = (($contact_record['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
+		$update_photo = ($contact_record['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
 
 		// check that we have all the photos, this has been known to fail on occasion
-		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
-			Logger::log("statusnet_fetch_contact: Updating contact " . $contact->screen_name, Logger::DEBUG);
-
-			$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
-
-			q("UPDATE `contact` SET `photo` = '%s',
-						`thumb` = '%s',
-						`micro` = '%s',
-						`name-date` = '%s',
-						`uri-date` = '%s',
-						`avatar-date` = '%s',
-						`url` = '%s',
-						`nurl` = '%s',
-						`addr` = '%s',
-						`name` = '%s',
-						`nick` = '%s',
-						`location` = '%s',
-						`about` = '%s'
-					WHERE `id` = %d",
-				DBA::escape($photos[0]),
-				DBA::escape($photos[1]),
-				DBA::escape($photos[2]),
-				DBA::escape(DateTimeFormat::utcNow()),
-				DBA::escape(DateTimeFormat::utcNow()),
-				DBA::escape(DateTimeFormat::utcNow()),
-				DBA::escape($contact->statusnet_profile_url),
-				DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
-				DBA::escape(statusnet_address($contact)),
-				DBA::escape($contact->name),
-				DBA::escape($contact->screen_name),
-				DBA::escape($contact->location),
-				DBA::escape($contact->description),
-				intval($r[0]['id'])
-			);
+		if ((!$contact_record['photo']) || (!$contact_record['thumb']) || (!$contact_record['micro']) || ($update_photo)) {
+			Logger::info("statusnet_fetch_contact: Updating contact " . $contact->screen_name);
+
+			$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_record['id']);
+
+			Contact::update([
+				'photo' => $photos[0],
+				'thumb' => $photos[1],
+				'micro' => $photos[2],
+				'name-date' => DateTimeFormat::utcNow(),
+				'uri-date' => DateTimeFormat::utcNow(),
+				'avatar-date' => DateTimeFormat::utcNow(),
+				'url' => $contact->statusnet_profile_url,
+				'nurl' => Strings::normaliseLink($contact->statusnet_profile_url),
+				'addr' => statusnet_address($contact),
+				'name' => $contact->name,
+				'nick' => $contact->screen_name,
+				'location' => $contact->location,
+				'about' => $contact->description
+			], ['id' => $contact_record['id']]);
 		}
 	}
 
-	return $r[0]["id"];
+	return $contact_record["id"];
 }
 
 function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
@@ -1050,12 +976,8 @@ function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 	$cb->setConsumerKey($ckey, $csecret);
 	$cb->setToken($otoken, $osecret);
 
-	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-		intval($uid));
-
-	if (DBA::isResult($r)) {
-		$self = $r[0];
-	} else {
+	$self = Contact::selectFirst([], ['self' => true, 'uid' => $uid]);
+	if (!DBA::isResult($self)) {
 		return;
 	}
 
@@ -1083,7 +1005,7 @@ function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 
 function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact)
 {
-	Logger::log("statusnet_createpost: start", Logger::DEBUG);
+	Logger::info("statusnet_createpost: start");
 
 	$api = DI::pConfig()->get($uid, 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
@@ -1127,15 +1049,13 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 		$own_url = DI::pConfig()->get($uid, 'statusnet', 'own_url');
 
 		if ($content->user->id == $own_url) {
-			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-				intval($uid));
-
-			if (DBA::isResult($r)) {
-				$contactid = $r[0]["id"];
+			$self = DBA::selectFirst([], ['self' => true, 'uid' => $uid]);
+			if (DBA::isResult($self)) {
+				$contactid = $self["id"];
 
-				$postarray['owner-name'] = $r[0]["name"];
-				$postarray['owner-link'] = $r[0]["url"];
-				$postarray['owner-avatar'] = $r[0]["photo"];
+				$postarray['owner-name'] = $self["name"];
+				$postarray['owner-link'] = $self["url"];
+				$postarray['owner-avatar'] = $self["photo"];
 			} else {
 				return [];
 			}
@@ -1200,7 +1120,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 		$postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
 	}
 
-	Logger::log("statusnet_createpost: end", Logger::DEBUG);
+	Logger::info("statusnet_createpost: end");
 
 	return $postarray;
 }
@@ -1219,7 +1139,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 	// "create_user" is deactivated, since currently you cannot add users manually by now
 	$create_user = true;
 
-	Logger::log("statusnet_fetchhometimeline: Fetching for user " . $uid, Logger::DEBUG);
+	Logger::info("statusnet_fetchhometimeline: Fetching for user " . $uid);
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
@@ -1229,31 +1149,23 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 		return;
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($own_contact),
-		intval($uid));
-
-	if (DBA::isResult($r)) {
-		$nick = $r[0]["nick"];
+	$contact = Contact::selectFirst([], ['id' => $own_contact, 'uid' => $uid]);
+	if (DBA::isResult($contact)) {
+		$nick = $contact["nick"];
 	} else {
-		Logger::log("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, Logger::DEBUG);
+		Logger::info("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid);
 		return;
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-		intval($uid));
-
-	if (DBA::isResult($r)) {
-		$self = $r[0];
-	} else {
-		Logger::log("statusnet_fetchhometimeline: Own contact not found for user " . $uid, Logger::DEBUG);
+	$self = Contact::selectFirst([], ['self' => true, 'uid' => $uid]);
+	if (!DBA::isResult($self)) {
+		Logger::info("statusnet_fetchhometimeline: Own contact not found for user " . $uid);
 		return;
 	}
 
-	$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
-		intval($uid));
-	if (!DBA::isResult($u)) {
-		Logger::log("statusnet_fetchhometimeline: Own user not found for user " . $uid, Logger::DEBUG);
+	$user = User::getById($uid);
+	if (!DBA::isResult($user)) {
+		Logger::info("statusnet_fetchhometimeline: Own user not found for user " . $uid);
 		return;
 	}
 
@@ -1284,13 +1196,13 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 				$errormsg = "Unknown error";
 			}
 
-			Logger::log("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, Logger::DEBUG);
+			Logger::info("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg);
 			return;
 		}
 
 		$posts = array_reverse($items);
 
-		Logger::log("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG);
+		Logger::info("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items");
 
 		if (count($posts)) {
 			foreach ($posts as $post) {
@@ -1318,7 +1230,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 					$item = Item::insert($postarray);
 					$postarray["id"] = $item;
 
-					Logger::log('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
+					Logger::notice('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 				}
 			}
 		}
@@ -1336,13 +1248,13 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 	$items = $connection->get('statuses/mentions_timeline', $parameters);
 
 	if (!is_array($items)) {
-		Logger::log("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), Logger::DEBUG);
+		Logger::info("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true));
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	Logger::log("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG);
+	Logger::info("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items");
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
@@ -1368,7 +1280,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 
 				$item = Item::insert($postarray);
 
-				Logger::log('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
+				Logger::notice('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
 			}
 		}
 	}
@@ -1403,7 +1315,7 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 			$item = Item::insert($postarray);
 			$postarray["id"] = $item;
 
-			Logger::log('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
+			Logger::notice('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 		}
 	}
 }
@@ -1424,15 +1336,20 @@ function statusnet_convertmsg(App $a, $body)
 		foreach ($matches AS $match) {
 			$search = "[url=" . $match[1] . "]" . $match[2] . "[/url]";
 
-			Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
+			Logger::info("statusnet_convertmsg: expanding url " . $match[1]);
 
-			$expanded_url = DI::httpClient()->finalUrl($match[1]);
+			try {
+				$expanded_url = DI::httpClient()->finalUrl($match[1]);
+			} catch (TransferException $exception) {
+				Logger::notice('statusnet_convertmsg: Couldn\'t get final URL.', ['url' => $match[1], 'exception' => $exception]);
+				$expanded_url = $match[1];
+			}
 
-			Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);
+			Logger::info("statusnet_convertmsg: fetching data for " . $expanded_url);
 
 			$oembed_data = OEmbed::fetchURL($expanded_url, true);
 
-			Logger::log("statusnet_convertmsg: fetching data: done", Logger::DEBUG);
+			Logger::info("statusnet_convertmsg: fetching data: done");
 
 			if ($type == "") {
 				$type = $oembed_data->type;
@@ -1452,7 +1369,7 @@ function statusnet_convertmsg(App $a, $body)
 			} else {
 				$img_str = DI::httpClient()->fetch($expanded_url, 4);
 
-				$tempfile = tempnam(get_temppath(), "cache");
+				$tempfile = tempnam(System::getTempPath(), "cache");
 				file_put_contents($tempfile, $img_str);
 				$mime = mime_content_type($tempfile);
 				unlink($tempfile);
@@ -1513,10 +1430,9 @@ function statusnet_fetch_own_contact(App $a, $uid)
 
 		$contact_id = statusnet_fetch_contact($uid, $user, true);
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-			intval($uid), DBA::escape($own_url));
-		if (DBA::isResult($r)) {
-			$contact_id = $r[0]["id"];
+		$contact = Contact::selectFirst([], ['uid' => $uid, 'alias' => $own_url]);
+		if (DBA::isResult($contact)) {
+			$contact_id = $contact["id"];
 		} else {
 			DI::pConfig()->delete($uid, 'statusnet', 'own_url');
 		}
@@ -1569,13 +1485,13 @@ function statusnet_is_retweet(App $a, $uid, $body)
 		return false;
 	}
 
-	Logger::log('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, Logger::DEBUG);
+	Logger::info('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid);
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$result = $connection->post('statuses/retweet/' . $id);
 
-	Logger::log('statusnet_is_retweet: result ' . print_r($result, true), Logger::DEBUG);
+	Logger::info('statusnet_is_retweet: result ' . print_r($result, true));
 
 	return isset($result->id);
 }