clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2972 from annando/1611-term-date 

Delivery to other systems was needlessly deferred.
This commit is contained in:
rabuzarus 2016-11-24 22:14:09 +01:00 committed by GitHub
parent 4eeb5a0a17 ba1a304589
commit 5e466aade0
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/queue_fn.php
View File

@ -15,22 +15,35 @@ function remove_queue_item($id) {
); );
} }
/**
* @brief Checks if the communication with a given contact had problems recently
*
* @param int $cid Contact id
*
* @return bool The communication with this contact has currently problems
*/
function was_recently_delayed($cid) { function was_recently_delayed($cid) {
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d $was_delayed = false;
and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
// Are there queue entries that were recently added?
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
AND `last` > UTC_TIMESTAMP() - interval 15 minute LIMIT 1",
intval($cid) intval($cid)
); );
if(count($r))
return true;
$r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1", $was_delayed = dbm::is_result($r);
intval($cid)
);
if(count($r))
return true;
return false; // We set "term-date" to a current date if the communication has problems.
// If the communication works again we reset this value.
if ($was_delayed) {
$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
intval($cid)
);
$was_delayed = !dbm::is_result($r);
}
return $was_delayed;
} }