* Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/
+
+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\Protocol;
use Friendica\Core\Worker;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Group;
-use Friendica\Model\User;
use Friendica\Model\Item;
use Friendica\Model\Queue;
+use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
require 'addon/pumpio/oauth/http.php';
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
-function pumpio_install() {
+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_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');
+ Addon::registerHook('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
}
-function pumpio_uninstall() {
+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_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');
+ Addon::unregisterHook('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
}
function pumpio_module() {}
-function pumpio_content(&$a) {
-
- if(! local_user()) {
+function pumpio_content(App $a)
+{
+ if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return '';
}
require_once("mod/settings.php");
settings_init($a);
- if (isset($a->argv[1]))
+ if (isset($a->argv[1])) {
switch ($a->argv[1]) {
case "connect":
$o = pumpio_connect($a);
$o = print_r($a->argv, true);
break;
}
- else
+ } else {
$o = pumpio_connect($a);
-
+ }
return $o;
}
-function pumpio_check_item_notification($a, &$notification_data) {
- $hostname = PConfig::get($notification_data["uid"], 'pumpio','host');
+function pumpio_check_item_notification($a, &$notification_data)
+{
+ $hostname = PConfig::get($notification_data["uid"], 'pumpio', 'host');
$username = PConfig::get($notification_data["uid"], "pumpio", "user");
- $notification_data["profiles"][] = "https://".$hostname."/".$username;
+ $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');
- if ($application_name == "")
+ if ($application_name == "") {
$application_name = $a->get_hostname();
+ }
- $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];
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_HEADER, false);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST,1);
- curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
$s = curl_exec($ch);
if ($curl_info["http_code"] == "200") {
$values = json_decode($s);
logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
- return($values);
+ return $values;
}
logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
- return(false);
+ return false;
}
-function pumpio_connect(&$a) {
- // Start a session. This is necessary to hold on to a few keys the callback script will also need
- session_start();
-
+function pumpio_connect(App $a)
+{
// Define the needed keys
- $consumer_key = PConfig::get(local_user(), 'pumpio','consumer_key');
- $consumer_secret = PConfig::get(local_user(), 'pumpio','consumer_secret');
- $hostname = PConfig::get(local_user(), 'pumpio','host');
+ $consumer_key = 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");
$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);
+ PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
+ 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 = 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("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 $o;
}
// The callback URL is the script that gets called after the user authenticates with pumpio
// 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;
+ $client->debug = 0;
$client->server = '';
$client->oauth_version = '1.0a';
$client->request_token_url = 'https://'.$hostname.'/oauth/request_token';
}
$success = $client->Finalize($success);
}
- if($client->exit)
+ if ($client->exit) {
$o = 'Could not connect to pumpio. Refresh the page or try again later.';
+ }
- if($success) {
+ if ($success) {
logger("pumpio_connect: authenticated");
- $o .= L10n::t("You are now authenticated to pumpio.");
+ $o = L10n::t("You are now authenticated to pumpio.");
$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
} else {
logger("pumpio_connect: could not connect");
$o = 'Could not connect to pumpio. Refresh the page or try again later.';
}
- return($o);
+ return $o;
}
-function pumpio_jot_nets(&$a,&$b) {
- if(! local_user())
+function pumpio_jot_nets(App $a, &$b)
+{
+ 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');
+ $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 .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
. L10n::t('Post to pumpio') . '</div>';
}
}
-
-function pumpio_settings(&$a,&$s) {
-
- if(! local_user())
+function pumpio_settings(App $a, &$s)
+{
+ if (!local_user()) {
return;
+ }
/* Add our stylesheet to the page so we can make our settings look nice */
/* Get the current state of our config variables */
- $import_enabled = PConfig::get(local_user(),'pumpio','import');
+ $import_enabled = PConfig::get(local_user(), 'pumpio', 'import');
$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
- $enabled = PConfig::get(local_user(),'pumpio','post');
+ $enabled = 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 = PConfig::get(local_user(), 'pumpio', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $public_enabled = PConfig::get(local_user(),'pumpio','public');
+ $public_enabled = PConfig::get(local_user(), 'pumpio', 'public');
$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
- $mirror_enabled = PConfig::get(local_user(),'pumpio','mirror');
+ $mirror_enabled = PConfig::get(local_user(), 'pumpio', 'mirror');
$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
$servername = PConfig::get(local_user(), "pumpio", "host");
$s .= '</div><div class="clear"></div>';
if (($username != '') && ($servername != '')) {
-
$oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token");
$oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret");
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
-
-function pumpio_settings_post(&$a,&$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', '');
+function pumpio_settings_post(App $a, array &$b)
+{
+ if (!empty($_POST['pumpio-submit'])) {
+ if (!empty($_POST['pumpio_delete'])) {
+ PConfig::set(local_user(), 'pumpio', 'consumer_key' , '');
+ PConfig::set(local_user(), 'pumpio', 'consumer_secret' , '');
+ PConfig::set(local_user(), 'pumpio', 'oauth_token' , '');
+ PConfig::set(local_user(), 'pumpio', 'oauth_token_secret', '');
+ PConfig::set(local_user(), 'pumpio', 'post' , false);
+ PConfig::set(local_user(), 'pumpio', 'import' , false);
+ PConfig::set(local_user(), 'pumpio', 'host' , '');
+ PConfig::set(local_user(), 'pumpio', 'user' , '');
+ PConfig::set(local_user(), 'pumpio', 'public' , false);
+ PConfig::set(local_user(), 'pumpio', 'mirror' , false);
+ PConfig::set(local_user(), 'pumpio', 'post_by_default' , false);
+ PConfig::set(local_user(), 'pumpio', 'lastdate' , 0);
+ PConfig::set(local_user(), 'pumpio', 'last_id' , '');
} else {
// filtering the username if it is filled wrong
$user = $_POST['pumpio_user'];
if (strstr($user, "@")) {
$pos = strpos($user, "@");
- if ($pos > 0)
+
+ if ($pos > 0) {
$user = substr($user, 0, $pos);
+ }
}
// Filtering the hostname if someone is entering it with "http"
$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'])
- PConfig::delete(local_user(),'pumpio','lastdate');
-
- //header("Location: ".$a->get_baseurl()."/pumpio/connect");
+ if (!empty($_POST['pumpio_mirror'])) {
+ PConfig::delete(local_user(), 'pumpio', 'lastdate');
+ }
}
}
}
-function pumpio_post_local(&$a, &$b) {
+function pumpio_load_config(App $a)
+{
+ $a->loadConfigFile(__DIR__. '/config/pumpio.ini.php');
+}
+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_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;
$b['postopts'] .= 'pumpio';
}
-
-
-
-function pumpio_send(&$a,&$b) {
-
- if (!PConfig::get($b["uid"],'pumpio','import')) {
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
- return;
+function pumpio_send(App $a, array &$b)
+{
+ 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);
- if($b['parent'] != $b['id']) {
+ if ($b['parent'] != $b['id']) {
// Looking if its a reply to a pumpio post
- $r = q("SELECT item.* FROM item, contact WHERE item.id = %d AND item.uid = %d AND contact.id = `contact-id` AND contact.network='%s'LIMIT 1",
- intval($b["parent"]),
- intval($b["uid"]),
- dbesc(NETWORK_PUMPIO));
+ $condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO];
+ $orig_post = Item::selectFirst([], $condition);
- if(!count($r)) {
+ if (!DBA::isResult($orig_post)) {
logger("pumpio_send: no pumpio post ".$b["parent"]);
return;
} else {
$iscomment = true;
- $orig_post = $r[0];
}
} else {
$iscomment = false;
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]);
+ $self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
if ($b['contact-id'] != $self['id']) {
return;
}
}
- if($b['verb'] == ACTIVITY_LIKE) {
- if ($b['deleted'])
+ if ($b['verb'] == ACTIVITY_LIKE) {
+ if ($b['deleted']) {
pumpio_action($a, $b["uid"], $b["thr-parent"], "unlike");
- else
+ } else {
pumpio_action($a, $b["uid"], $b["thr-parent"], "like");
+ }
return;
}
- if($b['verb'] == ACTIVITY_DISLIKE)
+ if ($b['verb'] == ACTIVITY_DISLIKE) {
return;
+ }
- 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['created'] !== $b['edited']) && !$b['deleted']) {
+ pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]);
+ }
- if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
- pumpio_action($a, $b["uid"], $b["uri"], "delete");
+ if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
+ pumpio_action($a, $b["uid"], $b["uri"], "delete");
+ }
- if($b['deleted'] || ($b['created'] !== $b['edited']))
+ if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
return;
+ }
// if post comes from pump.io don't send it back
- if($b['app'] == "pump.io")
+ if ($b['app'] == "pump.io") {
return;
+ }
// To-Do;
// Support for native shares
$user = PConfig::get($b['uid'], "pumpio", "user");
$public = PConfig::get($b['uid'], "pumpio", "public");
- if($oauth_token && $oauth_token_secret) {
-
- require_once('include/bbcode.php');
-
+ if ($oauth_token && $oauth_token_secret) {
$title = trim($b['title']);
- $content = bbcode($b['body'], false, false, 4);
+ $content = BBCode::convert($b['body'], false, 4);
$params = [];
if (!$iscomment) {
$params["object"] = [
- 'objectType' => "note",
- 'content' => $content];
+ 'objectType' => "note",
+ 'content' => $content];
- if ($title != "")
+ if (!empty($title)) {
$params["object"]["displayName"] = $title;
+ }
- if (count($receiver["to"]))
+ if (!empty($receiver["to"])) {
$params["to"] = $receiver["to"];
+ }
- if (count($receiver["bto"]))
+ if (!empty($receiver["bto"])) {
$params["bto"] = $receiver["bto"];
+ }
- if (count($receiver["cc"]))
+ if (!empty($receiver["cc"])) {
$params["cc"] = $receiver["cc"];
+ }
- if (count($receiver["bcc"]))
+ if (!empty($receiver["bcc"])) {
$params["bcc"] = $receiver["bcc"];
-
+ }
} else {
$inReplyTo = ["id" => $orig_post["uri"],
- "objectType" => "note"];
+ "objectType" => "note"];
- if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
+ 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"] = [
- 'objectType' => "comment",
- 'content' => $content,
- 'inReplyTo' => $inReplyTo];
+ 'objectType' => "comment",
+ 'content' => $content,
+ 'inReplyTo' => $inReplyTo];
- if ($title != "")
+ if ($title != "") {
$params["object"]["displayName"] = $title;
+ }
}
$client = new oauth_client_class;
$username = $user.'@'.$host;
$url = 'https://'.$host.'/api/user/'.$user.'/feed';
- if (pumpio_reachable($url))
+ if (pumpio_reachable($url)) {
$success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
- else
+ } else {
$success = false;
+ }
- if($success) {
-
- if ($user->generator->displayName)
+ if ($success) {
+ if ($user->generator->displayName) {
PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName);
+ }
$post_id = $user->object->id;
logger('pumpio_send '.$username.': success '.$post_id);
- if($post_id && $iscomment) {
+ 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));
+ 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 (count($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'))
+ if (!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');
+ $hostname = PConfig::get($uid, 'pumpio', 'host');
$username = PConfig::get($uid, "pumpio", "user");
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($uri),
- intval($uid)
- );
+ $orig_post = Item::selectFirst([], ['uri' => $uri, 'uid' => $uid]);
- if (!count($r))
+ if (!DBA::isResult($orig_post)) {
return;
+ }
- $orig_post = $r[0];
-
- if ($orig_post["extid"] && !strstr($orig_post["extid"], "/proxy/"))
+ if ($orig_post["extid"] && !strstr($orig_post["extid"], "/proxy/")) {
$uri = $orig_post["extid"];
- else
+ } else {
$uri = $orig_post["uri"];
+ }
- if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
+ if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) {
$objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
- elseif (strstr($uri, "/api/comment/"))
+ } elseif (strstr($uri, "/api/comment/")) {
$objectType = "comment";
- elseif (strstr($uri, "/api/note/"))
+ } elseif (strstr($uri, "/api/note/")) {
$objectType = "note";
- elseif (strstr($uri, "/api/image/"))
+ } elseif (strstr($uri, "/api/image/")) {
$objectType = "image";
+ }
$params["verb"] = $action;
$params["object"] = ['id' => $uri,
$url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
- if (pumpio_reachable($url))
+ if (pumpio_reachable($url)) {
$success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
- else
+ } else {
$success = false;
+ }
- if($success)
+ if ($success) {
logger('pumpio_action '.$username.' '.$action.': success '.$uri);
- else {
- logger('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user,true));
+ } 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 (count($r))
+ 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) {
- $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'",
- $plugin);
+function pumpio_sync(App $a)
+{
+ $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'");
- if (!count($r))
+ if (!DBA::isResult($r)) {
return;
+ }
- $last = Config::get('pumpio','last_poll');
+ $last = Config::get('pumpio', 'last_poll');
- $poll_interval = intval(Config::get('pumpio','poll_interval'));
- if(! $poll_interval)
- $poll_interval = PUMPIO_DEFAULT_POLL_INTERVAL;
+ $poll_interval = intval(Config::get('pumpio', 'poll_interval', PUMPIO_DEFAULT_POLL_INTERVAL));
- if($last) {
+ if ($last) {
$next = $last + ($poll_interval * 60);
- if($next > time()) {
+ if ($next > time()) {
logger('pumpio: poll intervall not reached');
return;
}
logger('pumpio: cron_start');
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() ");
- if(count($r)) {
- foreach($r as $rr) {
+ if (DBA::isResult($r)) {
+ foreach ($r as $rr) {
logger('pumpio: mirroring user '.$rr['uid']);
pumpio_fetchtimeline($a, $rr['uid']);
}
}
- $abandon_days = intval(Config::get('system','account_abandon_days'));
- if ($abandon_days < 1)
+ $abandon_days = intval(Config::get('system', 'account_abandon_days'));
+ 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)) {
- foreach($r as $rr) {
+ 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 (!count($user)) {
+ if (!DBA::isResult($user)) {
logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
continue;
}
pumpio_fetchinbox($a, $rr['uid']);
// check for new contacts once a day
- $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
- if($last_contact_check)
+ $last_contact_check = PConfig::get($rr['uid'], 'pumpio', 'contact_check');
+ if ($last_contact_check) {
$next_contact_check = $last_contact_check + 86400;
- else
+ } else {
$next_contact_check = 0;
+ }
- if($next_contact_check <= time()) {
+ if ($next_contact_check <= time()) {
pumpio_getallusers($a, $rr["uid"]);
- PConfig::set($rr['uid'],'pumpio','contact_check',time());
+ PConfig::set($rr['uid'], 'pumpio', 'contact_check', time());
}
}
}
logger('pumpio: cron_end');
- Config::set('pumpio','last_poll', time());
+ 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');
+ $hostname = PConfig::get($uid, 'pumpio', 'host');
$username = 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');
- if ($application_name == "")
+ if ($application_name == "") {
$application_name = Config::get('pumpio', 'application_name');
- if ($application_name == "")
+ }
+ if ($application_name == "") {
$application_name = $a->get_hostname();
+ }
$first_time = ($lastdate == "");
logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
- $username = $user.'@'.$host;
+ $useraddr = $username.'@'.$hostname;
- if (pumpio_reachable($url))
+ if (pumpio_reachable($url)) {
$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
- else
+ } else {
$success = false;
+ $user = [];
+ }
if (!$success) {
- logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true));
+ logger('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
return;
}
if (count($posts)) {
foreach ($posts as $post) {
- if ($post->published <= $initiallastdate)
+ if ($post->published <= $initiallastdate) {
continue;
+ }
- if ($lastdate < $post->published)
+ if ($lastdate < $post->published) {
$lastdate = $post->published;
+ }
- if ($first_time)
+ if ($first_time) {
continue;
+ }
$receiptians = [];
- if (@is_array($post->cc))
+ if (@is_array($post->cc)) {
$receiptians = array_merge($receiptians, $post->cc);
+ }
- if (@is_array($post->to))
+ if (@is_array($post->to)) {
$receiptians = array_merge($receiptians, $post->to);
+ }
$public = false;
- foreach ($receiptians AS $receiver)
- if (is_string($receiver->objectType))
- if ($receiver->id == "http://activityschema.org/collection/public")
- $public = true;
+ foreach ($receiptians AS $receiver) {
+ if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) {
+ $public = true;
+ }
+ }
if ($public && !stristr($post->generator->displayName, $application_name)) {
- require_once('include/html2bbcode.php');
-
$_SESSION["authenticated"] = true;
$_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 != "")
- $_REQUEST["title"] = html2bbcode($post->object->displayName);
- else
+ if ($post->object->displayName != "") {
+ $_REQUEST["title"] = HTML::toBBCode($post->object->displayName);
+ } else {
$_REQUEST["title"] = "";
+ }
- $_REQUEST["body"] = html2bbcode($post->object->content);
+ $_REQUEST["body"] = HTML::toBBCode($post->object->content);
// To-Do: Picture has to be cached and stored locally
if ($post->object->fullImage->url != "") {
- if ($post->object->fullImage->pump_io->proxyURL != "")
+ if ($post->object->fullImage->pump_io->proxyURL != "") {
$_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"];
- else
+ } else {
$_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+ }
}
logger('pumpio: posting for user '.$uid);
}
}
- if ($lastdate != 0)
- PConfig::set($uid,'pumpio','lastdate', $lastdate);
+ if ($lastdate != 0) {
+ 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
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($post->object->id),
- intval($uid)
- );
-
- if (count($r))
- $orig_post = $r[0];
- else {
- $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($post->object->id),
- intval($uid)
- );
-
- if (!count($r))
+ $orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
+ if (!DBA::isResult($orig_post)) {
+ $orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
+ if (!DBA::isResult($orig_post)) {
return;
- else
- $orig_post = $r[0];
+ }
}
$contactid = 0;
- if(link_compare($post->actor->url, $own_id)) {
+ if (link_compare($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(normalise_link($post->actor->url)),
intval($uid)
);
- if(count($r))
+ if (DBA::isResult($r)) {
$contactid = $r[0]['id'];
+ }
- if($contactid == 0)
+ if ($contactid == 0) {
$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))
+ if (DBA::isResult($r)) {
logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
- else
+ } else {
logger("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 ($post->object->id == "") {
+ if (empty($post->object->id)) {
logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
return;
}
// Searching for the liked post
// Two queries for speed issues
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
- dbesc($post->object->id),
- intval($uid),
- dbesc(NETWORK_PUMPIO)
- );
-
- if (count($r))
- $orig_post = $r[0];
- else {
- $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
- dbesc($post->object->id),
- intval($uid),
- dbesc(NETWORK_PUMPIO)
- );
-
- if (!count($r))
+ $orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
+ if (!DBA::isResult($orig_post)) {
+ $orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
+ if (!DBA::isResult($orig_post)) {
return;
- else
- $orig_post = $r[0];
+ }
}
// thread completion
- if ($threadcompletion)
+ if ($threadcompletion) {
pumpio_fetchallcomments($a, $uid, $post->object->id);
+ }
$contactid = 0;
- if(link_compare($post->actor->url, $own_id)) {
+ if (link_compare($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(normalise_link($post->actor->url)),
intval($uid)
);
- if(count($r))
+ if (DBA::isResult($r)) {
$contactid = $r[0]['id'];
+ }
- if($contactid == 0)
+ if ($contactid == 0) {
$contactid = $orig_post['contact-id'];
+ }
}
- $r = q("SELECT parent FROM `item` WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s' LIMIT 1",
- dbesc(ACTIVITY_LIKE),
- intval($uid),
- intval($contactid),
- dbesc($orig_post['uri'])
- );
-
- if(count($r)) {
+ $condition = ['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']];
+ if (Item::exists($condition)) {
logger("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['gravity'] = 3;
+ $likedata['gravity'] = GRAVITY_ACTIVITY;
$likedata['uid'] = $uid;
$likedata['wall'] = 0;
- $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
+ $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]';
logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
}
-function pumpio_get_contact($uid, $contact, $no_insert = false) {
+function pumpio_get_contact($uid, $contact, $no_insert = false)
+{
+ $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(["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::update($gcontact);
$cid = Contact::getIdForURL($contact->url, $uid);
- if ($no_insert)
- return($cid);
+ if ($no_insert) {
+ return $cid;
+ }
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
- intval($uid), dbesc(normalise_link($contact->url)));
+ intval($uid), DBA::escape(normalise_link($contact->url)));
- if (!count($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(datetime_convert()),
- 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(normalise_link($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(normalise_link($contact->url)),
intval($uid)
);
- if (!count($r)) {
- return(false);
+ if (!DBA::isResult($r)) {
+ return false;
}
$contact_id = $r[0]['id'];
*/
}
- Contact::updateAvatar($contact->image->url, $uid, $contact_id);
+ if (!empty($contact->image->url)) {
+ Contact::updateAvatar($contact->image->url, $uid, $contact_id);
+ }
- return($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
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($post->object->id),
- intval($uid)
- );
-
- if (count($r))
- return Item::delete($r[0]["id"]);
-
- $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($post->object->id),
- intval($uid)
- );
+ $condition = ['uri' => $post->object->id, 'uid' => $uid];
+ if (Item::exists($condition)) {
+ Item::delete($condition);
+ return true;
+ }
- if (count($r))
- return Item::delete($r[0]["id"]);
+ $condition = ['extid' => $post->object->id, 'uid' => $uid];
+ 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');
- require_once('include/html2bbcode.php');
- if (($post->verb == "like") || ($post->verb == "favorite"))
+ if (($post->verb == "like") || ($post->verb == "favorite")) {
return pumpio_dolike($a, $uid, $self, $post, $own_id);
+ }
- if (($post->verb == "unlike") || ($post->verb == "unfavorite"))
+ if (($post->verb == "unlike") || ($post->verb == "unfavorite")) {
return pumpio_dounlike($a, $uid, $self, $post, $own_id);
+ }
- if ($post->verb == "delete")
+ if ($post->verb == "delete") {
return pumpio_dodelete($a, $uid, $self, $post, $own_id);
+ }
if ($post->verb != "update") {
// Two queries for speed issues
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($post->object->id),
- intval($uid)
- );
-
- if (count($r))
+ if (Item::exists(['uri' => $post->object->id, 'uid' => $uid])) {
return false;
-
- $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($post->object->id),
- intval($uid)
- );
-
- if (count($r))
+ }
+ if (Item::exists(['extid' => $post->object->id, 'uid' => $uid])) {
return false;
+ }
}
// Only handle these three types
- if (!strstr("post|share|update", $post->verb))
+ if (!strstr("post|share|update", $post->verb)) {
return false;
+ }
$receiptians = [];
- if (@is_array($post->cc))
+ if (@is_array($post->cc)) {
$receiptians = array_merge($receiptians, $post->cc);
+ }
- if (@is_array($post->to))
+ if (@is_array($post->to)) {
$receiptians = array_merge($receiptians, $post->to);
+ }
+
+ $public = false;
- foreach ($receiptians AS $receiver)
- if (is_string($receiver->objectType))
- if ($receiver->id == "http://activityschema.org/collection/public")
- $public = true;
+ foreach ($receiptians AS $receiver) {
+ if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) {
+ $public = true;
+ }
+ }
$postarray = [];
- $postarray['network'] = NETWORK_PUMPIO;
- $postarray['gravity'] = 0;
+ $postarray['network'] = Protocol::PUMPIO;
$postarray['uid'] = $uid;
$postarray['wall'] = 0;
$postarray['uri'] = $post->object->id;
if ($post->object->objectType != "comment") {
$contact_id = pumpio_get_contact($uid, $post->actor);
- if (!$contact_id)
+ if (!$contact_id) {
$contact_id = $self[0]['id'];
+ }
$postarray['parent-uri'] = $post->object->id;
} 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(normalise_link($post->actor->url)),
intval($uid)
);
- if(count($r))
+ if (DBA::isResult($r)) {
$contact_id = $r[0]['id'];
- else {
+ } 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(normalise_link($post->actor->url)),
intval($uid)
);
- if(count($r))
+ if (DBA::isResult($r)) {
$contact_id = $r[0]['id'];
- else
+ } else {
$contact_id = $self[0]['id'];
+ }
}
}
$reply = new stdClass;
$reply->verb = "note";
- $reply->cc = $post->cc;
- $reply->to = $post->to;
+
+ if (isset($post->cc)) {
+ $reply->cc = $post->cc;
+ }
+
+ 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;
$postarray['parent-uri'] = $post->object->inReplyTo->id;
}
- if ($post->object->pump_io->proxyURL)
+ // 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;
+ }
$postarray['contact-id'] = $contact_id;
$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['body'] = html2bbcode($post->object->content);
+ $postarray['title'] = '';
+ $postarray['body'] = HTML::toBBCode($post->object->content);
$postarray['object'] = json_encode($post);
- if ($post->object->fullImage->url != "")
+ if (!empty($post->object->fullImage->url)) {
$postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];
+ }
- if ($post->object->displayName != "")
+ if (!empty($post->object->displayName)) {
$postarray['title'] = $post->object->displayName;
+ }
- $postarray['created'] = datetime_convert('UTC','UTC',$post->published);
- if (isset($post->updated))
- $postarray['edited'] = datetime_convert('UTC','UTC',$post->updated);
- elseif (isset($post->received))
- $postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
- else
+ $postarray['created'] = DateTimeFormat::utc($post->published);
+ if (isset($post->updated)) {
+ $postarray['edited'] = DateTimeFormat::utc($post->updated);
+ } elseif (isset($post->received)) {
+ $postarray['edited'] = DateTimeFormat::utc($post->received);
+ } else {
$postarray['edited'] = $postarray['created'];
+ }
if ($post->verb == "share") {
- if (!intval(Config::get('system','wall-to-wall_share'))) {
- if (isset($post->object->author->displayName) && ($post->object->author->displayName != ""))
- $share_author = $post->object->author->displayName;
- elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != ""))
- $share_author = $post->object->author->preferredUsername;
- else
- $share_author = $post->object->author->url;
-
- $postarray['body'] = share_header($share_author, $post->object->author->url,
- $post->object->author->image->url, "",
- datetime_convert('UTC','UTC',$post->object->created),
- $post->links->self->href).
- $postarray['body']."[/share]";
-
- /*
- $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).
- "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
- */
+ if (isset($post->object->author->displayName) && ($post->object->author->displayName != "")) {
+ $share_author = $post->object->author->displayName;
+ } elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != "")) {
+ $share_author = $post->object->author->preferredUsername;
} else {
- // Let shares look like wall-to-wall posts
- $postarray['author-name'] = $post->object->author->displayName;
- $postarray['author-link'] = $post->object->author->url;
- $postarray['author-avatar'] = $post->object->author->image->url;
+ $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, "",
+ $created, $post->links->self->href).
+ $postarray['body']."[/share]";
}
- if (trim($postarray['body']) == "")
+ if (trim($postarray['body']) == "") {
return false;
+ }
$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") {
-
- if ($threadcompletion)
- pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
-
- $user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
- intval($uid)
- );
-
- if(!count($user))
- return $top_item;
-
- $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
-
- if (link_compare($own_id, $postarray['author-link']))
- return $top_item;
-
- if (!function_exists("check_item_notification")) {
- $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
- dbesc($postarray['parent-uri']),
- intval($uid)
- );
-
- if(count($myconv)) {
-
- foreach($myconv as $conv) {
- // now if we find a match, it means we're in this conversation
-
- if(!link_compare($conv['author-link'],$importer_url) && !link_compare($conv['author-link'],$own_id))
- continue;
-
- require_once('include/enotify.php');
-
- $conv_parent = $conv['parent'];
-
- notification([
- 'type' => NOTIFY_COMMENT,
- 'notify_flags' => $user[0]['notify-flags'],
- 'language' => $user[0]['language'],
- 'to_name' => $user[0]['username'],
- 'to_email' => $user[0]['email'],
- 'uid' => $user[0]['uid'],
- 'item' => $postarray,
- '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;
- }
- }
- }
+ if (($post->object->objectType == "comment") && $threadcompletion) {
+ pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
}
return $top_item;
}
-function pumpio_fetchinbox(&$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');
+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');
+ $hostname = PConfig::get($uid, 'pumpio', 'host');
$username = PConfig::get($uid, "pumpio", "user");
$own_id = "https://".$hostname."/".$username;
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)
);
$client->access_token = $otoken;
$client->access_token_secret = $osecret;
- $last_id = PConfig::get($uid,'pumpio','last_id');
+ $last_id = PConfig::get($uid, 'pumpio', 'last_id');
$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
- if ($last_id != "")
+ if ($last_id != "") {
$url .= '?since='.urlencode($last_id);
+ }
- if (pumpio_reachable($url))
+ if (pumpio_reachable($url)) {
$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
- else
+ } else {
$success = false;
+ }
+
+ if (!$success) {
+ return;
+ }
if ($user->items) {
- $posts = array_reverse($user->items);
+ $posts = array_reverse($user->items);
- if (count($posts))
- foreach ($posts as $post) {
- $last_id = $post->id;
- pumpio_dopost($a, $client, $uid, $self, $post, $own_id, true);
- }
+ if (count($posts)) {
+ foreach ($posts as $post) {
+ $last_id = $post->id;
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id, true);
+ }
+ }
}
- foreach ($lastitems AS $item)
+ foreach ($lastitems as $item) {
pumpio_fetchallcomments($a, $uid, $item["uri"]);
+ }
- PConfig::set($uid,'pumpio','last_id', $last_id);
+ PConfig::set($uid, 'pumpio', 'last_id', $last_id);
}
-function pumpio_getallusers(&$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');
+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");
$client = new oauth_client_class;
$url = 'https://'.$hostname.'/api/user/'.$username.'/following';
- if (pumpio_reachable($url))
- $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users);
- else
+ if (pumpio_reachable($url)) {
+ $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);
- else
+ if (pumpio_reachable($url)) {
+ $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(! count($qi))
+
+ if (!DBA::isResult($qi)) {
return;
+ }
- foreach($qi as $x) {
- if($x['network'] !== NETWORK_PUMPIO)
+ foreach ($qi as $x) {
+ if ($x['network'] !== Protocol::PUMPIO) {
continue;
+ }
logger('pumpio_queue: run');
WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
intval($x['cid'])
);
- if(! count($r))
+ if (!DBA::isResult($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 = 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");
$client->client_id = $consumer_key;
$client->client_secret = $consumer_secret;
- if (pumpio_reachable($z['url']))
+ if (pumpio_reachable($z['url'])) {
$success = $client->CallAPI($z['url'], 'POST', $z['post'], ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
- else
+ } else {
$success = false;
+ }
- if($success) {
+ if ($success) {
$post_id = $user->object->id;
logger('pumpio_queue: send '.$username.': success '.$post_id);
- if($post_id && $iscomment) {
+ 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']]);
}
Queue::removeItem($x['id']);
- } else
- logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true));
- } else
+ } else {
+ logger('pumpio_queue: send '.$username.': '.$z['url'].' general error: ' . print_r($user, true));
+ }
+ } else {
logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']);
+ }
if (!$success) {
logger('pumpio_queue: delayed');
}
}
-function pumpio_getreceiver(&$a, $b) {
-
+function pumpio_getreceiver(App $a, array $b)
+{
$receiver = [];
if (!$b["private"]) {
-
- if(! strstr($b['postopts'],'pumpio'))
+ if (!strstr($b['postopts'], 'pumpio')) {
return $receiver;
+ }
$public = PConfig::get($b['uid'], "pumpio", "public");
- if ($public)
+ if ($public) {
$receiver["to"][] = [
"objectType" => "collection",
"id" => "http://activityschema.org/collection/public"];
+ }
} else {
$cids = explode("><", $b["allow_cid"]);
$gids = explode("><", $b["allow_gid"]);
$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 (count($r)) {
+ if (DBA::isResult($r)) {
$receiver["bcc"][] = [
"displayName" => $r[0]["name"],
"objectType" => "person",
"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)
}
if ($b["inform"] != "") {
-
$inform = explode(",", $b["inform"]);
foreach ($inform AS $cid) {
- if (substr($cid, 0, 4) != "cid:")
+ if (substr($cid, 0, 4) != "cid:") {
continue;
+ }
$cid = str_replace("cid:", "", $cid);
$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 (count($r)) {
- $receiver["to"][] = [
- "displayName" => $r[0]["name"],
- "objectType" => "person",
- "preferredUsername" => $r[0]["nick"],
- "url" => $r[0]["url"]];
+ if (DBA::isResult($r)) {
+ $receiver["to"][] = [
+ "displayName" => $r[0]["name"],
+ "objectType" => "person",
+ "preferredUsername" => $r[0]["nick"],
+ "url" => $r[0]["url"]];
}
}
}
return $receiver;
}
-function pumpio_fetchallcomments(&$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');
+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");
logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
intval($uid));
// Fetching the original post
- $r = q("SELECT `extid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `extid` != '' LIMIT 1",
- dbesc($id),
- intval($uid)
- );
-
- if (!count($r))
+ $condition = ["`uri` = ? AND `uid` = ? AND `extid` != ''", $id, $uid];
+ $item = Item::selectFirst(['extid'], $condition);
+ if (!DBA::isResult($item)) {
return false;
+ }
- $url = $r[0]["extid"];
+ $url = $item["extid"];
$client = new oauth_client_class;
$client->oauth_version = '1.0a';
logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
- if (pumpio_reachable($url))
+ if (pumpio_reachable($url)) {
$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item);
- else
+ } else {
$success = false;
+ }
- if (!$success)
+ if (!$success) {
return;
+ }
if ($item->likes->totalItems != 0) {
foreach ($item->likes->items AS $post) {
$like->object = new stdClass;
$like->object->id = $item->id;
$like->actor = new stdClass;
- $like->actor->displayName = $item->displayName;
- $like->actor->preferredUsername = $item->preferredUsername;
+ if (!empty($item->displayName)) {
+ $like->actor->displayName = $item->displayName;
+ }
+ //$like->actor->preferredUsername = $item->preferredUsername;
+ //$like->actor->image = $item->image;
$like->actor->url = $item->url;
- $like->actor->image = $item->image;
$like->generator = new stdClass;
$like->generator->displayName = "pumpio";
pumpio_dolike($a, $uid, $self, $post, $own_id, false);
}
}
- if ($item->replies->totalItems == 0)
+ if ($item->replies->totalItems == 0) {
return;
+ }
foreach ($item->replies->items AS $item) {
- if ($item->id == $id)
+ if ($item->id == $id) {
continue;
+ }
// Checking if the comment already exists - Two queries for speed issues
- $r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($item->id),
- intval($uid)
- );
-
- if (count($r))
+ if (Item::exists(['uri' => $item->id, 'uid' => $uid])) {
continue;
+ }
- $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($item->id),
- intval($uid)
- );
-
- if (count($r))
+ if (Item::exists(['extid' => $item->id, 'uid' => $uid])) {
continue;
+ }
$post = new stdClass;
$post->verb = "post";
}
}
-
-function pumpio_reachable($url) {
+function pumpio_reachable($url)
+{
$data = Network::curl($url, false, $redirects, ['timeout'=>10]);
- return(intval($data['return_code']) != 0);
+ return intval($data['return_code']) != 0;
}
/*
https://reisub.nsupdate.info/git / friendica-addons.git / .git / blobdiff