Merge remote-tracking branch 'origin/master'

js/options.js

@@ -222,6 +222,9 @@ var TwisterOptions = function()
         $('#language').val( this.getOption('locLang', 'auto') );
         $('#language').on('change', function() {
             $.Options.setOption('locLang', $(this).val());
+            if($(this).val() != 'auto') {
+                twisterRpc("setpreferredspamlang", [$(this).val()]);
+            }
             location.reload();
         })
     }

js/twister_timeline.js

@@ -189,7 +189,6 @@ function showPosts(req, posts)
     var streamItemsParent = $.MAL.getStreamPostsParent();
 
     for( var i = 0; i < posts.length; i++ ) {
-        if (req.users.indexOf(posts[i]['userpost']['n']) > -1 || req.getspam) {  // FIXME maybe it's unecessary check but currently we got unwanted adverting posts which are coming with requested ones from 'getposts' sometimes
         var post = posts[i];
         //console.log(post);
         var streamPost = postToElem(post, "original", req.getspam);
@@ -228,7 +227,6 @@ function showPosts(req, posts)
         req.reportProcessedPost(post["userpost"]["n"],post["userpost"]["k"], streamPostAppended);
     }
 }
-}
 
 // request timeline update for a given list of users
 function requestTimelineUpdate(mode, count, timelineUsers, getspam)