Merge branch '0.9-release'

[quix0rs-gnu-social.git] / plugins / Meteor / meteorupdater.js

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 82594d91c75b7ab401235d42b50d67e475788369..cdd1d63fabb5f31adaea7da8e2af81b848e3d63b 100644 (file)
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -1,31 +1,20 @@
 // Update the local timeline from a Meteor server
-// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
-//      Do Replies timeline.
 
 var MeteorUpdater = function()
 {
-    return {
+     return {
 
-        init: function(server, port, timeline)
-        {
-            var screen_name;
+          init: function(server, port, timeline)
+          {
+               Meteor.callbacks["process"] = function(data) {
+                    RealtimeUpdate.receive(JSON.parse(data));
+               };
 
-            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);
-                }
-            };
-
-            Meteor.host = server;
-            Meteor.port = port;
-            Meteor.joinChannel(timeline, 0);
-            Meteor.connect();
-        }
-    }
+               Meteor.host = server;
+               Meteor.port = port;
+               Meteor.joinChannel(timeline, 0);
+               Meteor.connect();
+          }
+     }
 }();