diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 88630fe0..cf272a27 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -18,6 +18,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\Model\Queue; +use Friendica\Core\Worker; function diaspora_install() { @@ -396,14 +397,7 @@ function diaspora_send(App $a, array &$b) Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG); - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); - if (count($r)) - $a->contact = $r[0]["id"]; - - $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]); - - Queue::add($a->contact, Protocol::DIASPORA2, $s); - notice(L10n::t('Diaspora post failed. Queued for retry.').EOL); + Worker::defer(); } } } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 319c109a..6fa2ebf7 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -609,16 +609,7 @@ function pumpio_send(App $a, array &$b) } } else { Logger::log('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true)); - - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); - if (DBA::isResult($r)) { - $a->contact = $r[0]["id"]; - } - - $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]); - - Queue::add($a->contact, Protocol::PUMPIO, $s); - notice(L10n::t('Pump.io post failed. Queued for retry.').EOL); + Worker::defer(); } } } @@ -686,16 +677,7 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "") Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri); } else { Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true)); - - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $uid); - if (DBA::isResult($r)) { - $a->contact = $r[0]["id"]; - } - - $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]); - - Queue::add($a->contact, Protocol::PUMPIO, $s); - notice(L10n::t('Pump.io like failed. Queued for retry.').EOL); + Worker::defer(); } } diff --git a/twitter/twitter.php b/twitter/twitter.php index 2d331a7d..fbe30ce0 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -684,16 +684,7 @@ function twitter_post_hook(App $a, array &$b) if (!empty($result->errors)) { Logger::log('Send to Twitter failed: "' . print_r($result->errors, true) . '"'); - - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid'])); - if (DBA::isResult($r)) { - $a->contact = $r[0]["id"]; - } - - $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]); - - Queue::add($a->contact, Protocol::TWITTER, $s); - notice(L10n::t('Twitter post failed. Queued for retry.') . EOL); + Worker::defer(); } elseif ($iscomment) { Logger::log('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);