X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FRealtime%2FRealtimePlugin.php;h=eca3a8b029be1f90ebee22158f761f68c9117460;hb=e7bbe6c1b664d579622d4103293b99e2650a6b8a;hp=113187e1e3167dbfa28b9964d882704b98728658;hpb=cff14c7e10b5125874438215fb799bccaa9337ea;p=quix0rs-gnu-social.git diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 113187e1e3..eca3a8b029 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,18 +54,63 @@ 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 'KeepalivechannelAction': + case 'ClosechannelAction': + include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; + return false; + case 'Realtime_channel': + include_once $dir.'/'.$cls.'.php'; + return false; + default: + return true; + } + } + + /** + * Hook for RouterInitialized event. + * + * @param Net_URL_Mapper $m path-to-action mapper + * @return boolean hook return + */ + function onRouterInitialized($m) + { + $m->connect('main/channel/:channelkey/keepalive', + array('action' => 'keepalivechannel'), + array('channelkey' => '[a-z0-9]{32}')); + $m->connect('main/channel/:channelkey/close', + array('action' => 'closechannel'), + array('channelkey' => '[a-z0-9]{32}')); + return true; + } function onEndShowScripts($action) { - $timeline = $this->_getTimeline($action); + $channel = $this->_getChannel($action); + + if (empty($channel)) { + return true; + } + + $timeline = $this->_pathToChannel(array($channel->channel_key)); // If there's not a timeline on this page, // just return true @@ -102,12 +145,14 @@ class RealtimePlugin extends Plugin } else { $pluginPath = common_path('plugins/Realtime/'); - $realtimeUI = ' RealtimeUpdate.initActions("'.$url.'", "'.$timeline.'", "'. $pluginPath .'");'; + $keepalive = common_local_url('keepalivechannel', array('channelkey' => $channel->channel_key)); + $close = common_local_url('closechannel', array('channelkey' => $channel->channel_key)); + $realtimeUI = ' RealtimeUpdate.initActions("'.$url.'", "'.$timeline.'", "'. $pluginPath .'", "'.$keepalive.'", "'.$close.'"); '; } $script = ' $(document).ready(function() { '. $realtimeUI. - $this->_updateInitialize($timeline, $user_id). + $this->_updateInitialize($timeline, $user_id). '}); '; $action->inlineScript($script); @@ -116,8 +161,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 +176,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 +192,7 @@ class RealtimePlugin extends Plugin if (!empty($tags)) { foreach ($tags as $tag) { - $paths[] = array('tag', $tag); + $paths[] = array('tag', $tag, null); } } @@ -157,7 +203,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 +215,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 +229,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); } } @@ -192,10 +238,31 @@ class RealtimePlugin extends Plugin $json = $this->noticeAsJson($notice); $this->_connect(); + + // XXX: We should probably fan-out here and do a + // new queue item for each path 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) { + + // XXX: We should probably fan-out here and do a + // new queue item for each user/path combo + + 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 +293,6 @@ class RealtimePlugin extends Plugin ''); $action->elementEnd('address'); - if (common_logged_in()) { - $action->showNoticeForm(); - } - $action->showContentBlock(); $action->showScripts(); $action->elementEnd('body'); @@ -322,7 +385,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 +421,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() @@ -373,21 +441,40 @@ class RealtimePlugin extends Plugin return ''; } + function _getTimeline($action) { - $path = null; - $timeline = null; + $channel = $this->_getChannel($action); + if (empty($channel)) { + return null; + } + + return $this->_pathToChannel(array($channel->channel_key)); + } + function _getChannel($action) + { + $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 +483,31 @@ 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; + return null; } - if (!empty($path)) { - $timeline = $this->_pathToChannel($path); - } + $user = common_current_user(); + + $user_id = (!empty($user)) ? $user->id : null; + + $channel = Realtime_channel::getChannel($user_id, + $action_name, + $arg1, + $arg2); - return $timeline; + return $channel; + } + + function onStartReadWriteTables(&$alwaysRW, &$rwdb) + { + $alwaysRW[] = 'realtime_channel'; + return true; } }