From cc953884d9f60fc402067d87c1a8e6da792ccabd Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Mon, 4 Jul 2022 01:10:52 -0400
Subject: [PATCH] Don't count chapter for time saved

---
 src/routes/getTopUsers.ts   | 2 +-
 src/routes/getTotalStats.ts | 2 +-
 src/routes/getUserStats.ts  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/getTopUsers.ts b/src/routes/getTopUsers.ts
index 282fea3..34d6bc5 100644
--- a/src/routes/getTopUsers.ts
+++ b/src/routes/getTopUsers.ts
@@ -34,7 +34,7 @@ async function generateTopUsersStats(sortBy: string, categoryStatsEnabled = fals
         SUM(((CASE WHEN "sponsorTimes"."endTime" - "sponsorTimes"."startTime" > ? THEN ? ELSE "sponsorTimes"."endTime" - "sponsorTimes"."startTime" END) / 60) * "sponsorTimes"."views") as "minutesSaved",
         SUM("votes") as "userVotes", ${additionalFields} COALESCE("userNames"."userName", "sponsorTimes"."userID") as "userName" FROM "sponsorTimes" LEFT JOIN "userNames" ON "sponsorTimes"."userID"="userNames"."userID"
         LEFT JOIN "shadowBannedUsers" ON "sponsorTimes"."userID"="shadowBannedUsers"."userID"
-        WHERE "sponsorTimes"."votes" > -1 AND "sponsorTimes"."shadowHidden" != 1 AND "shadowBannedUsers"."userID" IS NULL
+        WHERE "sponsorTimes"."votes" > -1 AND "sponsorTimes"."shadowHidden" != 1 AND "sponsorTimes"."actionType" != 'chapter' AND "shadowBannedUsers"."userID" IS NULL
         GROUP BY COALESCE("userName", "sponsorTimes"."userID") HAVING SUM("votes") > 20
         ORDER BY "${sortBy}" DESC LIMIT 100`, [maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds]);
 
diff --git a/src/routes/getTotalStats.ts b/src/routes/getTotalStats.ts
index df310ab..e001d5d 100644
--- a/src/routes/getTotalStats.ts
+++ b/src/routes/getTotalStats.ts
@@ -18,7 +18,7 @@ export async function getTotalStats(req: Request, res: Response): Promise<void>
     const userCountQuery = `(SELECT COUNT(*) FROM (SELECT DISTINCT "userID" from "sponsorTimes") t) "userCount",`;
 
     const row = await db.prepare("get", `SELECT ${req.query.countContributingUsers ? userCountQuery : ""} COUNT(*) as "totalSubmissions",
-        SUM("views") as "viewCount", SUM(("endTime" - "startTime") / 60 * "views") as "minutesSaved" FROM "sponsorTimes" WHERE "shadowHidden" != 1 AND "votes" >= 0`, []);
+        SUM("views") as "viewCount", SUM(("endTime" - "startTime") / 60 * "views") as "minutesSaved" FROM "sponsorTimes" WHERE "shadowHidden" != 1 AND "votes" >= 0 AND "actionType" != 'chapter'`, []);
 
     if (row !== undefined) {
         const extensionUsers = chromeUsersCache + firefoxUsersCache;
diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts
index 41040f0..8fca455 100644
--- a/src/routes/getUserStats.ts
+++ b/src/routes/getUserStats.ts
@@ -37,7 +37,7 @@ async function dbGetUserSummary(userID: HashedUserID, fetchCategoryStats: boolea
             ${additionalQuery}
             count(*) as "segmentCount"
             FROM "sponsorTimes"
-            WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" !=1`,
+            WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1 AND "actionType" != 'chapter'`,
         [maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds, userID]);
         const source = (row.minutesSaved != null) ? row : {};
         const handler = { get: (target: Record<string, any>, name: string) => target?.[name] || 0 };