X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FRealtime%2FRealtimePlugin.php;h=a7750e005ed0d64e89f6e3c77aa228059ce29ff2;hb=3b246d643df52f38e3854ba34fe0cabd1b6de5c8;hp=113187e1e3167dbfa28b9964d882704b98728658;hpb=6e894c010fc0e7ddaaafa8795634d6343019aafb;p=quix0rs-gnu-social.git

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 113187e1e3..a7750e005e 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -45,9 +45,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class RealtimePlugin extends Plugin
 {
-    protected $replyurl = null;
-    protected $favorurl = null;
-    protected $deleteurl = null;
+    protected $showurl = null;
 
     /**
      * When it's time to initialize the plugin, calculate and
@@ -56,14 +54,32 @@ class RealtimePlugin extends Plugin
 
     function onInitializePlugin()
     {
-        $this->replyurl = common_local_url('newnotice');
-        $this->favorurl = common_local_url('favor');
-        $this->repeaturl = common_local_url('repeat');
         // FIXME: need to find a better way to pass this pattern in
-        $this->deleteurl = common_local_url('deletenotice',
+        $this->showurl = common_local_url('shownotice',
                                             array('notice' => '0000000000'));
         return true;
     }
+    
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('realtime_channel', Realtime_channel::schemaDef());
+        return true;
+    }
+    
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Realtime_channel':
+            include_once $dir.'/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
 
     function onEndShowScripts($action)
     {
@@ -116,8 +132,9 @@ class RealtimePlugin extends Plugin
 
     function onEndShowStatusNetStyles($action)
     {
-        $action->cssLink('plugins/Realtime/realtimeupdate.css',
-                         null, 'screen, projection, tv');
+        $action->cssLink(Plugin::staticPath('Realtime', 'realtimeupdate.css'),
+                         null,
+                         'screen, projection, tv');
         return true;
     }
 
@@ -130,14 +147,14 @@ class RealtimePlugin extends Plugin
         $user = User::staticGet('id', $notice->profile_id);
 
         if (!empty($user)) {
-            $paths[] = array('showstream', $user->nickname);
+            $paths[] = array('showstream', $user->nickname, null);
         }
 
         // Add to the public timeline
 
         if ($notice->is_local == Notice::LOCAL_PUBLIC ||
             ($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) {
-            $paths[] = array('public');
+            $paths[] = array('public', null, null);
         }
 
         // Add to the tags timeline
@@ -146,7 +163,7 @@ class RealtimePlugin extends Plugin
 
         if (!empty($tags)) {
             foreach ($tags as $tag) {
-                $paths[] = array('tag', $tag);
+                $paths[] = array('tag', $tag, null);
             }
         }
 
@@ -157,7 +174,7 @@ class RealtimePlugin extends Plugin
 
         foreach (array_keys($ni) as $user_id) {
             $user = User::staticGet('id', $user_id);
-            $paths[] = array('all', $user->nickname);
+            $paths[] = array('all', $user->nickname, null);
         }
 
         // Add to the replies timeline
@@ -169,7 +186,7 @@ class RealtimePlugin extends Plugin
             while ($reply->fetch()) {
                 $user = User::staticGet('id', $reply->profile_id);
                 if (!empty($user)) {
-                    $paths[] = array('replies', $user->nickname);
+                    $paths[] = array('replies', $user->nickname, null);
                 }
             }
         }
@@ -183,7 +200,7 @@ class RealtimePlugin extends Plugin
         if ($gi->find()) {
             while ($gi->fetch()) {
                 $ug = User_group::staticGet('id', $gi->group_id);
-                $paths[] = array('showgroup', $ug->nickname);
+                $paths[] = array('showgroup', $ug->nickname, null);
             }
         }
 
@@ -194,8 +211,22 @@ class RealtimePlugin extends Plugin
             $this->_connect();
 
             foreach ($paths as $path) {
-                $timeline = $this->_pathToChannel($path);
-                $this->_publish($timeline, $json);
+            	
+            	list($action, $arg1, $arg2) = $path;
+            	
+            	$channels = Realtime_channel::getAllChannels($action, $arg1, $arg2);
+            	
+            	foreach ($channels as $channel) {
+            		if (is_null($channel->user_id)) {
+            			$profile = null;
+            		} else {
+            			$profile = Profile::staticGet('id', $channel->user_id);
+            		}
+            		if ($notice->inScope($profile)) {
+            			$timeline = $this->_pathToChannel(array($channel->channel_key));		
+                		$this->_publish($timeline, $json);
+            		}
+            	}
             }
 
             $this->_disconnect();
@@ -226,10 +257,6 @@ class RealtimePlugin extends Plugin
                          '');
         $action->elementEnd('address');
 
-        if (common_logged_in()) {
-            $action->showNoticeForm();
-        }
-
         $action->showContentBlock();
         $action->showScripts();
         $action->elementEnd('body');
@@ -322,7 +349,12 @@ class RealtimePlugin extends Plugin
 
     function _getScripts()
     {
-        return array('plugins/Realtime/realtimeupdate.min.js');
+        if (common_config('site', 'minify')) {
+            $js = 'realtimeupdate.min.js';
+        } else {
+            $js = 'realtimeupdate.js';
+        }
+        return array(Plugin::staticPath('Realtime', $js));
     }
 
     /**
@@ -353,7 +385,7 @@ class RealtimePlugin extends Plugin
 
     function _updateInitialize($timeline, $user_id)
     {
-        return "RealtimeUpdate.init($user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->repeaturl\", \"$this->deleteurl\"); ";
+        return "RealtimeUpdate.init($user_id, \"$this->showurl\"); ";
     }
 
     function _connect()
@@ -375,19 +407,27 @@ class RealtimePlugin extends Plugin
 
     function _getTimeline($action)
     {
-        $path = null;
         $timeline = null;
-
+		$arg1     = null;
+		$arg2	  = null;
+		
         $action_name = $action->trimmed('action');
 
+		// FIXME: lists
+		// FIXME: search (!)
+		// FIXME: profile + tag
+		
         switch ($action_name) {
          case 'public':
-            $path = array('public');
+         	// no arguments
             break;
          case 'tag':
             $tag = $action->trimmed('tag');
-            if (!empty($tag)) {
-                $path = array('tag', $tag);
+            if (empty($tag)) {
+                $arg1 = $tag;
+            } else {
+            	$this->log(LOG_NOTICE, "Unexpected 'tag' action without tag argument");
+            	return null;
             }
             break;
          case 'showstream':
@@ -396,17 +436,29 @@ class RealtimePlugin extends Plugin
          case 'showgroup':
             $nickname = common_canonical_nickname($action->trimmed('nickname'));
             if (!empty($nickname)) {
-                $path = array($action_name, $nickname);
+                $arg1 = $nickname;
+            } else {
+            	$this->log(LOG_NOTICE, "Unexpected $action_name action without nickname argument.");
+            	return null;
             }
             break;
          default:
-            break;
-        }
-
-        if (!empty($path)) {
-            $timeline = $this->_pathToChannel($path);
+            return null;
         }
 
+		$user = common_current_user();
+		
+		$user_id = (!empty($user)) ? $user->id : null;
+		
+		$channel = Realtime_channel::getChannel($user_id,
+												$action_name,
+												$arg1,
+												$arg2);
+		
+		if (!empty($channel)) {
+			$timeline = $this->_pathToChannel(array($channel->channel_key));
+		}
+				
         return $timeline;
     }
 }