<?php
-
/**
* @file src/Worker/Queue.php
*/
-
namespace Friendica\Worker;
use Friendica\Core\Cache;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\PortableContact;
+use Friendica\Protocol\Salmon;
+use dba;
+require_once 'include/dba.php';
require_once 'include/queue_fn.php';
require_once 'include/datetime.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
-require_once 'include/salmon.php';
class Queue
{
*/
$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
- call_hooks('queue_predeliver', $a, $r);
+ call_hooks('queue_predeliver', $r);
if (DBM::is_result($r)) {
foreach ($r as $q_item) {
// delivering
-
- $r = q(
- "SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
- intval($queue_id)
- );
-
- if (!DBM::is_result($r)) {
+ $q_item = dba::selectFirst('queue', [], ['id' => $queue_id]);
+ if (!DBM::is_result($q_item)) {
return;
}
- $q_item = $r[0];
-
- $c = q(
- "SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($q_item['cid'])
- );
-
- if (!DBM::is_result($c)) {
+ $contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
+ if (!DBM::is_result($contact)) {
remove_queue_item($q_item['id']);
return;
}
- $dead = Cache::get($cachekey_deadguy . $c[0]['notify']);
+ $dead = Cache::get($cachekey_deadguy . $contact['notify']);
if (!is_null($dead) && $dead) {
- logger('queue: skipping known dead url: ' . $c[0]['notify']);
+ logger('queue: skipping known dead url: ' . $contact['notify']);
update_queue_time($q_item['id']);
return;
}
- $server = PortableContact::detectServer($c[0]['url']);
+ $server = PortableContact::detectServer($contact['url']);
if ($server != "") {
$vital = Cache::get($cachekey_server . $server);
if (is_null($vital)) {
- logger("Check server " . $server . " (" . $c[0]["network"] . ")");
+ logger("Check server " . $server . " (" . $contact["network"] . ")");
- $vital = PortableContact::checkServer($server, $c[0]["network"], true);
+ $vital = PortableContact::checkServer($server, $contact["network"], true);
Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR);
}
}
}
- $u = q(
- "SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
- FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($c[0]['uid'])
- );
- if (!DBM::is_result($u)) {
+ $user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
+ if (!DBM::is_result($user)) {
remove_queue_item($q_item['id']);
return;
}
- $data = $q_item['content'];
- $public = $q_item['batch'];
- $contact = $c[0];
- $owner = $u[0];
+ $data = $q_item['content'];
+ $public = $q_item['batch'];
+ $owner = $user;
$deliver_status = 0;
case NETWORK_OSTATUS:
if ($contact['notify']) {
logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
- $deliver_status = slapper($owner, $contact['notify'], $data);
+ $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
if ($deliver_status == (-1)) {
update_queue_time($q_item['id']);
default:
$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
- call_hooks('queue_deliver', $a, $params);
+ call_hooks('queue_deliver', $params);
if ($params['result']) {
remove_queue_item($q_item['id']);