diff options
| -rw-r--r-- | plugins/Meteor/meteorupdater.js | 11 | ||||
| -rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 34 |
2 files changed, 16 insertions, 29 deletions
diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js index de01d430a..9ce68775b 100644 --- a/plugins/Meteor/meteorupdater.js +++ b/plugins/Meteor/meteorupdater.js @@ -8,17 +8,8 @@ var MeteorUpdater = function() init: function(server, port, timeline) { - var screen_name; - Meteor.callbacks["process"] = function(data) { - var d = JSON.parse(data); - screen_name = d['user']['screen_name']; - - if (timeline == 'public' || - $('address .url')[0].href+screen_name+'/all' == window.location.href || - $('address .url')[0].href+screen_name == window.location.href) { - RealtimeUpdate.receive(d); - } + RealtimeUpdate.receive(JSON.parse(data)); }; Meteor.host = server; diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 611b1d86c..454882261 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -63,22 +63,20 @@ class RealtimePlugin extends Plugin { $path = null; - $a = $action->trimmed('action'); - - switch ($a) { - case 'public': case 'all': case 'replies': case 'showstream': - $path = array($a); - break; - case 'tag': - $tag = $action->trimmed('tag'); - if (!empty($tag)) { - $path = array('tag', $tag); - } else { - return true; - } - break; - default: + switch ($action->trimmed('action')) { + case 'public': + $path = array('public'); + break; + case 'tag': + $tag = $action->trimmed('tag'); + if (!empty($tag)) { + $path = array('tag', $tag); + } else { return true; + } + break; + default: + return true; } $timeline = $this->_pathToChannel($path); @@ -116,13 +114,11 @@ class RealtimePlugin extends Plugin { $paths = array(); - // TODO: Replies timeline + // XXX: Add other timelines; this is just for the public one if ($notice->is_local || ($notice->is_local == 0 && !common_config('public', 'localonly'))) { - foreach (array('public', 'all', 'replies', 'showstream') as $a) { - $paths[] = array($a); - } + $paths[] = array('public'); } $tags = $this->getNoticeTags($notice); |