X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=357f17433b1bf495eb1868760b8fc00ae124b264;hb=7777f080475df3218c851bd48ab609bcc54a071d;hp=191f8505218b7ddb810142d3e0920e3dac1180ad;hpb=4168bff3b99869a957f198cabeaa455ca759662d;p=friendica-addons.git diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 191f8505..357f1743 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -6,63 +6,52 @@ * Author: Michael Vogel */ +use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; -use Friendica\Database\DBM; +use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; -use Friendica\Model\Queue; +use Friendica\Model\Post; use Friendica\Model\User; +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; require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/oauth_client.php'; -require_once 'include/enotify.php'; require_once "mod/share.php"; define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes function pumpio_install() { - Addon::registerHook('load_config', 'addon/pumpio/pumpio.php', 'pumpio_load_config'); - Addon::registerHook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - Addon::registerHook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - Addon::registerHook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - Addon::registerHook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - Addon::registerHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - Addon::registerHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - Addon::registerHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - Addon::registerHook('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); -} - -function pumpio_uninstall() -{ - Addon::unregisterHook('load_config', 'addon/pumpio/pumpio.php', 'pumpio_load_config'); - Addon::unregisterHook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - Addon::unregisterHook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - Addon::unregisterHook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - Addon::unregisterHook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - Addon::unregisterHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - Addon::unregisterHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - Addon::unregisterHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - Addon::unregisterHook('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + Hook::register('load_config', 'addon/pumpio/pumpio.php', 'pumpio_load_config'); + Hook::register('hook_fork', 'addon/pumpio/pumpio.php', 'hook_fork'); + Hook::register('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + Hook::register('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + Hook::register('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + Hook::register('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + Hook::register('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + Hook::register('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + Hook::register('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_module() {} -function pumpio_content(&$a) +function pumpio_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return ''; } @@ -86,34 +75,34 @@ function pumpio_content(&$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; } -function pumpio_registerclient(&$a, $host) +function pumpio_registerclient(App $a, $host) { $url = "https://".$host."/api/client/register"; $params = []; - $application_name = Config::get('pumpio', 'application_name'); + $application_name = DI::config()->get('pumpio', 'application_name'); if ($application_name == "") { - $application_name = $a->get_hostname(); + $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->get_baseurl()."/images/friendica-256.png"; - $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect"; + $params["logo_url"] = DI::baseUrl()->get()."/images/friendica-256.png"; + $params["redirect_uris"] = DI::baseUrl()->get()."/pumpio/connect"; - logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG); + Logger::log("pumpio_registerclient: ".$url." parameters ".print_r($params, true), Logger::DEBUG); $ch = curl_init($url); curl_setopt($ch, CURLOPT_HEADER, false); @@ -127,45 +116,41 @@ function pumpio_registerclient(&$a, $host) if ($curl_info["http_code"] == "200") { $values = json_decode($s); - logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG); + Logger::log("pumpio_registerclient: success ".print_r($values, true), Logger::DEBUG); return $values; } - logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG); + Logger::log("pumpio_registerclient: failed: ".print_r($curl_info, true), Logger::DEBUG); return false; } -function pumpio_connect(&$a) +function pumpio_connect(App $a) { - // Start a session. This is necessary to hold on to a few keys the callback script will also need - session_start(); - // 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("pumpio_connect: register client"); + 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("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG); + Logger::log("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, Logger::DEBUG); } if (($consumer_key == "") || ($consumer_secret == "")) { - logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname)); + 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->get_baseurl()."/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. @@ -173,7 +158,7 @@ function pumpio_connect(&$a) // Create a new instance of the oauth_client_class library. For this step, all we need to give the library is our // Consumer Key and Consumer Secret $client = new oauth_client_class; - $client->debug = 1; + $client->debug = 0; $client->server = ''; $client->oauth_version = '1.0a'; $client->request_token_url = 'https://'.$hostname.'/oauth/request_token'; @@ -188,9 +173,9 @@ function pumpio_connect(&$a) if (($success = $client->Initialize())) { if (($success = $client->Process())) { if (strlen($client->access_token)) { - logger("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); + Logger::log("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, Logger::DEBUG); + 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); @@ -200,33 +185,36 @@ function pumpio_connect(&$a) } if ($success) { - logger("pumpio_connect: authenticated"); - $o .= L10n::t("You are now authenticated to pumpio."); - $o .= '
'.L10n::t("return to the connector page").''; + Logger::log("pumpio_connect: authenticated"); + $o = DI::l10n()->t("You are now authenticated to pumpio."); + $o .= '
'.DI::l10n()->t("return to the connector page").''; } else { - logger("pumpio_connect: could not connect"); + Logger::log("pumpio_connect: could not connect"); $o = 'Could not connect to pumpio. Refresh the page or try again later.'; } return $o; } -function pumpio_jot_nets(&$a, &$b) +function pumpio_jot_nets(App $a, array &$jotnets_fields) { - if (!local_user()) { + if (! local_user()) { return; } - $pumpio_post = PConfig::get(local_user(), 'pumpio', 'post'); - if (intval($pumpio_post) == 1) { - $pumpio_defpost = PConfig::get(local_user(), 'pumpio', 'post_by_default'); - $selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . L10n::t('Post to pumpio') . '
'; + if (DI::pConfig()->get(local_user(), 'pumpio', 'post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'pumpio_enable', + DI::l10n()->t('Post to pumpio'), + DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default') + ] + ]; } } -function pumpio_settings(&$a, &$s) +function pumpio_settings(App $a, &$s) { if (!local_user()) { return; @@ -234,86 +222,86 @@ function pumpio_settings(&$a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + DI::page()['htmlhead'] .= '' . "\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 .= ''; - $s .= '

'. L10n::t('Pump.io Import/Export/Mirror').'

'; + $s .= '

'. DI::l10n()->t('Pump.io Import/Export/Mirror').'

'; $s .= ''; $s .= ''; } -function pumpio_settings_post(&$a, &$b) +function pumpio_settings_post(App $a, array &$b) { - if (x($_POST, 'pumpio-submit')) { - if (x($_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', ''); + if (!empty($_POST['pumpio-submit'])) { + if (!empty($_POST['pumpio_delete'])) { + 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']; if (strstr($user, "@")) { $pos = strpos($user, "@"); + if ($pos > 0) { $user = substr($user, 0, $pos); } @@ -358,39 +347,73 @@ function pumpio_settings_post(&$a, &$b) $host = trim($host); $host = str_replace(["https://", "http://"], ["", ""], $host); - PConfig::set(local_user(), 'pumpio', 'post',intval($_POST['pumpio'])); - PConfig::set(local_user(), 'pumpio', 'import', $_POST['pumpio_import']); - PConfig::set(local_user(), 'pumpio', 'host', $host); - PConfig::set(local_user(), 'pumpio', 'user', $user); - PConfig::set(local_user(), 'pumpio', 'public', $_POST['pumpio_public']); - PConfig::set(local_user(), 'pumpio', 'mirror', $_POST['pumpio_mirror']); - PConfig::set(local_user(), 'pumpio', 'post_by_default',intval($_POST['pumpio_bydefault'])); + 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 (!$_POST['pumpio_mirror']) { - PConfig::delete(local_user(), 'pumpio', 'lastdate'); + if (!empty($_POST['pumpio_mirror'])) { + DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); } - - //header("Location: ".$a->get_baseurl()."/pumpio/connect"); } } } -function pumpio_load_config(\Friendica\App $a) +function pumpio_load_config(App $a, ConfigFileLoader $loader) +{ + $a->getConfigCache()->load($loader->loadAddonConfig('pumpio')); +} + +function pumpio_hook_fork(App $a, array &$b) { - $a->loadConfigFile(__DIR__. '/config/pumpio.ini.php'); + if ($b['name'] != 'notifier_normal') { + return; + } + + $post = $b['data']; + + // Deleting and editing is not supported by the addon (deleting could, but isn't by now) + if ($post['deleted'] || ($post['created'] !== $post['edited'])) { + $b['execute'] = false; + return; + } + + // if post comes from pump.io don't send it back + if ($post['app'] == "pump.io") { + $b['execute'] = false; + return; + } + + 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']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) { + Logger::log('No pump.io parent found for item ' . $post['id']); + $b['execute'] = false; + return; + } + } else { + // Comments are never exported when we don't import the pumpio timeline + if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) { + $b['execute'] = false; + return; + } + } } -function pumpio_post_local(&$a, &$b) +function pumpio_post_local(App $a, array &$b) { if (!local_user() || (local_user() != $b['uid'])) { return; } - $pumpio_post = intval(PConfig::get(local_user(), 'pumpio', 'post')); + $pumpio_post = intval(DI::pConfig()->get(local_user(), 'pumpio', 'post')); - $pumpio_enable = (($pumpio_post && x($_REQUEST, 'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0); + $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; } @@ -405,23 +428,21 @@ function pumpio_post_local(&$a, &$b) $b['postopts'] .= 'pumpio'; } -function pumpio_send(&$a, &$b) +function pumpio_send(App $a, array &$b) { - if (!PConfig::get($b["uid"], 'pumpio', 'import')) { - if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { - return; - } + if (!DI::pConfig()->get($b["uid"], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) { + return; } - logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA); + Logger::log("pumpio_send: parameter ".print_r($b, true), Logger::DATA); if ($b['parent'] != $b['id']) { // Looking if its a reply to a pumpio post - $condition = ['id' => $b['parent'], 'network' => NETWORK_PUMPIO]; - $orig_post = Item::selectFirst([], $condition); + $condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO]; + $orig_post = Post::selectFirst([], $condition); - if (!DBM::is_result($orig_post)) { - logger("pumpio_send: no pumpio post ".$b["parent"]); + if (!DBA::isResult($orig_post)) { + Logger::log("pumpio_send: no pumpio post ".$b["parent"]); return; } else { $iscomment = true; @@ -431,7 +452,7 @@ function pumpio_send(&$a, &$b) $receiver = pumpio_getreceiver($a, $b); - logger("pumpio_send: receiver ".print_r($receiver, true)); + Logger::log("pumpio_send: receiver ".print_r($receiver, true)); if (!count($receiver) && ($b['private'] || !strstr($b['postopts'], 'pumpio'))) { return; @@ -445,7 +466,7 @@ function pumpio_send(&$a, &$b) } } - if ($b['verb'] == ACTIVITY_LIKE) { + if ($b['verb'] == Activity::LIKE) { if ($b['deleted']) { pumpio_action($a, $b["uid"], $b["thr-parent"], "unlike"); } else { @@ -454,15 +475,15 @@ function pumpio_send(&$a, &$b) return; } - if ($b['verb'] == ACTIVITY_DISLIKE) { + if ($b['verb'] == Activity::DISLIKE) { return; } - if (($b['verb'] == ACTIVITY_POST) && ($b['created'] !== $b['edited']) && !$b['deleted']) { + if (($b['verb'] == Activity::POST) && ($b['created'] !== $b['edited']) && !$b['deleted']) { pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]); } - if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) { + if (($b['verb'] == Activity::POST) && $b['deleted']) { pumpio_action($a, $b["uid"], $b["uri"], "delete"); } @@ -479,19 +500,19 @@ function pumpio_send(&$a, &$b) // Support for native shares // http:///api//shares?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::convert($b['body'], false, BBCode::CONNECTORS); $params = []; @@ -525,8 +546,8 @@ function pumpio_send(&$a, &$b) $inReplyTo = ["id" => $orig_post["uri"], "objectType" => "note"]; - if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) { - $inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); + if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], ActivityNamespace::ACTIVITY_SCHEMA))) { + $inReplyTo["objectType"] = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post["object-type"]); } $params["object"] = [ @@ -559,48 +580,39 @@ function pumpio_send(&$a, &$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; - logger('pumpio_send '.$username.': success '.$post_id); + Logger::log('pumpio_send '.$username.': success '.$post_id); if ($post_id && $iscomment) { - logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); + Logger::log('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); Item::update(['extid' => $post_id], ['id' => $b['id']]); } } else { - logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true)); - - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); - if (DBM::is_result($r)) { - $a->contact = $r[0]["id"]; - } - - $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]); - - Queue::add($a->contact, NETWORK_PUMPIO, $s); - notice(L10n::t('Pump.io post failed. Queued for retry.').EOL); + Logger::log('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true)); + Worker::defer(); } } } -function pumpio_action(&$a, $uid, $uri, $action, $content = "") +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 (!DBM::is_result($orig_post)) { + if (!DBA::isResult($orig_post)) { return; } @@ -610,8 +622,8 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") $uri = $orig_post["uri"]; } - if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) { - $objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); + if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], ActivityNamespace::ACTIVITY_SCHEMA))) { + $objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post["object-type"]); } elseif (strstr($uri, "/api/comment/")) { $objectType = "comment"; } elseif (strstr($uri, "/api/note/")) { @@ -644,52 +656,43 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") } if ($success) { - logger('pumpio_action '.$username.' '.$action.': success '.$uri); + Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri); } else { - logger('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true)); - - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); - if (DBM::is_result($r)) { - $a->contact = $r[0]["id"]; - } - - $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]); - - Queue::add($a->contact, NETWORK_PUMPIO, $s); - notice(L10n::t('Pump.io like failed. Queued for retry.').EOL); + Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri); + Worker::defer(); } } -function pumpio_sync(&$a) +function pumpio_sync(App $a) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'"); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { 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); if ($next > time()) { - logger('pumpio: poll intervall not reached'); + Logger::log('pumpio: poll intervall not reached'); return; } } - logger('pumpio: cron_start'); + Logger::log('pumpio: cron_start'); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() "); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $rr) { - logger('pumpio: mirroring user '.$rr['uid']); + Logger::log('pumpio: mirroring user '.$rr['uid']); pumpio_fetchtimeline($a, $rr['uid']); } } - $abandon_days = intval(Config::get('system', 'account_abandon_days')); + $abandon_days = intval(DI::config()->get('system', 'account_abandon_days')); if ($abandon_days < 1) { $abandon_days = 0; } @@ -697,21 +700,21 @@ function pumpio_sync(&$a) $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() "); - if (DBM::is_result($r)) { + 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 (!DBM::is_result($user)) { - logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported'); + if (!DBA::isResult($user)) { + Logger::log('abandoned account: timeline from user '.$rr['uid'].' will not be imported'); continue; } } - logger('pumpio: importing timeline from user '.$rr['uid']); + Logger::log('pumpio: importing timeline from user '.$rr['uid']); 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 { @@ -720,40 +723,40 @@ function pumpio_sync(&$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('pumpio: cron_end'); + Logger::log('pumpio: cron_end'); - Config::set('pumpio', 'last_poll', time()); + DI::config()->set('pumpio', 'last_poll', time()); } -function pumpio_cron(&$a, $b) +function pumpio_cron(App $a, $b) { Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php"); } -function pumpio_fetchtimeline(&$a, $uid) +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 = $a->get_hostname(); + $application_name = DI::baseUrl()->getHostname(); } $first_time = ($lastdate == ""); @@ -770,7 +773,7 @@ function pumpio_fetchtimeline(&$a, $uid) $url = 'https://'.$hostname.'/api/user/'.$username.'/feed/major'; - logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret); + Logger::log('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret); $useraddr = $username.'@'.$hostname; @@ -778,10 +781,11 @@ function pumpio_fetchtimeline(&$a, $uid) $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user); } else { $success = false; + $user = []; } if (!$success) { - logger('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true)); + Logger::log('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true)); return; } @@ -830,7 +834,7 @@ function pumpio_fetchtimeline(&$a, $uid) $_REQUEST["source"] = "pump.io"; if (isset($post->object->id)) { - $_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id; + $_REQUEST['message_id'] = Protocol::PUMPIO.":".$post->object->id; } if ($post->object->displayName != "") { @@ -850,44 +854,44 @@ function pumpio_fetchtimeline(&$a, $uid) } } - logger('pumpio: posting for user '.$uid); + Logger::log('pumpio: posting for user '.$uid); require_once('mod/item.php'); item_post($a); - logger('pumpio: posting done - user '.$uid); + Logger::log('pumpio: posting done - user '.$uid); } } } if ($lastdate != 0) { - PConfig::set($uid, 'pumpio', 'lastdate', $lastdate); + DI::pConfig()->set($uid, 'pumpio', 'lastdate', $lastdate); } } -function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) +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]); - if (!DBM::is_result($orig_post)) { - $orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]); - if (!DBM::is_result($orig_post)) { + $orig_post = Post::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]); + if (!DBA::isResult($orig_post)) { + $orig_post = Post::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]); + if (!DBA::isResult($orig_post)) { return; } } $contactid = 0; - if (link_compare($post->actor->url, $own_id)) { + if (Strings::compareLink($post->actor->url, $own_id)) { $contactid = $self[0]['id']; } else { $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc(normalise_link($post->actor->url)), + DBA::escape(Strings::normaliseLink($post->actor->url)), intval($uid) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $contactid = $r[0]['id']; } @@ -896,30 +900,28 @@ function pumpio_dounlike(&$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 (DBM::is_result($r)) { - logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); + if (DBA::isResult($r)) { + Logger::log("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } else { - logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); + Logger::log("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } } -function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) +function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion = true) { - require_once('include/items.php'); - if (empty($post->object->id)) { - logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG); + Logger::log('Got empty like: '.print_r($post, true), Logger::DEBUG); return; } // Searching for the liked post // Two queries for speed issues - $orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]); - if (!DBM::is_result($orig_post)) { - $orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]); - if (!DBM::is_result($orig_post)) { + $orig_post = Post::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]); + if (!DBA::isResult($orig_post)) { + $orig_post = Post::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]); + if (!DBA::isResult($orig_post)) { return; } } @@ -931,18 +933,18 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $contactid = 0; - if (link_compare($post->actor->url, $own_id)) { + if (Strings::compareLink($post->actor->url, $own_id)) { $contactid = $self[0]['id']; $post->actor->displayName = $self[0]['name']; $post->actor->url = $self[0]['url']; $post->actor->image->url = $self[0]['photo']; } else { $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc(normalise_link($post->actor->url)), + DBA::escape(Strings::normaliseLink($post->actor->url)), intval($uid) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $contactid = $r[0]['id']; } @@ -951,63 +953,47 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru } } - $condition = ['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]; - if (DBA::exists('item', $condition)) { - logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); + $condition = ['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]; + if (Post::exists($condition)) { + Logger::log("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); return; } $likedata = []; $likedata['parent'] = $orig_post['id']; - $likedata['verb'] = ACTIVITY_LIKE; + $likedata['verb'] = Activity::LIKE; $likedata['gravity'] = GRAVITY_ACTIVITY; $likedata['uid'] = $uid; $likedata['wall'] = 0; - $likedata['network'] = NETWORK_PUMPIO; + $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; $likedata['author-link'] = $post->actor->url; - $likedata['author-avatar'] = $post->actor->image->url; + if (!empty($post->actor->image)) { + $likedata['author-avatar'] = $post->actor->image->url; + } $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_OBJ_NOTE; + $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'] = '' . ACTIVITY_OBJ_NOTE . '1' . - '' . $orig_post['uri'] . '' . xmlify('') . '' . $orig_post['title'] . '' . $orig_post['body'] . ''; + $likedata['object'] = '' . Activity\ObjectType::NOTE . '1' . + '' . $orig_post['uri'] . '' . XML::escape('') . '' . $orig_post['title'] . '' . $orig_post['body'] . ''; $ret = Item::insert($likedata); - logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); + Logger::log("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } function pumpio_get_contact($uid, $contact, $no_insert = false) { - $gcontact = ["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, - "name" => $contact->displayName, "hide" => true, - "nick" => $contact->preferredUsername, - "addr" => str_replace("acct:", "", $contact->id)]; - - if (!empty($contact->location->displayName)) { - $gcontact["location"] = $contact->location->displayName; - } - - if (!empty($contact->summary)) { - $gcontact["about"] = $contact->summary; - } - - if (!empty($contact->image->url)) { - $gcontact["photo"] = $contact->image->url; - } - - GContact::update($gcontact); $cid = Contact::getIdForURL($contact->url, $uid); if ($no_insert) { @@ -1015,39 +1001,39 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) } $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", - intval($uid), dbesc(normalise_link($contact->url))); + intval($uid), DBA::escape(Strings::normaliseLink($contact->url))); - if (!DBM::is_result($r)) { + 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), - dbesc(DateTimeFormat::utcNow()), - dbesc($contact->url), - dbesc(normalise_link($contact->url)), - dbesc(str_replace("acct:", "", $contact->id)), - dbesc(''), - dbesc($contact->id), // What is it for? - dbesc('pump.io ' . $contact->id), // What is it for? - dbesc($contact->displayName), - dbesc($contact->preferredUsername), - dbesc($contact->image->url), - dbesc(NETWORK_PUMPIO), - intval(CONTACT_IS_FRIEND), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape($contact->url), + DBA::escape(Strings::normaliseLink($contact->url)), + DBA::escape(str_replace("acct:", "", $contact->id)), + DBA::escape(''), + DBA::escape($contact->id), // What is it for? + DBA::escape('pump.io ' . $contact->id), // What is it for? + DBA::escape($contact->displayName), + DBA::escape($contact->preferredUsername), + DBA::escape($contact->image->url), + DBA::escape(Protocol::PUMPIO), + intval(Contact::FRIEND), intval(1), - dbesc($contact->location->displayName), - dbesc($contact->summary), + DBA::escape($contact->location->displayName), + DBA::escape($contact->summary), intval(1) ); $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", - dbesc(normalise_link($contact->url)), + DBA::escape(Strings::normaliseLink($contact->url)), intval($uid) ); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { return false; } @@ -1069,33 +1055,31 @@ 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; } -function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) +function pumpio_dodelete(App $a, $uid, $self, $post, $own_id) { // Two queries for speed issues $condition = ['uri' => $post->object->id, 'uid' => $uid]; - if (DBA::exists('item', $condition)) { - Item::delete($condition); + if (Post::exists($condition)) { + Item::markForDeletion($condition); return true; } $condition = ['extid' => $post->object->id, 'uid' => $uid]; - if (DBA::exists('item', $condition)) { - Item::delete($condition); + if (Post::exists($condition)) { + Item::markForDeletion($condition); return true; } return false; } -function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) +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); } @@ -1110,10 +1094,10 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if ($post->verb != "update") { // Two queries for speed issues - if (DBA::exists('item', ['uri' => $post->object->id, 'uid' => $uid])) { + if (Post::exists(['uri' => $post->object->id, 'uid' => $uid])) { return false; } - if (DBA::exists('item', ['extid' => $post->object->id, 'uid' => $uid])) { + if (Post::exists(['extid' => $post->object->id, 'uid' => $uid])) { return false; } } @@ -1141,11 +1125,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet } $postarray = []; - $postarray['network'] = NETWORK_PUMPIO; + $postarray['network'] = Protocol::PUMPIO; $postarray['uid'] = $uid; $postarray['wall'] = 0; $postarray['uri'] = $post->object->id; - $postarray['object-type'] = NAMESPACE_ACTIVITY_SCHEMA.strtolower($post->object->objectType); + $postarray['object-type'] = ActivityNamespace::ACTIVITY_SCHEMA . strtolower($post->object->objectType); if ($post->object->objectType != "comment") { $contact_id = pumpio_get_contact($uid, $post->actor); @@ -1154,7 +1138,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $contact_id = $self[0]['id']; } - $postarray['parent-uri'] = $post->object->id; + $postarray['thr-parent'] = $post->object->id; if (!$public) { $postarray['private'] = 1; @@ -1163,7 +1147,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet } else { $contact_id = pumpio_get_contact($uid, $post->actor, true); - if (link_compare($post->actor->url, $own_id)) { + if (Strings::compareLink($post->actor->url, $own_id)) { $contact_id = $self[0]['id']; $post->actor->displayName = $self[0]['name']; $post->actor->url = $self[0]['url']; @@ -1171,19 +1155,19 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet } elseif ($contact_id == 0) { // Take an existing contact, the contact of the note or - as a fallback - the id of the user $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc(normalise_link($post->actor->url)), + DBA::escape(Strings::normaliseLink($post->actor->url)), intval($uid) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $contact_id = $r[0]['id']; } else { $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc(normalise_link($post->actor->url)), + DBA::escape(Strings::normaliseLink($post->actor->url)), intval($uid) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $contact_id = $r[0]['id']; } else { $contact_id = $self[0]['id']; @@ -1198,7 +1182,10 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $reply->cc = $post->cc; } - $reply->to = $post->to; + if (isset($post->to)) { + $reply->to = $post->to; + } + $reply->object = new stdClass; $reply->object->objectType = $post->object->inReplyTo->objectType; $reply->object->content = $post->object->inReplyTo->content; @@ -1212,7 +1199,12 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $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 + if (empty($post->object->content)) { + return false; } if (!empty($post->object->pump_io->proxyURL)) { @@ -1220,15 +1212,18 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet } $postarray['contact-id'] = $contact_id; - $postarray['verb'] = ACTIVITY_POST; + $postarray['verb'] = Activity::POST; $postarray['owner-name'] = $post->actor->displayName; $postarray['owner-link'] = $post->actor->url; - $postarray['owner-avatar'] = $post->actor->image->url; - $postarray['author-name'] = $post->actor->displayName; - $postarray['author-link'] = $post->actor->url; - $postarray['author-avatar'] = $post->actor->image->url; + $postarray['author-name'] = $postarray['owner-name']; + $postarray['author-link'] = $postarray['owner-link']; + if (!empty($post->actor->image)) { + $postarray['owner-avatar'] = $post->actor->image->url; + $postarray['author-avatar'] = $postarray['owner-avatar']; + } $postarray['plink'] = $post->object->url; $postarray['app'] = $post->generator->displayName; + $postarray['title'] = ''; $postarray['body'] = HTML::toBBCode($post->object->content); $postarray['object'] = json_encode($post); @@ -1258,10 +1253,14 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $share_author = $post->object->author->url; } - $postarray['body'] = share_header($share_author, $post->object->author->url, - $post->object->author->image->url, "", - DateTimeFormat::utc($post->object->created), - $post->links->self->href). + if (isset($post->object->created)) { + $created = DateTimeFormat::utc($post->object->created); + } else { + $created = ''; + } + + $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]"; } @@ -1279,32 +1278,32 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet } if (($post->object->objectType == "comment") && $threadcompletion) { - pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']); + pumpio_fetchallcomments($a, $uid, $postarray['thr-parent']); } return $top_item; } -function pumpio_fetchinbox(&$a, $uid) +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", - dbesc(NETWORK_PUMPIO), + $lastitems = q("SELECT `uri` FROM `post-thread-user` + INNER JOIN `post-view` ON `post-view`.`id` = `post-thread-user`.`iid` + 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) ); @@ -1318,7 +1317,7 @@ function pumpio_fetchinbox(&$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'; @@ -1336,7 +1335,7 @@ function pumpio_fetchinbox(&$a, $uid) return; } - if ($user->items) { + if (!empty($user->items)) { $posts = array_reverse($user->items); if (count($posts)) { @@ -1347,21 +1346,21 @@ function pumpio_fetchinbox(&$a, $uid) } } - foreach ($lastitems AS $item) { + foreach ($lastitems as $item) { 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(&$a, $uid) +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'; @@ -1376,112 +1375,33 @@ function pumpio_getallusers(&$a, $uid) $url = 'https://'.$hostname.'/api/user/'.$username.'/following'; if (pumpio_reachable($url)) { - $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $users); } else { $success = false; } + if (empty($users)) { + return; + } + if ($users->totalItems > count($users->items)) { $url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems; if (pumpio_reachable($url)) { - $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $users); } else { $success = false; } } - if (is_array($users->items)) { - foreach ($users->items AS $user) { + if (!empty($users->items)) { + foreach ($users->items as $user) { pumpio_get_contact($uid, $user); } } } -function pumpio_queue_hook(&$a, &$b) -{ - $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", - dbesc(NETWORK_PUMPIO) - ); - if (!DBM::is_result($qi)) { - return; - } - - foreach ($qi as $x) { - if ($x['network'] !== NETWORK_PUMPIO) { - continue; - } - - logger('pumpio_queue: run'); - - $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` - WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1", - intval($x['cid']) - ); - if (!DBM::is_result($r)) { - continue; - } - - $userdata = $r[0]; - - //logger('pumpio_queue: fetching userdata '.print_r($userdata, true)); - - $oauth_token = PConfig::get($userdata['uid'], "pumpio", "oauth_token"); - $oauth_token_secret = PConfig::get($userdata['uid'], "pumpio", "oauth_token_secret"); - $consumer_key = PConfig::get($userdata['uid'], "pumpio","consumer_key"); - $consumer_secret = PConfig::get($userdata['uid'], "pumpio","consumer_secret"); - - $host = PConfig::get($userdata['uid'], "pumpio", "host"); - $user = PConfig::get($userdata['uid'], "pumpio", "user"); - - $success = false; - - if ($oauth_token && $oauth_token_secret && - $consumer_key && $consumer_secret) { - $username = $user.'@'.$host; - - logger('pumpio_queue: able to post for user '.$username); - - $z = unserialize($x['content']); - - $client = new oauth_client_class; - $client->oauth_version = '1.0a'; - $client->url_parameters = false; - $client->authorization_header = true; - $client->access_token = $oauth_token; - $client->access_token_secret = $oauth_token_secret; - $client->client_id = $consumer_key; - $client->client_secret = $consumer_secret; - - if (pumpio_reachable($z['url'])) { - $success = $client->CallAPI($z['url'], 'POST', $z['post'], ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); - } else { - $success = false; - } - - if ($success) { - $post_id = $user->object->id; - logger('pumpio_queue: send '.$username.': success '.$post_id); - if ($post_id && $iscomment) { - logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']); - Item::update(['extid' => $post_id], ['id' => $z['item']]); - } - Queue::removeItem($x['id']); - } else { - logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user, true)); - } - } else { - logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']); - } - - if (!$success) { - logger('pumpio_queue: delayed'); - Queue::updateTime($x['id']); - } - } -} - -function pumpio_getreceiver(&$a, $b) +function pumpio_getreceiver(App $a, array $b) { $receiver = []; @@ -1490,7 +1410,7 @@ function pumpio_getreceiver(&$a, $b) return $receiver; } - $public = PConfig::get($b['uid'], "pumpio", "public"); + $public = DI::pConfig()->get($b['uid'], "pumpio", "public"); if ($public) { $receiver["to"][] = [ @@ -1507,10 +1427,10 @@ function pumpio_getreceiver(&$a, $b) $r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", intval($cid), intval($b["uid"]), - dbesc(NETWORK_PUMPIO) + DBA::escape(Protocol::PUMPIO) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $receiver["bcc"][] = [ "displayName" => $r[0]["name"], "objectType" => "person", @@ -1525,7 +1445,7 @@ function pumpio_getreceiver(&$a, $b) "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ". "AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'", intval($gid), - dbesc(NETWORK_PUMPIO) + DBA::escape(Protocol::PUMPIO) ); foreach ($r AS $row) @@ -1550,10 +1470,10 @@ function pumpio_getreceiver(&$a, $b) $r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", intval($cid), intval($b["uid"]), - dbesc(NETWORK_PUMPIO) + DBA::escape(Protocol::PUMPIO) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $receiver["to"][] = [ "displayName" => $r[0]["name"], "objectType" => "person", @@ -1566,16 +1486,16 @@ function pumpio_getreceiver(&$a, $b) return $receiver; } -function pumpio_fetchallcomments(&$a, $uid, $id) +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("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id); + Logger::log("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id); $own_id = "https://".$hostname."/".$username; @@ -1584,12 +1504,12 @@ function pumpio_fetchallcomments(&$a, $uid, $id) // Fetching the original post $condition = ["`uri` = ? AND `uid` = ? AND `extid` != ''", $id, $uid]; - $item = Item::selectFirst(['extid'], $condition); - if (!DBM::is_result($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'; @@ -1601,7 +1521,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) $client->access_token = $otoken; $client->access_token_secret = $osecret; - logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url); + Logger::log("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url); if (pumpio_reachable($url)) { $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item); @@ -1619,7 +1539,9 @@ function pumpio_fetchallcomments(&$a, $uid, $id) $like->object = new stdClass; $like->object->id = $item->id; $like->actor = new stdClass; - $like->actor->displayName = $item->displayName; + if (!empty($item->displayName)) { + $like->actor->displayName = $item->displayName; + } //$like->actor->preferredUsername = $item->preferredUsername; //$like->actor->image = $item->image; $like->actor->url = $item->url; @@ -1639,11 +1561,11 @@ function pumpio_fetchallcomments(&$a, $uid, $id) } // Checking if the comment already exists - Two queries for speed issues - if (DBA::exists('item', ['uri' => $item->id, 'uid' => $uid])) { + if (Post::exists(['uri' => $item->id, 'uid' => $uid])) { continue; } - if (DBA::exists('item', ['extid' => $item->id, 'uid' => $uid])) { + if (Post::exists(['extid' => $item->id, 'uid' => $uid])) { continue; } @@ -1662,15 +1584,14 @@ function pumpio_fetchallcomments(&$a, $uid, $id) $post->object = $item; - logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true)); + Logger::log("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true)); pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false); } } function pumpio_reachable($url) { - $data = Network::curl($url, false, $redirects, ['timeout'=>10]); - return intval($data['return_code']) != 0; + return DI::httpRequest()->get($url, ['timeout' => 10])->isSuccess(); } /*