From c4f9515c090b60ea5c9eaa801aa84fe57d36e5fb Mon Sep 17 00:00:00 2001
From: Nanobyte <nanobyte@ymail.com>
Date: Tue, 14 Jul 2020 18:15:23 +0200
Subject: [PATCH 1/3] Added  categoryStats for getTopUsers

---
 src/routes/getTopUsers.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/routes/getTopUsers.js b/src/routes/getTopUsers.js
index 8230b53..be4206a 100644
--- a/src/routes/getTopUsers.js
+++ b/src/routes/getTopUsers.js
@@ -2,6 +2,7 @@ var db = require('../databases/databases.js').db;
 
 module.exports = function getTopUsers (req, res) {
   let sortType = req.query.sortType;
+  let categoryStatsEnabled = req.query.categoryStats == undefined ? false : true;
 
   if (sortType == undefined) {
       //invalid request
@@ -27,9 +28,21 @@ module.exports = function getTopUsers (req, res) {
   let viewCounts = [];
   let totalSubmissions = [];
   let minutesSaved = [];
+  let categoryStats = [];
+  
+  let additionalFields = '';
+  if (categoryStatsEnabled) {
+    additionalFields += "SUM(CASE WHEN category = 'sponsor' THEN 1 ELSE 0 END) as categorySponsor, " +
+                        "SUM(CASE WHEN category = 'intro' THEN 1 ELSE 0 END) as categorySumIntro, " +
+                        "SUM(CASE WHEN category = 'outro' THEN 1 ELSE 0 END) as categorySumOutro, " +
+                        "SUM(CASE WHEN category = 'interaction' THEN 1 ELSE 0 END) as categorySumInteraction, " +
+                        "SUM(CASE WHEN category = 'selfpromo' THEN 1 ELSE 0 END) as categorySelfpromo, " +
+                        "SUM(CASE WHEN category = 'music_offtopic' THEN 1 ELSE 0 END) as categoryMusicOfftopic, ";
+  }
 
   let rows = db.prepare("SELECT COUNT(*) as totalSubmissions, SUM(views) as viewCount," + 
                   "SUM((sponsorTimes.endTime - sponsorTimes.startTime) / 60 * sponsorTimes.views) as minutesSaved, " +
+                  additionalFields +
                   "IFNULL(userNames.userName, sponsorTimes.userID) as userName FROM sponsorTimes LEFT JOIN userNames ON sponsorTimes.userID=userNames.userID " +
                   "WHERE sponsorTimes.votes > -1 AND sponsorTimes.shadowHidden != 1 GROUP BY IFNULL(userName, sponsorTimes.userID) ORDER BY " + sortBy + " DESC LIMIT 100").all();
   
@@ -39,6 +52,16 @@ module.exports = function getTopUsers (req, res) {
       viewCounts[i] = rows[i].viewCount;
       totalSubmissions[i] = rows[i].totalSubmissions;
       minutesSaved[i] = rows[i].minutesSaved;
+      if (categoryStatsEnabled) {
+        categoryStats[i] = [
+          rows[i].categorySponsor,
+          rows[i].categorySumInteraction,
+          rows[i].categorySumIntro,
+          rows[i].categorySumOutro,
+          rows[i].categorySelfpromo,
+          rows[i].categoryMusicOfftopic,
+        ];
+      }
   }
 
   //send this result
@@ -46,6 +69,7 @@ module.exports = function getTopUsers (req, res) {
       userNames: userNames,
       viewCounts: viewCounts,
       totalSubmissions: totalSubmissions,
-      minutesSaved: minutesSaved
+      minutesSaved: minutesSaved,
+      categoryStats: categoryStats
   });
 }
\ No newline at end of file

From 1823305a5ee885dfd57c6f39f72194b910c50323 Mon Sep 17 00:00:00 2001
From: Nanobyte <nanobyte@ymail.com>
Date: Thu, 16 Jul 2020 21:53:09 +0200
Subject: [PATCH 2/3] Fixed empty array for categoryStats in getTopUsers

---
 src/routes/getTopUsers.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/routes/getTopUsers.js b/src/routes/getTopUsers.js
index be4206a..81bf079 100644
--- a/src/routes/getTopUsers.js
+++ b/src/routes/getTopUsers.js
@@ -28,7 +28,7 @@ module.exports = function getTopUsers (req, res) {
   let viewCounts = [];
   let totalSubmissions = [];
   let minutesSaved = [];
-  let categoryStats = [];
+  let categoryStats = categoryStatsEnabled ? [] : undefined;
   
   let additionalFields = '';
   if (categoryStatsEnabled) {
@@ -66,10 +66,10 @@ module.exports = function getTopUsers (req, res) {
 
   //send this result
   res.send({
-      userNames: userNames,
-      viewCounts: viewCounts,
-      totalSubmissions: totalSubmissions,
-      minutesSaved: minutesSaved,
-      categoryStats: categoryStats
+      userNames,
+      viewCounts,
+      totalSubmissions,
+      minutesSaved,
+      categoryStats
   });
 }
\ No newline at end of file

From b41c633a54f2ff6f27a1b0e79c68a6fb3146fc21 Mon Sep 17 00:00:00 2001
From: Nanobyte <nanobyte@ymail.com>
Date: Fri, 17 Jul 2020 00:51:37 +0200
Subject: [PATCH 3/3] Simplified categoryStats query parameter

---
 src/routes/getTopUsers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/getTopUsers.js b/src/routes/getTopUsers.js
index 81bf079..62d5b07 100644
--- a/src/routes/getTopUsers.js
+++ b/src/routes/getTopUsers.js
@@ -2,7 +2,7 @@ var db = require('../databases/databases.js').db;
 
 module.exports = function getTopUsers (req, res) {
   let sortType = req.query.sortType;
-  let categoryStatsEnabled = req.query.categoryStats == undefined ? false : true;
+  let categoryStatsEnabled = req.query.categoryStats;
 
   if (sortType == undefined) {
       //invalid request