From afa5e6167a65b8ac5a8596b2c52970d11b6f4a85 Mon Sep 17 00:00:00 2001
From: Ubuntu <howardc93@gmail.com>
Date: Mon, 20 Jun 2016 00:54:20 +0000
Subject: [PATCH] remove userplayers

---
 store/buildSets.js | 14 --------------
 store/queries.js   |  9 +--------
 svc/scanner.js     |  8 +-------
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/store/buildSets.js b/store/buildSets.js
index fed99d429..2c3794d77 100644
--- a/store/buildSets.js
+++ b/store/buildSets.js
@@ -18,20 +18,6 @@ module.exports = function buildSets(db, redis, cb) {
                 cb(err, t);
             });
         },
-        //users in this set have their matches added
-        "userPlayers": function(cb) {
-            db.select(['account_id']).from('players').whereNotNull('last_login').asCallback(function(err, docs) {
-                if (err) {
-                    return cb(err);
-                }
-                var t = {};
-                docs.forEach(function(player) {
-                    t[player.account_id] = true;
-                });
-                //console.log(t);
-                cb(err, t);
-            });
-        },
         //users in this set are added to the trackedPlayers set
         "donators": function(cb) {
             db.select(['account_id']).from('players').where('cheese', '>', 0).asCallback(function(err, docs) {
diff --git a/store/queries.js b/store/queries.js
index 768a9af2f..49974199e 100644
--- a/store/queries.js
+++ b/store/queries.js
@@ -32,13 +32,6 @@ function getSets(redis, cb)
                 cb(err, JSON.parse(tps || "{}"));
             });
         },
-        "userPlayers": function(cb)
-        {
-            redis.get("userPlayers", function(err, ups)
-            {
-                cb(err, JSON.parse(ups || "{}"));
-            });
-        },
         "donators": function(cb)
         {
             redis.get("donators", function(err, ds)
@@ -426,7 +419,7 @@ function insertMatch(db, redis, match, options, cb)
     {
         async.each(match.players, function(p, cb)
         {
-            if (options.origin === "scanner" && match.lobby_type === 7 && p.account_id && p.account_id !== constants.anonymous_account_id && (p.account_id in options.userPlayers || (config.ENABLE_RANDOM_MMR_UPDATE && match.match_id % 3 === 0)))
+            if (options.origin === "scanner" && match.lobby_type === 7 && p.account_id && p.account_id !== constants.anonymous_account_id && config.ENABLE_RANDOM_MMR_UPDATE)
             {
                 addToQueue(mQueue,
                 {
diff --git a/svc/scanner.js b/svc/scanner.js
index ee8d86348..819db762d 100644
--- a/svc/scanner.js
+++ b/svc/scanner.js
@@ -13,7 +13,6 @@ var getData = utility.getData;
 var generateJob = utility.generateJob;
 var async = require('async');
 var trackedPlayers;
-var userPlayers;
 var parallelism = config.SCANNER_PARALLELISM;
 var PAGE_SIZE = 100;
 buildSets(db, redis, function(err)
@@ -72,7 +71,6 @@ function start()
             }
             //set local vars
             trackedPlayers = result.trackedPlayers;
-            userPlayers = result.userPlayers;
             var arr = [];
             var matchBuffer = {};
             var completePages = {};
@@ -122,10 +120,7 @@ function start()
                     insert = true;
                     skipParse = false;
                 }
-                else if (match.players.some(function(p)
-                    {
-                        return (config.ENABLE_INSERT_ALL_MATCHES || p.account_id in userPlayers);
-                    }))
+                else if (config.ENABLE_INSERT_ALL_MATCHES)
                 {
                     insert = true;
                 }
@@ -146,7 +141,6 @@ function start()
                             type: "api",
                             origin: "scanner",
                             cassandra: cassandra,
-                            userPlayers: userPlayers,
                             skipParse: skipParse,
                         }, function(err)
                         {