X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=bf6bfda367e27e2b4d38d4b5561023ae1d4c7bba;hb=9c266e59cfa7939af7120506f9833448ca1615e3;hp=18ab5f41d41279e38455275ede6330bd0fb0c908;hpb=0775c28854ee674e6fae8a7ee39dffc7030cc9cb;p=friendica-addons.git

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 18ab5f41..bf6bfda3 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -9,11 +9,8 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-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\Worker;
 use Friendica\Database\DBA;
@@ -21,12 +18,13 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -49,38 +47,25 @@ function pumpio_install()
 	Hook::register('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
 }
 
-function pumpio_uninstall()
-{
-	Hook::unregister('load_config',      'addon/pumpio/pumpio.php', 'pumpio_load_config');
-	Hook::unregister('hook_fork',        'addon/pumpio/pumpio.php', 'pumpio_hook_fork');
-	Hook::unregister('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
-	Hook::unregister('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
-	Hook::unregister('jot_networks',     'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
-	Hook::unregister('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
-	Hook::unregister('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
-	Hook::unregister('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
-	Hook::unregister('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
-}
-
 function pumpio_module() {}
 
 function pumpio_content(App $a)
 {
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return '';
 	}
 
 	require_once("mod/settings.php");
 	settings_init($a);
 
-	if (isset($a->argv[1])) {
-		switch ($a->argv[1]) {
+	if (isset(DI::args()->getArgv()[1])) {
+		switch (DI::args()->getArgv()[1]) {
 			case "connect":
 				$o = pumpio_connect($a);
 				break;
 			default:
-				$o = print_r($a->argv, true);
+				$o = print_r(DI::args()->getArgv(), true);
 				break;
 		}
 	} else {
@@ -91,8 +76,8 @@ function pumpio_content(App $a)
 
 function pumpio_check_item_notification($a, &$notification_data)
 {
-	$hostname = PConfig::get($notification_data["uid"], 'pumpio', 'host');
-	$username = PConfig::get($notification_data["uid"], "pumpio", "user");
+	$hostname = DI::pConfig()->get($notification_data["uid"], 'pumpio', 'host');
+	$username = DI::pConfig()->get($notification_data["uid"], "pumpio", "user");
 
 	$notification_data["profiles"][] = "https://".$hostname."/".$username;
 }
@@ -103,20 +88,20 @@ function pumpio_registerclient(App $a, $host)
 
 	$params = [];
 
-	$application_name  = Config::get('pumpio', 'application_name');
+	$application_name  = DI::config()->get('pumpio', 'application_name');
 
 	if ($application_name == "") {
 		$application_name = DI::baseUrl()->getHostname();
 	}
 
-	$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
+	$adminlist = explode(",", str_replace(" ", "", DI::config()->get('config', 'admin_email')));
 
 	$params["type"] = "client_associate";
 	$params["contacts"] = $adminlist[0];
 	$params["application_type"] = "native";
 	$params["application_name"] = $application_name;
-	$params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png";
-	$params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect";
+	$params["logo_url"] = DI::baseUrl()->get()."/images/friendica-256.png";
+	$params["redirect_uris"] = DI::baseUrl()->get()."/pumpio/connect";
 
 	Logger::log("pumpio_registerclient: ".$url." parameters ".print_r($params, true), Logger::DEBUG);
 
@@ -143,18 +128,18 @@ function pumpio_registerclient(App $a, $host)
 function pumpio_connect(App $a)
 {
 	// Define the needed keys
-	$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
-	$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
-	$hostname = PConfig::get(local_user(), 'pumpio', 'host');
+	$consumer_key = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_key');
+	$consumer_secret = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_secret');
+	$hostname = DI::pConfig()->get(local_user(), 'pumpio', 'host');
 
 	if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) {
 		Logger::log("pumpio_connect: register client");
 		$clientdata = pumpio_registerclient($a, $hostname);
-		PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
-		PConfig::set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
+		DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
+		DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
 
-		$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
-		$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
+		$consumer_key = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_key');
+		$consumer_secret = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_secret');
 
 		Logger::log("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, Logger::DEBUG);
 	}
@@ -162,12 +147,11 @@ function pumpio_connect(App $a)
 	if (($consumer_key == "") || ($consumer_secret == "")) {
 		Logger::log("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
 
-		$o .= L10n::t("Unable to register the client at the pump.io server '%s'.", $hostname);
-		return $o;
+		return DI::l10n()->t("Unable to register the client at the pump.io server '%s'.", $hostname);
 	}
 
 	// The callback URL is the script that gets called after the user authenticates with pumpio
-	$callback_url = $a->getBaseURL()."/pumpio/connect";
+	$callback_url = DI::baseUrl()->get()."/pumpio/connect";
 
 	// Let's begin.  First we need a Request Token.  The request token is required to send the user
 	// to pumpio's login page.
@@ -191,8 +175,8 @@ function pumpio_connect(App $a)
 		if (($success = $client->Process())) {
 			if (strlen($client->access_token)) {
 				Logger::log("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, Logger::DEBUG);
-				PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token);
-				PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
+				DI::pConfig()->set(local_user(), "pumpio", "oauth_token", $client->access_token);
+				DI::pConfig()->set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
 			}
 		}
 		$success = $client->Finalize($success);
@@ -203,8 +187,8 @@ function pumpio_connect(App $a)
 
 	if ($success) {
 		Logger::log("pumpio_connect: authenticated");
-		$o = L10n::t("You are now authenticated to pumpio.");
-		$o .= '<br /><a href="'.$a->getBaseURL().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
+		$o = DI::l10n()->t("You are now authenticated to pumpio.");
+		$o .= '<br /><a href="'.DI::baseUrl()->get().'/settings/connectors">'.DI::l10n()->t("return to the connector page").'</a>';
 	} else {
 		Logger::log("pumpio_connect: could not connect");
 		$o = 'Could not connect to pumpio. Refresh the page or try again later.';
@@ -219,13 +203,13 @@ function pumpio_jot_nets(App $a, array &$jotnets_fields)
 		return;
 	}
 
-	if (PConfig::get(local_user(), 'pumpio', 'post')) {
+	if (DI::pConfig()->get(local_user(), 'pumpio', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'pumpio_enable',
-				L10n::t('Post to pumpio'),
-				PConfig::get(local_user(), 'pumpio', 'post_by_default')
+				DI::l10n()->t('Post to pumpio'),
+				DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default')
 			]
 		];
 	}
@@ -239,86 +223,86 @@ function pumpio_settings(App $a, &$s)
 
 	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variables */
 
-	$import_enabled = PConfig::get(local_user(), 'pumpio', 'import');
+	$import_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'import');
 	$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
 
-	$enabled = PConfig::get(local_user(), 'pumpio', 'post');
+	$enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = PConfig::get(local_user(), 'pumpio', 'post_by_default');
+	$def_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default');
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$public_enabled = PConfig::get(local_user(), 'pumpio', 'public');
+	$public_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'public');
 	$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
 
-	$mirror_enabled = PConfig::get(local_user(), 'pumpio', 'mirror');
+	$mirror_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'mirror');
 	$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
 
-	$servername = PConfig::get(local_user(), "pumpio", "host");
-	$username = PConfig::get(local_user(), "pumpio", "user");
+	$servername = DI::pConfig()->get(local_user(), "pumpio", "host");
+	$username = DI::pConfig()->get(local_user(), "pumpio", "user");
 
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. L10n::t('Pump.io Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. DI::l10n()->t('Pump.io Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. L10n::t('Pump.io Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. DI::l10n()->t('Pump.io Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="pumpio-username-wrapper">';
-	$s .= '<label id="pumpio-username-label" for="pumpio-username">'.L10n::t('pump.io username (without the servername)').'</label>';
+	$s .= '<label id="pumpio-username-label" for="pumpio-username">'.DI::l10n()->t('pump.io username (without the servername)').'</label>';
 	$s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="pumpio-servername-wrapper">';
-	$s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.L10n::t('pump.io servername (without "http://" or "https://" )').'</label>';
+	$s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.DI::l10n()->t('pump.io servername (without "http://" or "https://" )').'</label>';
 	$s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
 	$s .= '</div><div class="clear"></div>';
 
 	if (($username != '') && ($servername != '')) {
-		$oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token");
-		$oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret");
+		$oauth_token = DI::pConfig()->get(local_user(), "pumpio", "oauth_token");
+		$oauth_token_secret = DI::pConfig()->get(local_user(), "pumpio", "oauth_token_secret");
 
 		$s .= '<div id="pumpio-password-wrapper">';
 		if (($oauth_token == "") || ($oauth_token_secret == "")) {
 			$s .= '<div id="pumpio-authenticate-wrapper">';
-			$s .= '<a href="'.$a->getBaseURL().'/pumpio/connect">'.L10n::t("Authenticate your pump.io connection").'</a>';
+			$s .= '<a href="'.DI::baseUrl()->get().'/pumpio/connect">'.DI::l10n()->t("Authenticate your pump.io connection").'</a>';
 			$s .= '</div><div class="clear"></div>';
 		} else {
 			$s .= '<div id="pumpio-import-wrapper">';
-			$s .= '<label id="pumpio-import-label" for="pumpio-import">' . L10n::t('Import the remote timeline') . '</label>';
+			$s .= '<label id="pumpio-import-label" for="pumpio-import">' . DI::l10n()->t('Import the remote timeline') . '</label>';
 			$s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="pumpio-enable-wrapper">';
-			$s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . L10n::t('Enable pump.io Post Addon') . '</label>';
+			$s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . DI::l10n()->t('Enable pump.io Post Addon') . '</label>';
 			$s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="pumpio-bydefault-wrapper">';
-			$s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . L10n::t('Post to pump.io by default') . '</label>';
+			$s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . DI::l10n()->t('Post to pump.io by default') . '</label>';
 			$s .= '<input id="pumpio-bydefault" type="checkbox" name="pumpio_bydefault" value="1" ' . $def_checked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="pumpio-public-wrapper">';
-			$s .= '<label id="pumpio-public-label" for="pumpio-public">' . L10n::t('Should posts be public?') . '</label>';
+			$s .= '<label id="pumpio-public-label" for="pumpio-public">' . DI::l10n()->t('Should posts be public?') . '</label>';
 			$s .= '<input id="pumpio-public" type="checkbox" name="pumpio_public" value="1" ' . $public_checked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="pumpio-mirror-wrapper">';
-			$s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . L10n::t('Mirror all public posts') . '</label>';
+			$s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . DI::l10n()->t('Mirror all public posts') . '</label>';
 			$s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="pumpio-delete-wrapper">';
-			$s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . L10n::t('Check to delete this preset') . '</label>';
+			$s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . DI::l10n()->t('Check to delete this preset') . '</label>';
 			$s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
 			$s .= '</div><div class="clear"></div>';
 		}
@@ -328,26 +312,26 @@ function pumpio_settings(App $a, &$s)
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 }
 
 function pumpio_settings_post(App $a, array &$b)
 {
 	if (!empty($_POST['pumpio-submit'])) {
 		if (!empty($_POST['pumpio_delete'])) {
-			PConfig::set(local_user(), 'pumpio', 'consumer_key'      , '');
-			PConfig::set(local_user(), 'pumpio', 'consumer_secret'   , '');
-			PConfig::set(local_user(), 'pumpio', 'oauth_token'       , '');
-			PConfig::set(local_user(), 'pumpio', 'oauth_token_secret', '');
-			PConfig::set(local_user(), 'pumpio', 'post'              , false);
-			PConfig::set(local_user(), 'pumpio', 'import'            , false);
-			PConfig::set(local_user(), 'pumpio', 'host'              , '');
-			PConfig::set(local_user(), 'pumpio', 'user'              , '');
-			PConfig::set(local_user(), 'pumpio', 'public'            , false);
-			PConfig::set(local_user(), 'pumpio', 'mirror'            , false);
-			PConfig::set(local_user(), 'pumpio', 'post_by_default'   , false);
-			PConfig::set(local_user(), 'pumpio', 'lastdate'          , 0);
-			PConfig::set(local_user(), 'pumpio', 'last_id'           , '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key'      , '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret'   , '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token'       , '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token_secret', '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'post'              , false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'import'            , false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'host'              , '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'user'              , '');
+			DI::pConfig()->set(local_user(), 'pumpio', 'public'            , false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'mirror'            , false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default'   , false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'lastdate'          , 0);
+			DI::pConfig()->set(local_user(), 'pumpio', 'last_id'           , '');
 		} else {
 			// filtering the username if it is filled wrong
 			$user = $_POST['pumpio_user'];
@@ -364,16 +348,16 @@ function pumpio_settings_post(App $a, array &$b)
 			$host = trim($host);
 			$host = str_replace(["https://", "http://"], ["", ""], $host);
 
-			PConfig::set(local_user(), 'pumpio', 'post'           , $_POST['pumpio'] ?? false);
-			PConfig::set(local_user(), 'pumpio', 'import'         , $_POST['pumpio_import'] ?? false);
-			PConfig::set(local_user(), 'pumpio', 'host'           , $host);
-			PConfig::set(local_user(), 'pumpio', 'user'           , $user);
-			PConfig::set(local_user(), 'pumpio', 'public'         , $_POST['pumpio_public'] ?? false);
-			PConfig::set(local_user(), 'pumpio', 'mirror'         , $_POST['pumpio_mirror'] ?? false);
-			PConfig::set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'post'           , $_POST['pumpio'] ?? false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'import'         , $_POST['pumpio_import'] ?? false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'host'           , $host);
+			DI::pConfig()->set(local_user(), 'pumpio', 'user'           , $user);
+			DI::pConfig()->set(local_user(), 'pumpio', 'public'         , $_POST['pumpio_public'] ?? false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'mirror'         , $_POST['pumpio_mirror'] ?? false);
+			DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false);
 
 			if (!empty($_POST['pumpio_mirror'])) {
-				PConfig::delete(local_user(), 'pumpio', 'lastdate');
+				DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate');
 			}
 		}
 	}
@@ -404,9 +388,9 @@ function pumpio_hook_fork(App $a, array &$b)
                 return;
         }
 
-        if (PConfig::get($post['uid'], 'pumpio', 'import')) {
+        if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
                 // Don't fork if it isn't a reply to a pump.io post
-                if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
+                if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
                         Logger::log('No pump.io parent found for item ' . $post['id']);
                         $b['execute'] = false;
                         return;
@@ -426,11 +410,11 @@ function pumpio_post_local(App $a, array &$b)
 		return;
 	}
 
-	$pumpio_post   = intval(PConfig::get(local_user(), 'pumpio', 'post'));
+	$pumpio_post   = intval(DI::pConfig()->get(local_user(), 'pumpio', 'post'));
 
 	$pumpio_enable = (($pumpio_post && !empty($_REQUEST['pumpio_enable'])) ? intval($_REQUEST['pumpio_enable']) : 0);
 
-	if ($b['api_source'] && intval(PConfig::get(local_user(), 'pumpio', 'post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default'))) {
 		$pumpio_enable = 1;
 	}
 
@@ -447,16 +431,18 @@ function pumpio_post_local(App $a, array &$b)
 
 function pumpio_send(App $a, array &$b)
 {
-	if (!PConfig::get($b["uid"], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
+	if (!DI::pConfig()->get($b["uid"], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
 		return;
 	}
 
 	Logger::log("pumpio_send: parameter ".print_r($b, true), Logger::DATA);
 
+	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+
 	if ($b['parent'] != $b['id']) {
 		// Looking if its a reply to a pumpio post
 		$condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO];
-		$orig_post = Item::selectFirst([], $condition);
+		$orig_post = Post::selectFirst([], $condition);
 
 		if (!DBA::isResult($orig_post)) {
 			Logger::log("pumpio_send: no pumpio post ".$b["parent"]);
@@ -517,19 +503,19 @@ function pumpio_send(App $a, array &$b)
 	// Support for native shares
 	// http://<hostname>/api/<type>/shares?id=<the-object-id>
 
-	$oauth_token = PConfig::get($b['uid'], "pumpio", "oauth_token");
-	$oauth_token_secret = PConfig::get($b['uid'], "pumpio", "oauth_token_secret");
-	$consumer_key = PConfig::get($b['uid'], "pumpio","consumer_key");
-	$consumer_secret = PConfig::get($b['uid'], "pumpio","consumer_secret");
+	$oauth_token = DI::pConfig()->get($b['uid'], "pumpio", "oauth_token");
+	$oauth_token_secret = DI::pConfig()->get($b['uid'], "pumpio", "oauth_token_secret");
+	$consumer_key = DI::pConfig()->get($b['uid'], "pumpio","consumer_key");
+	$consumer_secret = DI::pConfig()->get($b['uid'], "pumpio","consumer_secret");
 
-	$host = PConfig::get($b['uid'], "pumpio", "host");
-	$user = PConfig::get($b['uid'], "pumpio", "user");
-	$public = PConfig::get($b['uid'], "pumpio", "public");
+	$host = DI::pConfig()->get($b['uid'], "pumpio", "host");
+	$user = DI::pConfig()->get($b['uid'], "pumpio", "user");
+	$public = DI::pConfig()->get($b['uid'], "pumpio", "public");
 
 	if ($oauth_token && $oauth_token_secret) {
 		$title = trim($b['title']);
 
-		$content = BBCode::convert($b['body'], false, 4);
+		$content = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
 
 		$params = [];
 
@@ -597,7 +583,7 @@ function pumpio_send(App $a, array &$b)
 
 		if ($success) {
 			if ($user->generator->displayName) {
-				PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName);
+				DI::pConfig()->set($b["uid"], "pumpio", "application_name", $user->generator->displayName);
 			}
 
 			$post_id = $user->object->id;
@@ -616,18 +602,18 @@ function pumpio_send(App $a, array &$b)
 function pumpio_action(App $a, $uid, $uri, $action, $content = "")
 {
 	// Don't do likes and other stuff if you don't import the timeline
-	if (!PConfig::get($uid, 'pumpio', 'import')) {
+	if (!DI::pConfig()->get($uid, 'pumpio', 'import')) {
 		return;
 	}
 
-	$ckey    = PConfig::get($uid, 'pumpio', 'consumer_key');
-	$csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
-	$otoken  = PConfig::get($uid, 'pumpio', 'oauth_token');
-	$osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
-	$hostname = PConfig::get($uid, 'pumpio', 'host');
-	$username = PConfig::get($uid, "pumpio", "user");
+	$ckey    = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
+	$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
+	$otoken  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
+	$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
+	$username = DI::pConfig()->get($uid, "pumpio", "user");
 
-	$orig_post = Item::selectFirst([], ['uri' => $uri, 'uid' => $uid]);
+	$orig_post = Post::selectFirst([], ['uri' => $uri, 'uid' => $uid]);
 
 	if (!DBA::isResult($orig_post)) {
 		return;
@@ -675,7 +661,7 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "")
 	if ($success) {
 		Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri);
 	} else {
-		Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true));
+		Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri);
 		Worker::defer();
 	}
 }
@@ -688,9 +674,9 @@ function pumpio_sync(App $a)
 		return;
 	}
 
-	$last = Config::get('pumpio', 'last_poll');
+	$last = DI::config()->get('pumpio', 'last_poll');
 
-	$poll_interval = intval(Config::get('pumpio', 'poll_interval', PUMPIO_DEFAULT_POLL_INTERVAL));
+	$poll_interval = intval(DI::config()->get('pumpio', 'poll_interval', PUMPIO_DEFAULT_POLL_INTERVAL));
 
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
@@ -709,7 +695,7 @@ function pumpio_sync(App $a)
 		}
 	}
 
-	$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;
 	}
@@ -731,7 +717,7 @@ function pumpio_sync(App $a)
 			pumpio_fetchinbox($a, $rr['uid']);
 
 			// 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 {
@@ -740,14 +726,14 @@ function pumpio_sync(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('pumpio: cron_end');
 
-	Config::set('pumpio', 'last_poll', time());
+	DI::config()->set('pumpio', 'last_poll', time());
 }
 
 function pumpio_cron(App $a, $b)
@@ -757,20 +743,20 @@ function pumpio_cron(App $a, $b)
 
 function pumpio_fetchtimeline(App $a, $uid)
 {
-	$ckey    = PConfig::get($uid, 'pumpio', 'consumer_key');
-	$csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
-	$otoken  = PConfig::get($uid, 'pumpio', 'oauth_token');
-	$osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
-	$lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
-	$hostname = PConfig::get($uid, 'pumpio', 'host');
-	$username = PConfig::get($uid, "pumpio", "user");
+	$ckey    = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
+	$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
+	$otoken  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
+	$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
+	$lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate');
+	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
+	$username = DI::pConfig()->get($uid, "pumpio", "user");
 
 	//  get the application name for the pump.io app
 	//  1st try personal config, then system config and fallback to the
 	//  hostname of the node if neither one is set.
-	$application_name  = PConfig::get($uid, 'pumpio', 'application_name');
+	$application_name  = DI::pConfig()->get($uid, 'pumpio', 'application_name');
 	if ($application_name == "") {
-		$application_name  = Config::get('pumpio', 'application_name');
+		$application_name  = DI::config()->get('pumpio', 'application_name');
 	}
 	if ($application_name == "") {
 		$application_name = DI::baseUrl()->getHostname();
@@ -882,7 +868,7 @@ function pumpio_fetchtimeline(App $a, $uid)
 	}
 
 	if ($lastdate != 0) {
-		PConfig::set($uid, 'pumpio', 'lastdate', $lastdate);
+		DI::pConfig()->set($uid, 'pumpio', 'lastdate', $lastdate);
 	}
 }
 
@@ -890,9 +876,9 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 {
 	// Searching for the unliked post
 	// Two queries for speed issues
-	$orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
+	$orig_post = Post::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
 	if (!DBA::isResult($orig_post)) {
-		$orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
+		$orig_post = Post::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
 		if (!DBA::isResult($orig_post)) {
 			return;
 		}
@@ -917,7 +903,7 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 		}
 	}
 
-	Item::delete(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
+	Item::markForDeletion(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
 
 	if (DBA::isResult($r)) {
 		Logger::log("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
@@ -928,8 +914,6 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 
 function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion = true)
 {
-	require_once('include/items.php');
-
 	if (empty($post->object->id)) {
 		Logger::log('Got empty like: '.print_r($post, true), Logger::DEBUG);
 		return;
@@ -937,9 +921,9 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 
 	// Searching for the liked post
 	// Two queries for speed issues
-	$orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
+	$orig_post = Post::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
 	if (!DBA::isResult($orig_post)) {
-		$orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
+		$orig_post = Post::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
 		if (!DBA::isResult($orig_post)) {
 			return;
 		}
@@ -973,7 +957,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 	}
 
 	$condition = ['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']];
-	if (Item::exists($condition)) {
+	if (Post::exists($condition)) {
 		Logger::log("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 		return;
 	}
@@ -986,7 +970,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 	$likedata['wall'] = 0;
 	$likedata['network'] = Protocol::PUMPIO;
 	$likedata['uri'] = Item::newURI($uid);
-	$likedata['parent-uri'] = $orig_post["uri"];
+	$likedata['thr-parent'] = $orig_post['uri'];
 	$likedata['contact-id'] = $contactid;
 	$likedata['app'] = $post->generator->displayName;
 	$likedata['author-name'] = $post->actor->displayName;
@@ -997,11 +981,11 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 
 	$author  = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
 	$objauthor =  '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
-	$post_type = L10n::t('status');
+	$post_type = DI::l10n()->t('status');
 	$plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
 	$likedata['object-type'] = Activity\ObjectType::NOTE;
 
-	$likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
+	$likedata['body'] = DI::l10n()->t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
 
 	$likedata['object'] = '<object><type>' . Activity\ObjectType::NOTE . '</type><local>1</local>' .
 		'<id>' . $orig_post['uri'] . '</id><link>' . XML::escape('<link rel="alternate" type="text/html" href="' . XML::escape($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
@@ -1074,7 +1058,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 	}
 
 	if (!empty($contact->image->url)) {
-		Contact::updateAvatar($contact->image->url, $uid, $contact_id);
+		Contact::updateAvatar($contact_id, $contact->image->url);
 	}
 
 	return $contact_id;
@@ -1084,14 +1068,14 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
 {
 	// Two queries for speed issues
 	$condition = ['uri' => $post->object->id, 'uid' => $uid];
-	if (Item::exists($condition)) {
-		Item::delete($condition);
+	if (Post::exists($condition)) {
+		Item::markForDeletion($condition);
 		return true;
 	}
 
 	$condition = ['extid' => $post->object->id, 'uid' => $uid];
-	if (Item::exists($condition)) {
-		Item::delete($condition);
+	if (Post::exists($condition)) {
+		Item::markForDeletion($condition);
 		return true;
 	}
 	return false;
@@ -1099,8 +1083,6 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
 
 function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcompletion = true)
 {
-	require_once('include/items.php');
-
 	if (($post->verb == "like") || ($post->verb == "favorite")) {
 		return pumpio_dolike($a, $uid, $self, $post, $own_id);
 	}
@@ -1115,10 +1097,10 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 
 	if ($post->verb != "update") {
 		// Two queries for speed issues
-		if (Item::exists(['uri' => $post->object->id, 'uid' => $uid])) {
+		if (Post::exists(['uri' => $post->object->id, 'uid' => $uid])) {
 			return false;
 		}
-		if (Item::exists(['extid' => $post->object->id, 'uid' => $uid])) {
+		if (Post::exists(['extid' => $post->object->id, 'uid' => $uid])) {
 			return false;
 		}
 	}
@@ -1159,7 +1141,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 			$contact_id = $self[0]['id'];
 		}
 
-		$postarray['parent-uri'] = $post->object->id;
+		$postarray['thr-parent'] = $post->object->id;
 
 		if (!$public) {
 			$postarray['private'] = 1;
@@ -1220,7 +1202,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 		$reply->url = $post->object->inReplyTo->url;
 		pumpio_dopost($a, $client, $uid, $self, $reply, $own_id, false);
 
-		$postarray['parent-uri'] = $post->object->inReplyTo->id;
+		$postarray['thr-parent'] = $post->object->inReplyTo->id;
 	}
 
 	// When there is no content there is no need to continue
@@ -1280,9 +1262,8 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 			$created = '';
 		}
 
-		$postarray['body'] = share_header($share_author, $post->object->author->url,
-						$post->object->author->image->url, "",
-						$created, $post->links->self->href).
+		$postarray['body'] = Friendica\Content\Text\BBCode::getShareOpeningTag($share_author, $post->object->author->url,
+						$post->object->author->image->url, $post->links->self->href, $created) .
 					$postarray['body']."[/share]";
 	}
 
@@ -1300,7 +1281,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 	}
 
 	if (($post->object->objectType == "comment") && $threadcompletion) {
-		pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
+		pumpio_fetchallcomments($a, $uid, $postarray['thr-parent']);
 	}
 
 	return $top_item;
@@ -1308,23 +1289,23 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 
 function pumpio_fetchinbox(App $a, $uid)
 {
-	$ckey     = PConfig::get($uid, 'pumpio', 'consumer_key');
-	$csecret  = PConfig::get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = PConfig::get($uid, 'pumpio', 'oauth_token');
-	$osecret  = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
-	$lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
-	$hostname = PConfig::get($uid, 'pumpio', 'host');
-	$username = PConfig::get($uid, "pumpio", "user");
+	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
+	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
+	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
+	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
+	$lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate');
+	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
+	$username = DI::pConfig()->get($uid, "pumpio", "user");
 
 	$own_id = "https://".$hostname."/".$username;
 
 	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid));
 
-	$lastitems = q("SELECT `uri` FROM `thread`
-			INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-			WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != ''
-			ORDER BY `thread`.`commented` DESC LIMIT 10",
+	$lastitems = q("SELECT `uri` FROM `post-thread-user`
+			INNER JOIN `post-view` ON `post-view`.`id` = `post-thread-user`.`id`
+			WHERE `post-thread-user`.`network` = '%s' AND `post-thread-user`.`uid` = %d AND `post-view`.`extid` != ''
+			ORDER BY `post-thread-user`.`commented` DESC LIMIT 10",
 				DBA::escape(Protocol::PUMPIO),
 				intval($uid)
 			);
@@ -1339,7 +1320,7 @@ function pumpio_fetchinbox(App $a, $uid)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	$last_id = PConfig::get($uid, 'pumpio', 'last_id');
+	$last_id = DI::pConfig()->get($uid, 'pumpio', 'last_id');
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
 
@@ -1372,17 +1353,17 @@ function pumpio_fetchinbox(App $a, $uid)
 		pumpio_fetchallcomments($a, $uid, $item["uri"]);
 	}
 
-	PConfig::set($uid, 'pumpio', 'last_id', $last_id);
+	DI::pConfig()->set($uid, 'pumpio', 'last_id', $last_id);
 }
 
 function pumpio_getallusers(App &$a, $uid)
 {
-	$ckey     = PConfig::get($uid, 'pumpio', 'consumer_key');
-	$csecret  = PConfig::get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = PConfig::get($uid, 'pumpio', 'oauth_token');
-	$osecret  = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
-	$hostname = PConfig::get($uid, 'pumpio', 'host');
-	$username = PConfig::get($uid, "pumpio", "user");
+	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
+	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
+	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
+	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
+	$username = DI::pConfig()->get($uid, "pumpio", "user");
 
 	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
@@ -1432,7 +1413,7 @@ function pumpio_getreceiver(App $a, array $b)
 			return $receiver;
 		}
 
-		$public = PConfig::get($b['uid'], "pumpio", "public");
+		$public = DI::pConfig()->get($b['uid'], "pumpio", "public");
 
 		if ($public) {
 			$receiver["to"][] = [
@@ -1510,12 +1491,12 @@ function pumpio_getreceiver(App $a, array $b)
 
 function pumpio_fetchallcomments(App $a, $uid, $id)
 {
-	$ckey     = PConfig::get($uid, 'pumpio', 'consumer_key');
-	$csecret  = PConfig::get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = PConfig::get($uid, 'pumpio', 'oauth_token');
-	$osecret  = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
-	$hostname = PConfig::get($uid, 'pumpio', 'host');
-	$username = PConfig::get($uid, "pumpio", "user");
+	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
+	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
+	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
+	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
+	$username = DI::pConfig()->get($uid, "pumpio", "user");
 
 	Logger::log("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
 
@@ -1526,12 +1507,12 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 	// Fetching the original post
 	$condition = ["`uri` = ? AND `uid` = ? AND `extid` != ''", $id, $uid];
-	$item = Item::selectFirst(['extid'], $condition);
-	if (!DBA::isResult($item)) {
+	$original = Post::selectFirst(['extid'], $condition);
+	if (!DBA::isResult($original)) {
 		return false;
 	}
 
-	$url = $item["extid"];
+	$url = $original["extid"];
 
 	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
@@ -1583,11 +1564,11 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 		}
 
 		// Checking if the comment already exists - Two queries for speed issues
-		if (Item::exists(['uri' => $item->id, 'uid' => $uid])) {
+		if (Post::exists(['uri' => $item->id, 'uid' => $uid])) {
 			continue;
 		}
 
-		if (Item::exists(['extid' => $item->id, 'uid' => $uid])) {
+		if (Post::exists(['extid' => $item->id, 'uid' => $uid])) {
 			continue;
 		}
 
@@ -1613,7 +1594,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 function pumpio_reachable($url)
 {
-	return Network::curl($url, false, ['timeout' => 10])->isSuccess();
+	return DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => 10])->isSuccess();
 }
 
 /*