X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=d8a2c546f1fe0d69501cffd999c2495a087774b5;hb=37dd8a938bb947d8b8f463dd58d377b40654bba6;hp=9e02a74d459f1e503a64b64b36bdb5258116303f;hpb=475299e642ed48e6038500dba55b75c30b07ecef;p=friendica-addons.git diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 9e02a74d..d8a2c546 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -6,13 +6,17 @@ * 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\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; use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Model\Group; @@ -21,42 +25,46 @@ use Friendica\Model\Queue; use Friendica\Model\User; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; -use Friendica\Database\DBM; +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('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'); + 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('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + Hook::register('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_uninstall() { - 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::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('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + Hook::unregister('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); @@ -89,7 +97,7 @@ function pumpio_check_item_notification($a, &$notification_data) $notification_data["profiles"][] = "https://".$hostname."/".$username; } -function pumpio_registerclient(&$a, $host) +function pumpio_registerclient(App $a, $host) { $url = "https://".$host."/api/client/register"; @@ -98,19 +106,19 @@ function pumpio_registerclient(&$a, $host) $application_name = Config::get('pumpio', 'application_name'); if ($application_name == "") { - $application_name = $a->get_hostname(); + $application_name = $a->getHostName(); } - $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); + $adminlist = explode(",", str_replace(" ", "", 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"] = $a->getBaseURL()."/images/friendica-256.png"; + $params["redirect_uris"] = $a->getBaseURL()."/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); @@ -124,26 +132,23 @@ 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'); 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); @@ -151,18 +156,18 @@ function pumpio_connect(&$a) $consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key'); $consumer_secret = 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; } // The callback URL is the script that gets called after the user authenticates with pumpio - $callback_url = $a->get_baseurl()."/pumpio/connect"; + $callback_url = $a->getBaseURL()."/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. @@ -170,7 +175,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'; @@ -185,7 +190,7 @@ 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); + 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); } @@ -197,24 +202,25 @@ 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 = L10n::t("You are now authenticated to pumpio."); + $o .= '
'.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, &$b) { - 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" ' : ''); @@ -223,7 +229,7 @@ function pumpio_jot_nets(&$a, &$b) } } -function pumpio_settings(&$a, &$s) +function pumpio_settings(App $a, &$s) { if (!local_user()) { return; @@ -231,7 +237,7 @@ function pumpio_settings(&$a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -281,7 +287,7 @@ function pumpio_settings(&$a, &$s) $s .= '
'; if (($oauth_token == "") || ($oauth_token_secret == "")) { $s .= '
'; } else { $s .= '
'; @@ -323,28 +329,29 @@ function pumpio_settings(&$a, &$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', ''); + 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', ''); + 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' , ''); } 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); } @@ -355,24 +362,63 @@ 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'])); + PConfig::set(local_user(), 'pumpio', 'post' , defaults($_POST, 'pumpio', false)); + PConfig::set(local_user(), 'pumpio', 'import' , defaults($_POST, 'pumpio_import', false)); + PConfig::set(local_user(), 'pumpio', 'host' , $host); + PConfig::set(local_user(), 'pumpio', 'user' , $user); + PConfig::set(local_user(), 'pumpio', 'public' , defaults($_POST, 'pumpio_public', false)); + PConfig::set(local_user(), 'pumpio', 'mirror' , defaults($_POST, 'pumpio_mirror', false)); + PConfig::set(local_user(), 'pumpio', 'post_by_default', defaults($_POST, 'pumpio_bydefault', false)); - if (!$_POST['pumpio_mirror']) { + if (!empty($_POST['pumpio_mirror'])) { PConfig::delete(local_user(), 'pumpio', 'lastdate'); } - - //header("Location: ".$a->get_baseurl()."/pumpio/connect"); } } } -function pumpio_post_local(&$a, &$b) +function pumpio_load_config(App $a, Config\ConfigCacheLoader $loader) +{ + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('pumpio')); +} + +function pumpio_hook_fork(App $a, array &$b) +{ + 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 (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])) { + 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(App $a, array &$b) { if (!local_user() || (local_user() != $b['uid'])) { return; @@ -380,7 +426,7 @@ function pumpio_post_local(&$a, &$b) $pumpio_post = intval(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'))) { $pumpio_enable = 1; @@ -397,23 +443,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 (!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]; + $condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO]; $orig_post = Item::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; @@ -423,7 +467,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; @@ -431,7 +475,7 @@ function pumpio_send(&$a, &$b) // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); + $self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } @@ -555,28 +599,28 @@ function pumpio_send(&$a, &$b) } $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)); + Logger::log('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)) { + if (DBA::isResult($r)) { $a->contact = $r[0]["id"]; } $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]); - Queue::add($a->contact, NETWORK_PUMPIO, $s); + Queue::add($a->contact, Protocol::PUMPIO, $s); notice(L10n::t('Pump.io post failed. Queued for retry.').EOL); } } } -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')) { @@ -592,7 +636,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") $orig_post = Item::selectFirst([], ['uri' => $uri, 'uid' => $uid]); - if (!DBM::is_result($orig_post)) { + if (!DBA::isResult($orig_post)) { return; } @@ -636,27 +680,27 @@ 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)); + Logger::log('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)) { + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $uid); + if (DBA::isResult($r)) { $a->contact = $r[0]["id"]; } $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]); - Queue::add($a->contact, NETWORK_PUMPIO, $s); + Queue::add($a->contact, Protocol::PUMPIO, $s); notice(L10n::t('Pump.io like failed. Queued for retry.').EOL); } } -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; } @@ -667,16 +711,16 @@ function pumpio_sync(&$a) 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']); } } @@ -689,17 +733,17 @@ 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 @@ -717,17 +761,17 @@ function pumpio_sync(&$a) } } - logger('pumpio: cron_end'); + Logger::log('pumpio: cron_end'); 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'); @@ -745,7 +789,7 @@ function pumpio_fetchtimeline(&$a, $uid) $application_name = Config::get('pumpio', 'application_name'); } if ($application_name == "") { - $application_name = $a->get_hostname(); + $application_name = $a->getHostName(); } $first_time = ($lastdate == ""); @@ -762,7 +806,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; @@ -770,10 +814,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; } @@ -817,13 +862,12 @@ function pumpio_fetchtimeline(&$a, $uid) $_SESSION["uid"] = $uid; unset($_REQUEST); - $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; $_REQUEST["profile_uid"] = $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 != "") { @@ -843,12 +887,12 @@ 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); } } } @@ -858,29 +902,29 @@ function pumpio_fetchtimeline(&$a, $uid) } } -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)) { + if (!DBA::isResult($orig_post)) { $orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]); - if (!DBM::is_result($orig_post)) { + 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']; } @@ -891,28 +935,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']]); - 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)) { + if (!DBA::isResult($orig_post)) { $orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]); - if (!DBM::is_result($orig_post)) { + if (!DBA::isResult($orig_post)) { return; } } @@ -924,18 +968,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']; } @@ -945,8 +989,8 @@ 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']); + if (Item::exists($condition)) { + Logger::log("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); return; } @@ -956,14 +1000,16 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $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['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]'; @@ -974,19 +1020,33 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $likedata['body'] = 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'] . ''; + '' . $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::update(["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, - "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, - "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, - "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)]); + $gcontact = ["url" => $contact->url, "network" => Protocol::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) { @@ -994,39 +1054,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; } @@ -1047,29 +1107,31 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) */ } - Contact::updateAvatar($contact->image->url, $uid, $contact_id); + if (!empty($contact->image->url)) { + Contact::updateAvatar($contact->image->url, $uid, $contact_id); + } 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)) { + if (Item::exists($condition)) { Item::delete($condition); return true; } $condition = ['extid' => $post->object->id, 'uid' => $uid]; - if (dba::exists('item', $condition)) { + if (Item::exists($condition)) { Item::delete($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'); @@ -1087,10 +1149,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 (Item::exists(['uri' => $post->object->id, 'uid' => $uid])) { return false; } - if (dba::exists('item', ['extid' => $post->object->id, 'uid' => $uid])) { + if (Item::exists(['extid' => $post->object->id, 'uid' => $uid])) { return false; } } @@ -1109,6 +1171,8 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $receiptians = array_merge($receiptians, $post->to); } + $public = false; + foreach ($receiptians AS $receiver) { if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) { $public = true; @@ -1116,7 +1180,7 @@ 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; @@ -1138,7 +1202,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']; @@ -1146,19 +1210,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']; @@ -1173,7 +1237,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; @@ -1190,6 +1257,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray['parent-uri'] = $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)) { $postarray['extid'] = $post->object->pump_io->proxyURL; } @@ -1198,12 +1270,15 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $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); @@ -1233,10 +1308,15 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $share_author = $post->object->author->url; } + if (isset($post->object->created)) { + $created = DateTimeFormat::utc($post->object->created); + } else { + $created = ''; + } + $postarray['body'] = share_header($share_author, $post->object->author->url, $post->object->author->image->url, "", - DateTimeFormat::utc($post->object->created), - $post->links->self->href). + $created, $post->links->self->href). $postarray['body']."[/share]"; } @@ -1260,12 +1340,12 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet 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'); + $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"); @@ -1279,7 +1359,7 @@ function pumpio_fetchinbox(&$a, $uid) 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), + DBA::escape(Protocol::PUMPIO), intval($uid) ); @@ -1311,7 +1391,7 @@ function pumpio_fetchinbox(&$a, $uid) return; } - if ($user->items) { + if (!empty($user->items)) { $posts = array_reverse($user->items); if (count($posts)) { @@ -1322,19 +1402,19 @@ 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); } -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'); + $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"); @@ -1351,60 +1431,65 @@ 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) +function pumpio_queue_hook(App $a, array &$b) { $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", - dbesc(NETWORK_PUMPIO) + DBA::escape(Protocol::PUMPIO) ); - if (!DBM::is_result($qi)) { + + if (!DBA::isResult($qi)) { return; } foreach ($qi as $x) { - if ($x['network'] !== NETWORK_PUMPIO) { + if ($x['network'] !== Protocol::PUMPIO) { continue; } - logger('pumpio_queue: run'); + Logger::log('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)) { + if (!DBA::isResult($r)) { continue; } $userdata = $r[0]; - //logger('pumpio_queue: fetching userdata '.print_r($userdata, true)); + //Logger::log('pumpio_queue: fetching userdata '.print_r($userdata, true)); - $oauth_token = PConfig::get($userdata['uid'], "pumpio", "oauth_token"); + $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"); + $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"); @@ -1415,7 +1500,7 @@ function pumpio_queue_hook(&$a, &$b) $consumer_key && $consumer_secret) { $username = $user.'@'.$host; - logger('pumpio_queue: able to post for user '.$username); + Logger::log('pumpio_queue: able to post for user '.$username); $z = unserialize($x['content']); @@ -1436,27 +1521,27 @@ function pumpio_queue_hook(&$a, &$b) if ($success) { $post_id = $user->object->id; - logger('pumpio_queue: send '.$username.': success '.$post_id); + Logger::log('pumpio_queue: send '.$username.': success '.$post_id); if ($post_id && $iscomment) { - logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']); + Logger::log('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)); + Logger::log('pumpio_queue: send '.$username.': '.$z['url'].' general error: ' . print_r($user, true)); } } else { - logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']); + Logger::log("pumpio_queue: Error getting tokens for user ".$userdata['uid']); } if (!$success) { - logger('pumpio_queue: delayed'); + Logger::log('pumpio_queue: delayed'); Queue::updateTime($x['id']); } } } -function pumpio_getreceiver(&$a, $b) +function pumpio_getreceiver(App $a, array $b) { $receiver = []; @@ -1482,10 +1567,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", @@ -1500,7 +1585,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) @@ -1525,10 +1610,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", @@ -1541,16 +1626,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'); + $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"); - 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; @@ -1560,7 +1645,7 @@ 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)) { + if (!DBA::isResult($item)) { return false; } @@ -1576,7 +1661,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); @@ -1594,7 +1679,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; @@ -1614,11 +1701,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 (Item::exists(['uri' => $item->id, 'uid' => $uid])) { continue; } - if (dba::exists('item', ['extid' => $item->id, 'uid' => $uid])) { + if (Item::exists(['extid' => $item->id, 'uid' => $uid])) { continue; } @@ -1637,15 +1724,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 Network::curl($url, false, $redirects, ['timeout'=>10])->isSuccess(); } /*