Do mention lookup for Webfinger accounts in OStatusPlugin

[quix0rs-gnu-social.git] / classes / Queue_item.php

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 6b4f5c642ea3d2777c348d9e140a8fbf72c498bc..f83c2cef184d49f868d712a82a016fefa34d4c68 100644 (file)
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -2,54 +2,66 @@
 /**
  * Table Definition for queue_item
  */
-require_once 'DB/DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Queue_item extends DB_DataObject 
+class Queue_item extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'queue_item';                      // table name
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $transport;                       // varchar(8)  primary_key not_null
+    public $id;                              // int(4)  primary_key not_null
+    public $frame;                           // blob not_null
     public $created;                         // datetime()   not_null
-    public $claimed;                         // datetime()  
+    public $claimed;                         // datetime()
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Queue_item',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey() { return array(false, false); }
-       
-       static function top($transport) {
-
-               $qi = new Queue_item();
-               $qi->transport = $transport;
-               $qi->orderBy('created');
-               $qi->whereAdd('claimed is NULL');
-
-               $qi->limit(1);
-
-               $cnt = $qi->find(TRUE);
-
-               if ($cnt) {
-                       # XXX: potential race condition
-                       # can we force it to only update if claimed is still NULL
-                       # (or old)?
-                       common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id);
-                       $orig = clone($qi);
-                       $qi->claimed = common_sql_now();
-                       $result = $qi->update($orig);
-                       if ($result) {
-                               common_log(LOG_INFO, 'claim succeeded.');
-                               return $qi;
-                       } else {
-                               common_log(LOG_INFO, 'claim failed.');
-                       }
-               }
-               $qi = NULL;
-               return NULL;
-       }
+    /**
+     * @param mixed $transports name of a single queue or array of queues to pull from
+     *                          If not specified, checks all queues in the system.
+     */
+    static function top($transports=null) {
+
+        $qi = new Queue_item();
+        if ($transports) {
+            if (is_array($transports)) {
+                // @fixme use safer escaping
+                $list = implode("','", array_map('addslashes', $transports));
+                $qi->whereAdd("transport in ('$list')");
+            } else {
+                $qi->transport = $transports;
+            }
+        }
+        $qi->orderBy('created');
+        $qi->whereAdd('claimed is null');
+
+        $qi->limit(1);
+
+        $cnt = $qi->find(true);
+
+        if ($cnt) {
+            # XXX: potential race condition
+            # can we force it to only update if claimed is still null
+            # (or old)?
+            common_log(LOG_INFO, 'claiming queue item id = ' . $qi->id .
+                ' for transport ' . $qi->transport);
+            $orig = clone($qi);
+            $qi->claimed = common_sql_now();
+            $result = $qi->update($orig);
+            if ($result) {
+                common_log(LOG_INFO, 'claim succeeded.');
+                return $qi;
+            } else {
+                common_log(LOG_INFO, 'claim failed.');
+            }
+        }
+        $qi = null;
+        return null;
+    }
 }