Merge pull request #425 from mradionov/hide-reposts-in-stream

fix #364: Hide reposts in stream
Soundnode · Oct 26, 2015 · d2402cb · d2402cb
2 parents 10abb6d + 322c20c
commit d2402cb
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/app/public/js/stream/streamCtrl.js b/app/public/js/stream/streamCtrl.js
@@ -2,7 +2,8 @@
 
 app.controller('StreamCtrl', function ($scope, SCapiService, $rootScope) {
     var endpoint = 'me/activities'
-        , params = 'limit=33';
+        , params = 'limit=33'
+        , tracksIds = [];
 
     $scope.title = 'Stream';
     $scope.data = '';
@@ -11,7 +12,8 @@ app.controller('StreamCtrl', function ($scope, SCapiService, $rootScope) {
 
     SCapiService.get(endpoint, params)
         .then(function(data) {
-            $scope.data = data.collection;
+            var tracks = filterTracks(data.collection);
+            $scope.data = tracks;
         }, function(error) {
             console.log('error', error);
         }).finally(function() {
@@ -35,10 +37,9 @@ app.controller('StreamCtrl', function ($scope, SCapiService, $rootScope) {
 
         SCapiService.getNextPage()
             .then(function(data) {
-                markLikedTracks(data);
-                for ( var i = 0; i < data.collection.length; i++ ) {
-                    $scope.data.push( data.collection[i] )
-                }
+                var tracks = filterTracks(data.collection);
+                markLikedTracks(tracks);
+                $scope.data = $scope.data.concat(tracks);
             }, function(error) {
                 console.log('error', error);
             }).finally(function(){
@@ -47,6 +48,18 @@ app.controller('StreamCtrl', function ($scope, SCapiService, $rootScope) {
             });
     };
 
+    function filterTracks(tracks) {
+        // Filter reposts: display only first appearance of track in stream
+        var result = tracks.filter(function (track) {
+            var exists = tracksIds.indexOf(track.origin.id) > -1;
+            if (!exists) {
+                tracksIds.push(track.origin.id);
+            }
+            return !exists;
+        });
+        return result;
+    }
+
     function markLikedTracks (tracks) {
         var tracksData = tracks.collection || tracks;
         for (var i = 0; i < tracksData.length; ++i) {