nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4258 from zeroadam/BugFixQueue-#4256

Browse source 
Fix class name issue
This commit is contained in:
Hypolite Petovan 2018-01-16 09:04:43 -05:00 committed by GitHub
parent 17c709aec4 5d8f798ef7
commit 0c4d7cd1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Worker/Queue.php
View file

@ -8,7 +8,7 @@ use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Queue; use Friendica\Model\Queue as QueueModel;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
@ -75,7 +75,7 @@ class Queue
$contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]); $contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
if (!DBM::is_result($contact)) { if (!DBM::is_result($contact)) {
Queue::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
return; return;
} }
@ -83,7 +83,7 @@ class Queue
if (!is_null($dead) && $dead) { if (!is_null($dead) && $dead) {
logger('queue: skipping known dead url: ' . $contact['notify']); logger('queue: skipping known dead url: ' . $contact['notify']);
Queue::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
return; return;
} }
@ -101,14 +101,14 @@ class Queue
if (!is_null($vital) && !$vital) { if (!is_null($vital) && !$vital) {
logger('queue: skipping dead server: ' . $server); logger('queue: skipping dead server: ' . $server);
Queue::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
return; return;
} }
} }
$user = dba::selectFirst('user', [], ['uid' => $contact['uid']]); $user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
if (!DBM::is_result($user)) { if (!DBM::is_result($user)) {
Queue::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
return; return;
} }
@ -124,10 +124,10 @@ class Queue
$deliver_status = DFRN::deliver($owner, $contact, $data); $deliver_status = DFRN::deliver($owner, $contact, $data);
if ($deliver_status == (-1)) { if ($deliver_status == (-1)) {
Queue::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else { } else {
Queue::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} }
break; break;
case NETWORK_OSTATUS: case NETWORK_OSTATUS:
@ -136,10 +136,10 @@ class Queue
$deliver_status = Salmon::slapper($owner, $contact['notify'], $data); $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
if ($deliver_status == (-1)) { if ($deliver_status == (-1)) {
Queue::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else { } else {
Queue::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} }
} }
break; break;
@ -149,10 +149,10 @@ class Queue
$deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true); $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true);
if ($deliver_status == (-1)) { if ($deliver_status == (-1)) {
Queue::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else { } else {
Queue::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} }
} }
break; break;
@ -162,9 +162,9 @@ class Queue
call_hooks('queue_deliver', $params); call_hooks('queue_deliver', $params);
if ($params['result']) { if ($params['result']) {
Queue::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} else { } else {
Queue::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
} }
break; break;
} }