Other addons

found a few more

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 0d0d2744070f544f294d6761f56041b72ead9773..34d84c8ff11b746ff815bbfd7259882cb56b67a1 100644 (file)
--- 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 be4db5fafdcd9b82c49823f7d4d3276c932e4919..d4c45989583bcdc235dc6b5e8620141fe6c9e821 100644 (file)
--- 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']);
                }
        }
 }