Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-08 20:47:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from ajayyy/experimental

Browse Source 
Merged same username users
This commit is contained in:
Ajay Ramachandran
2019-12-03 17:33:08 -05:00
committed by GitHub
parent c9988f1144 691d87d4ff
commit 3a9971ce8b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
index.js
View File

@@ -577,7 +577,7 @@ app.get('/api/getSavedTimeForUser', function (req, res) {
userID = getHash(userID); userID = getHash(userID);
//up the view count by one //up the view count by one
db.prepare("SELECT SUM((endTime - startTime) / 60 * views) as minutesSaved FROM sponsorTimes WHERE userID = ?").get(userID, function(err, row) { db.prepare("SELECT SUM((endTime - startTime) / 60 * views) as minutesSaved FROM sponsorTimes WHERE userID = ? AND votes > -1 AND shadowHidden != 1 ").get(userID, function(err, row) {
if (err) console.log(err); if (err) console.log(err);
if (row.minutesSaved != null) { if (row.minutesSaved != null) {
@@ -618,13 +618,12 @@ app.get('/api/getTopUsers', function (req, res) {
let totalSubmissions = []; let totalSubmissions = [];
let minutesSaved = []; let minutesSaved = [];
db.prepare("SELECT sponsorTimes.userID as userID, COUNT(*) as totalSubmissions, SUM(views) as viewCount, SUM((sponsorTimes.endTime - sponsorTimes.startTime) / 60 * sponsorTimes.views) as minutesSaved, userNames.userName as userName FROM sponsorTimes LEFT JOIN userNames ON sponsorTimes.userID=userNames.userID WHERE sponsorTimes.votes > -1 AND sponsorTimes.shadowHidden != 1 GROUP BY sponsorTimes.userID ORDER BY " + sortBy + " DESC LIMIT 100").all(function(err, rows) { db.prepare("SELECT COUNT(*) as totalSubmissions, SUM(views) as viewCount," +
"SUM((sponsorTimes.endTime - sponsorTimes.startTime) / 60 * sponsorTimes.views) as minutesSaved, " +
"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(function(err, rows) {
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
if (rows[i].userName != null) {
userNames[i] = rows[i].userName; userNames[i] = rows[i].userName;
} else {
userNames[i] = rows[i].userID;
}
viewCounts[i] = rows[i].viewCount; viewCounts[i] = rows[i].viewCount;
totalSubmissions[i] = rows[i].totalSubmissions; totalSubmissions[i] = rows[i].totalSubmissions;