X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FComet%2FCometPlugin.php;h=300d1e9a2488e7430becd87e7c5f0a95cafae092;hb=9498a164805892a8af17311f7e7697b132524990;hp=a7a4f4b23786d69afda6432cb1bc811bc26af272;hpb=192bc42c917999236ad26be0aef6f441e8100d2b;p=quix0rs-gnu-social.git

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index a7a4f4b237..300d1e9a24 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Plugin to do "real time" updates using Comet/Bayeux
  *
@@ -20,124 +20,88 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
+
 /**
  * Plugin to do realtime updates using Comet
  *
  * @category Plugin
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
-class CometPlugin extends Plugin
+class CometPlugin extends RealtimePlugin
 {
-    var $server = null;
+    public $server   = null;
+    public $username = null;
+    public $password = null;
+    public $prefix   = null;
+    protected $bay   = null;
 
-    function __construct($server=null)
+    function __construct($server=null, $username=null, $password=null, $prefix=null)
     {
-        $this->server = $server;
+        $this->server   = $server;
+        $this->username = $username;
+        $this->password = $password;
+        $this->prefix   = $prefix;
 
         parent::__construct();
     }
 
-    function onEndShowScripts($action)
+    function _getScripts()
     {
-        $timeline = null;
-
-        $this->log(LOG_DEBUG, 'got action ' . $action->trimmed('action'));
-
-        switch ($action->trimmed('action')) {
-         case 'public':
-            $timeline = '/timelines/public';
-            break;
-         default:
-            return true;
-        }
+        $scripts = parent::_getScripts();
 
-        $scripts = array('jquery.comet.js', 'json2.js', 'updatetimeline.js');
+        $ours = array('jquery.comet.js', 'cometupdate.js');
 
-        foreach ($scripts as $script) {
-            $action->element('script', array('type' => 'text/javascript',
-                                             'src' => common_path('plugins/Comet/'.$script)),
-                         ' ');
+        foreach ($ours as $script) {
+            $scripts[] = common_path('plugins/Comet/'.$script);
         }
 
-        $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw("$(document).ready(function() { updater.init(\"$this->server\", \"$timeline\");});");
-        $action->elementEnd('script');
-
-        return true;
+        return $scripts;
     }
 
-    function onEndNoticeSave($notice)
+    function _updateInitialize($timeline, $user_id)
     {
-        $this->log(LOG_INFO, "Called for save notice.");
-
-        $timelines = array();
-
-        // XXX: Add other timelines; this is just for the public one
-
-        if ($notice->is_local ||
-            ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
-            $timelines[] = '/timelines/public';
-        }
-
-        if (count($timelines) > 0) {
-            // Require this, since we need it
-            require_once(INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php');
-
-            $json = $this->noticeAsJson($notice);
-
-            // Bayeux? Comet? Huh? These terms confuse me
-            $bay = new Bayeux($this->server);
-
-            foreach ($timelines as $timeline) {
-                $this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
-                $bay->publish($timeline, $json);
-            }
-
-            $bay = NULL;
-        }
-
-        return true;
+        $script = parent::_updateInitialize($timeline, $user_id);
+        return $script." CometUpdate.init(\"$this->server\", \"$timeline\", $user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->deleteurl\");";
     }
 
-    function noticeAsJson($notice)
+    function _connect()
     {
-        // FIXME: this code should be abstracted to a neutral third
-        // party, like Notice::asJson(). I'm not sure of the ethics
-        // of refactoring from within a plugin, so I'm just abusing
-        // the TwitterApiAction method. Don't do this unless you're me!
-
-        require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-        $act = new TwitterApiAction('/dev/null');
-
-        $arr = $act->twitter_status_array($notice, true);
-        $arr['url'] = $notice->bestUrl();
-
-        $profile = $notice->getProfile();
-        $arr['user']['profile_url'] = $profile->profileurl;
+        require_once INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php';
+        // Bayeux? Comet? Huh? These terms confuse me
+        $this->bay = new Bayeux($this->server, $this->user, $this->password);
+    }
 
-        return $arr;
+    function _publish($timeline, $json)
+    {
+        $this->bay->publish($timeline, $json);
     }
 
-    // Push this up to Plugin
+    function _disconnect()
+    {
+        unset($this->bay);
+    }
 
-    function log($level, $msg)
+    function _pathToChannel($path)
     {
-        common_log($level, get_class($this) . ': '.$msg);
+        if (!empty($this->prefix)) {
+            array_unshift($path, $this->prefix);
+        }
+        return '/' . implode('/', $path);
     }
 }