From 6d88e63f60abff999fe5b99f43be581e9b0350a8 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 22 Jan 2018 17:52:51 -0500 Subject: [PATCH 1/2] Bug fix for Twitter remove references and update functions of removed queue_fn --- twitter/twitter.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index a33415d8..0a831800 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -69,6 +69,7 @@ use Friendica\Core\Worker; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Photo; +use Friendica\Model\Queue; use Friendica\Model\User; use Friendica\Object\Image; @@ -627,8 +628,9 @@ function twitter_post_hook(App $a, &$b) } $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]); - require_once 'include/queue_fn.php'; - add_to_queue($a->contact, NETWORK_TWITTER, $s); + + Queue::add($a->contact, NETWORK_TWITTER, $s); + notice(t('Twitter post failed. Queued for retry.') . EOL); } elseif ($iscomment) { logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); @@ -925,8 +927,6 @@ function twitter_queue_hook(App $a, &$b) return; } - require_once 'include/queue_fn.php'; - foreach ($qi as $x) { if ($x['network'] !== NETWORK_TWITTER) { continue; @@ -972,7 +972,7 @@ function twitter_queue_hook(App $a, &$b) logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"'); } else { $success = true; - remove_queue_item($x['id']); + Queue::removeItem($x['id']); } } else { logger("twitter_queue: Error getting tokens for user " . $user['uid']); @@ -980,7 +980,7 @@ function twitter_queue_hook(App $a, &$b) if (!$success) { logger('twitter_queue: delayed'); - update_queue_time($x['id']); + Queue::updateTime($x['id']); } } } From 3db056fe799de8c23cd95d8f601a6373f3ff972e Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 22 Jan 2018 17:58:55 -0500 Subject: [PATCH 2/2] Other addons found a few more --- diaspora/diaspora.php | 18 +++++++++--------- pumpio/pumpio.php | 16 +++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 0d0d2744..34d84c8f 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -12,6 +12,7 @@ require_once("addon/diaspora/Diaspora_Connection.php"); use Friendica\Core\Addon; use Friendica\Core\PConfig; use Friendica\Database\DBM; +use Friendica\Model\Queue; function diaspora_install() { Addon::registerHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); @@ -53,8 +54,6 @@ function diaspora_queue_hook(&$a,&$b) { if(! count($qi)) return; - require_once('include/queue_fn.php'); - foreach($qi as $x) { if($x['network'] !== NETWORK_DIASPORA2) continue; @@ -94,20 +93,21 @@ function diaspora_queue_hook(&$a,&$b) { $conn->provider = $hostname; $conn->postStatusMessage($post, $aspect); - logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG); + logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG); - $success = true; + $success = true; - remove_queue_item($x['id']); + Queue::removeItem($x['id']); } catch (Exception $e) { logger("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), LOGGER_DEBUG); } - } else + } else { logger('diaspora_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG); + } if (!$success) { logger('diaspora_queue: delayed'); - update_queue_time($x['id']); + Queue::updateTime($x['id']); } } } @@ -366,8 +366,8 @@ function diaspora_send(&$a,&$b) { $a->contact = $r[0]["id"]; $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_DIASPORA2,$s); + + Queue::add($a->contact, NETWORK_DIASPORA2, $s); notice(t('Diaspora post failed. Queued for retry.').EOL); } } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index be4db5fa..d4c45989 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -14,6 +14,7 @@ use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\User; use Friendica\Model\Item; +use Friendica\Model\Queue; require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/oauth_client.php'; @@ -551,11 +552,10 @@ function pumpio_send(&$a,&$b) { $a->contact = $r[0]["id"]; $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_PUMPIO,$s); + + Queue::add($a->contact, NETWORK_PUMPIO, $s); notice(t('Pump.io post failed. Queued for retry.').EOL); } - } } @@ -628,8 +628,8 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $a->contact = $r[0]["id"]; $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_PUMPIO,$s); + + Queue::add($a->contact, NETWORK_PUMPIO, $s); notice(t('Pump.io like failed. Queued for retry.').EOL); } } @@ -1433,8 +1433,6 @@ function pumpio_queue_hook(&$a,&$b) { if(! count($qi)) return; - require_once('include/queue_fn.php'); - foreach($qi as $x) { if($x['network'] !== NETWORK_PUMPIO) continue; @@ -1494,7 +1492,7 @@ function pumpio_queue_hook(&$a,&$b) { intval($z['item']) ); } - remove_queue_item($x['id']); + Queue::removeItem($x['id']); } else logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true)); } else @@ -1502,7 +1500,7 @@ function pumpio_queue_hook(&$a,&$b) { if (!$success) { logger('pumpio_queue: delayed'); - update_queue_time($x['id']); + Queue::updateTime($x['id']); } } }