X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=8e194f85a0406ec61931a2e2fa1f22b542bbbe54;hp=4873d73df4041d32b517e699a5663bc65d83310a;hb=29cf1539a7c614d9b39e2f9a99cce64a2992d984;hpb=b638efe8f9a01fc279977681a5ef5dfe98702a3a diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 4873d73d..8e194f85 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -6,39 +6,47 @@ * Author: Michael Vogel */ +use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Worker; -use Friendica\Model\GlobalContact; +use Friendica\Model\Contact; +use Friendica\Model\GContact; +use Friendica\Model\Group; +use Friendica\Model\Item; +use Friendica\Model\Queue; +use Friendica\Util\Network; +use Friendica\Model\User; +use Friendica\Util\DateTimeFormat; require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/oauth_client.php'; require_once 'include/enotify.php'; -require_once "include/Photo.php"; require_once "mod/share.php"; define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes function pumpio_install() { - register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - register_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + 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() { - unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - unregister_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + 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'); } function pumpio_module() {} @@ -46,7 +54,7 @@ function pumpio_module() {} function pumpio_content(&$a) { if(! local_user()) { - notice( t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return ''; } @@ -80,7 +88,7 @@ function pumpio_registerclient(&$a, $host) { $url = "https://".$host."/api/client/register"; - $params = array(); + $params = []; $application_name = Config::get('pumpio', 'application_name'); @@ -142,7 +150,7 @@ function pumpio_connect(&$a) { if (($consumer_key == "") || ($consumer_secret == "")) { logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname)); - $o .= sprintf(t("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); } @@ -152,7 +160,7 @@ function pumpio_connect(&$a) { // Let's begin. First we need a Request Token. The request token is required to send the user // to pumpio's login page. - // Create a new instance of the TumblrOAuth library. For this step, all we need to give the library is our + // 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; @@ -182,8 +190,8 @@ function pumpio_connect(&$a) { if($success) { logger("pumpio_connect: authenticated"); - $o .= t("You are now authenticated to pumpio."); - $o .= '
'.t("return to the connector page").''; + $o .= L10n::t("You are now authenticated to pumpio."); + $o .= '
'.L10n::t("return to the connector page").''; } else { logger("pumpio_connect: could not connect"); $o = 'Could not connect to pumpio. Refresh the page or try again later.'; @@ -201,7 +209,7 @@ function pumpio_jot_nets(&$a,&$b) { $pumpio_defpost = PConfig::get(local_user(),'pumpio','post_by_default'); $selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' - . t('Post to pumpio') . '
'; + . L10n::t('Post to pumpio') . ''; } } @@ -239,20 +247,20 @@ function pumpio_settings(&$a,&$s) { /* Add some HTML to the existing form */ $s .= ''; - $s .= '

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

'; + $s .= '

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

'; $s .= ''; $s .= ''; } @@ -336,7 +344,7 @@ function pumpio_settings_post(&$a,&$b) { // Filtering the hostname if someone is entering it with "http" $host = $_POST['pumpio_host']; $host = trim($host); - $host = str_replace(array("https://", "http://"), array("", ""), $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']); @@ -412,8 +420,16 @@ function pumpio_send(&$a,&$b) { logger("pumpio_send: receiver ".print_r($receiver, true)); - if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) + if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) { return; + } + + // 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]); + if ($b['contact-id'] != $self['id']) { + return; + } } if($b['verb'] == ACTIVITY_LIKE) { @@ -461,14 +477,14 @@ function pumpio_send(&$a,&$b) { $content = bbcode($b['body'], false, false, 4); - $params = array(); + $params = []; $params["verb"] = "post"; if (!$iscomment) { - $params["object"] = array( + $params["object"] = [ 'objectType' => "note", - 'content' => $content); + 'content' => $content]; if ($title != "") $params["object"]["displayName"] = $title; @@ -486,16 +502,16 @@ function pumpio_send(&$a,&$b) { $params["bcc"] = $receiver["bcc"]; } else { - $inReplyTo = array("id" => $orig_post["uri"], - "objectType" => "note"); + $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"]); - $params["object"] = array( + $params["object"] = [ 'objectType' => "comment", 'content' => $content, - 'inReplyTo' => $inReplyTo); + 'inReplyTo' => $inReplyTo]; if ($title != "") $params["object"]["displayName"] = $title; @@ -514,7 +530,7 @@ function pumpio_send(&$a,&$b) { $url = 'https://'.$host.'/api/user/'.$user.'/feed'; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + $success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); else $success = false; @@ -527,10 +543,7 @@ function pumpio_send(&$a,&$b) { logger('pumpio_send '.$username.': success '.$post_id); if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", - dbesc($post_id), - intval($b['id']) - ); + Item::update(['extid' => $post_id], ['id' => $b['id']]); } } else { logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user,true)); @@ -539,12 +552,11 @@ function pumpio_send(&$a,&$b) { if (count($r)) $a->contact = $r[0]["id"]; - $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $params)); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_PUMPIO,$s); - notice(t('Pump.io post failed. Queued for retry.').EOL); - } + $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); + } } } @@ -586,9 +598,9 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $objectType = "image"; $params["verb"] = $action; - $params["object"] = array('id' => $uri, + $params["object"] = ['id' => $uri, "objectType" => $objectType, - "content" => $content); + "content" => $content]; $client = new oauth_client_class; $client->oauth_version = '1.0a'; @@ -603,7 +615,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $url = 'https://'.$hostname.'/api/user/'.$username.'/feed'; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + $success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); else $success = false; @@ -616,10 +628,10 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { if (count($r)) $a->contact = $r[0]["id"]; - $s = serialize(array('url' => $url, 'item' => $orig_post["id"], 'post' => $params)); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_PUMPIO,$s); - notice(t('Pump.io like failed. Queued for retry.').EOL); + $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); } } @@ -657,7 +669,7 @@ function pumpio_sync(&$a) { if ($abandon_days < 1) $abandon_days = 0; - $abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400); + $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(count($r)) { @@ -708,7 +720,7 @@ function pumpio_fetchtimeline(&$a, $uid) { // 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 = PConfig::get($uid, 'pumpio', 'application_name'); if ($application_name == "") $application_name = Config::get('pumpio', 'application_name'); if ($application_name == "") @@ -733,7 +745,7 @@ function pumpio_fetchtimeline(&$a, $uid) { $username = $user.'@'.$host; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user); else $success = false; @@ -758,7 +770,7 @@ function pumpio_fetchtimeline(&$a, $uid) { if ($first_time) continue; - $receiptians = array(); + $receiptians = []; if (@is_array($post->cc)) $receiptians = array_merge($receiptians, $post->cc); @@ -855,13 +867,7 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { $contactid = $orig_post['contact-id']; } - $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'", - dbesc(datetime_convert()), - dbesc(ACTIVITY_LIKE), - intval($uid), - intval($contactid), - dbesc($orig_post['uri']) - ); + Item::delete(['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]); if(count($r)) logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); @@ -936,7 +942,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru return; } - $likedata = array(); + $likedata = []; $likedata['parent'] = $orig_post['id']; $likedata['verb'] = ACTIVITY_LIKE; $likedata['gravity'] = 3; @@ -952,27 +958,27 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]'; $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]'; - $post_type = t('status'); + $post_type = L10n::t('status'); $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]'; $likedata['object-type'] = ACTIVITY_OBJ_NOTE; - $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); + $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'] . ''; - $ret = item_store($likedata); + $ret = Item::insert($likedata); logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } function pumpio_get_contact($uid, $contact, $no_insert = false) { - GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, + 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))); - $cid = get_contact($contact->url, $uid); + "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)]); + $cid = Contact::getIdForURL($contact->url, $uid); if ($no_insert) return($cid); @@ -987,7 +993,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { `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(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), dbesc($contact->url), dbesc(normalise_link($contact->url)), dbesc(str_replace("acct:", "", $contact->id)), @@ -1016,14 +1022,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { $contact_id = $r[0]['id']; - $g = q("select def_gid from user where uid = %d limit 1", - intval($uid) - ); - - if($g && intval($g[0]['def_gid'])) { - require_once('include/group.php'); - group_add_member($uid,'',$contact_id,$g[0]['def_gid']); - } + Group::addMember(User::getDefaultGroup($uid), $contact_id); } else { $contact_id = $r[0]["id"]; @@ -1038,8 +1037,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { */ } - if (function_exists("update_contact_avatar")) - update_contact_avatar($contact->image->url, $uid, $contact_id); + Contact::updateAvatar($contact->image->url, $uid, $contact_id); return($contact_id); } @@ -1053,7 +1051,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { ); if (count($r)) - return drop_item($r[0]["id"], $false); + return Item::deleteById($r[0]["id"]); $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($post->object->id), @@ -1061,7 +1059,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { ); if (count($r)) - return drop_item($r[0]["id"], $false); + return Item::deleteById($r[0]["id"]); } function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { @@ -1100,7 +1098,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if (!strstr("post|share|update", $post->verb)) return false; - $receiptians = array(); + $receiptians = []; if (@is_array($post->cc)) $receiptians = array_merge($receiptians, $post->cc); @@ -1112,7 +1110,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if ($receiver->id == "http://activityschema.org/collection/public") $public = true; - $postarray = array(); + $postarray = []; $postarray['network'] = NETWORK_PUMPIO; $postarray['gravity'] = 0; $postarray['uid'] = $uid; @@ -1204,11 +1202,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if ($post->object->displayName != "") $postarray['title'] = $post->object->displayName; - $postarray['created'] = datetime_convert('UTC','UTC',$post->published); + $postarray['created'] = DateTimeFormat::utc($post->published); if (isset($post->updated)) - $postarray['edited'] = datetime_convert('UTC','UTC',$post->updated); + $postarray['edited'] = DateTimeFormat::utc($post->updated); elseif (isset($post->received)) - $postarray['edited'] = datetime_convert('UTC','UTC',$post->received); + $postarray['edited'] = DateTimeFormat::utc($post->received); else $postarray['edited'] = $postarray['created']; @@ -1223,7 +1221,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray['body'] = share_header($share_author, $post->object->author->url, $post->object->author->image->url, "", - datetime_convert('UTC','UTC',$post->object->created), + DateTimeFormat::utc($post->object->created), $post->links->self->href). $postarray['body']."[/share]"; @@ -1231,7 +1229,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray['body'] = "[share author='".$share_author. "' profile='".$post->object->author->url. "' avatar='".$post->object->author->image->url. - "' posted='".datetime_convert('UTC','UTC',$post->object->created). + "' posted='".DateTimeFormat::convert($post->object->created, 'UTC', 'UTC', ). "' link='".$post->links->self->href."']".$postarray['body']."[/share]"; */ } else { @@ -1245,17 +1243,13 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if (trim($postarray['body']) == "") return false; - $top_item = item_store($postarray); + $top_item = Item::insert($postarray); $postarray["id"] = $top_item; if (($top_item == 0) && ($post->verb == "update")) { - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", - dbesc($postarray["title"]), - dbesc($postarray["body"]), - dbesc($postarray["edited"]), - dbesc($postarray["uri"]), - intval($uid) - ); + $fields = ['title' => $postarray["title"], 'body' => $postarray["body"], 'changed' => $postarray["edited"]]; + $condition = ['uri' => $postarray["uri"], 'uid' => $uid]; + Item::update($fields, $condition); } if ($post->object->objectType == "comment") { @@ -1293,7 +1287,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $conv_parent = $conv['parent']; - notification(array( + notification([ 'type' => NOTIFY_COMMENT, 'notify_flags' => $user[0]['notify-flags'], 'language' => $user[0]['language'], @@ -1301,14 +1295,14 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)), + 'link' => $a->get_baseurl().'/display/'.urlencode(Item::getGuidById($top_item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $conv_parent, - )); + ]); // only send one notification break; @@ -1361,7 +1355,7 @@ function pumpio_fetchinbox(&$a, $uid) { $url .= '?since='.urlencode($last_id); if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user); else $success = false; @@ -1402,7 +1396,7 @@ function pumpio_getallusers(&$a, $uid) { $url = 'https://'.$hostname.'/api/user/'.$username.'/following'; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users); else $success = false; @@ -1410,7 +1404,7 @@ function pumpio_getallusers(&$a, $uid) { $url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users); else $success = false; } @@ -1430,8 +1424,6 @@ function pumpio_queue_hook(&$a,&$b) { if(! count($qi)) return; - require_once('include/queue_fn.php'); - foreach($qi as $x) { if($x['network'] !== NETWORK_PUMPIO) continue; @@ -1477,7 +1469,7 @@ function pumpio_queue_hook(&$a,&$b) { $client->client_secret = $consumer_secret; if (pumpio_reachable($z['url'])) - $success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + $success = $client->CallAPI($z['url'], 'POST', $z['post'], ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); else $success = false; @@ -1486,12 +1478,9 @@ function pumpio_queue_hook(&$a,&$b) { 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']); - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", - dbesc($post_id), - intval($z['item']) - ); + Item::update(['extid' => $post_id], ['id' => $z['item']]); } - remove_queue_item($x['id']); + Queue::removeItem($x['id']); } else logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true)); } else @@ -1499,14 +1488,14 @@ function pumpio_queue_hook(&$a,&$b) { if (!$success) { logger('pumpio_queue: delayed'); - update_queue_time($x['id']); + Queue::updateTime($x['id']); } } } function pumpio_getreceiver(&$a, $b) { - $receiver = array(); + $receiver = []; if (!$b["private"]) { @@ -1516,9 +1505,9 @@ function pumpio_getreceiver(&$a, $b) { $public = PConfig::get($b['uid'], "pumpio", "public"); if ($public) - $receiver["to"][] = Array( + $receiver["to"][] = [ "objectType" => "collection", - "id" => "http://activityschema.org/collection/public"); + "id" => "http://activityschema.org/collection/public"]; } else { $cids = explode("><", $b["allow_cid"]); $gids = explode("><", $b["allow_gid"]); @@ -1533,30 +1522,29 @@ function pumpio_getreceiver(&$a, $b) { ); if (count($r)) { - $receiver["bcc"][] = Array( + $receiver["bcc"][] = [ "displayName" => $r[0]["name"], "objectType" => "person", "preferredUsername" => $r[0]["nick"], - "url" => $r[0]["url"]); + "url" => $r[0]["url"]]; } } foreach ($gids AS $gid) { $gid = trim($gid, " <>"); $r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ". - "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d AND `group_member`.`uid` = %d ". + "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ". "AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'", intval($gid), - intval($b["uid"]), dbesc(NETWORK_PUMPIO) ); foreach ($r AS $row) - $receiver["bcc"][] = Array( + $receiver["bcc"][] = [ "displayName" => $row["name"], "objectType" => "person", "preferredUsername" => $row["nick"], - "url" => $row["url"]); + "url" => $row["url"]]; } } @@ -1577,11 +1565,11 @@ function pumpio_getreceiver(&$a, $b) { ); if (count($r)) { - $receiver["to"][] = Array( + $receiver["to"][] = [ "displayName" => $r[0]["name"], "objectType" => "person", "preferredUsername" => $r[0]["nick"], - "url" => $r[0]["url"]); + "url" => $r[0]["url"]]; } } } @@ -1628,7 +1616,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url); if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item); else $success = false; @@ -1697,7 +1685,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { function pumpio_reachable($url) { - $data = z_fetch_url($url, false, $redirects, array('timeout'=>10)); + $data = Network::curl($url, false, $redirects, ['timeout'=>10]); return(intval($data['return_code']) != 0); }