Skip to content

Commit a8ddae1

Browse files
mchangrhmchangrh
committed
Merge branch 'master' of github.com:ajayyy/SponsorBlockServer into more-coverage
2 parents c34de1b + 54e53f0 commit a8ddae1

File tree

5 files changed

+60
-21
lines changed

5 files changed

+60
-21
lines changed

‎.github/workflows/generate-sqlite-base.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- master
77
paths:
88
- databases/**
9+
workflow_dispatch:
910

1011
jobs:
1112
make-base-db:
@@ -25,4 +26,13 @@ jobs:
2526
- uses: actions/upload-artifact@v2
2627
with:
2728
name: SponsorTimesDB.db
28-
path: databases/sponsorTimes.db
29+
path: databases/sponsorTimes.db
30+
- uses: mchangrh/s3cmd-sync@f4f36b9705bdd9af7ac91964136989ac17e3b513
31+
with:
32+
args: --acl-public
33+
env:
34+
S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
35+
S3_BUCKET: ${{ secrets.S3_BUCKET }}
36+
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
37+
S3_ACCESS_KEY_SECRET: ${{ secrets.S3_ACCESS_KEY_SECRET }}
38+
SOURCE_DIR: 'databases/sponsorTimes.db'

‎src/routes/getUserInfo.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const maxRewardTime = config.maxRewardTimePerSegmentInSeconds;
1414
async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> {
1515
try {
1616
const row = await db.prepare("get",
17-
`SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved",
17+
`SELECT SUM(CASE WHEN "actionType" = 'chapter' THEN 0 ELSE ((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views" END) as "minutesSaved",
1818
count(*) as "segmentCount" FROM "sponsorTimes"
1919
WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [maxRewardTime, maxRewardTime, userID], { useReplica: true });
2020
if (row.minutesSaved != null) {
@@ -200,4 +200,4 @@ export async function endpoint(req: Request, res: Response): Promise<Response> {
200200
return res.status(400).send("Invalid values JSON");
201201
} else return res.sendStatus(500);
202202
}
203-
}
203+
}

‎src/routes/getUserStats.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ async function dbGetUserSummary(userID: HashedUserID, fetchCategoryStats: boolea
2121
SUM(CASE WHEN "category" = 'poi_highlight' THEN 1 ELSE 0 END) as "categorySumHighlight",
2222
SUM(CASE WHEN "category" = 'filler' THEN 1 ELSE 0 END) as "categorySumFiller",
2323
SUM(CASE WHEN "category" = 'exclusive_access' THEN 1 ELSE 0 END) as "categorySumExclusiveAccess",
24+
SUM(CASE WHEN "category" = 'chapter' THEN 1 ELSE 0 END) as "categorySumChapter",
2425
`;
2526
}
2627
if (fetchActionTypeStats) {
@@ -29,15 +30,16 @@ async function dbGetUserSummary(userID: HashedUserID, fetchCategoryStats: boolea
2930
SUM(CASE WHEN "actionType" = 'mute' THEN 1 ELSE 0 END) as "typeSumMute",
3031
SUM(CASE WHEN "actionType" = 'full' THEN 1 ELSE 0 END) as "typeSumFull",
3132
SUM(CASE WHEN "actionType" = 'poi' THEN 1 ELSE 0 END) as "typeSumPoi",
33+
SUM(CASE WHEN "actionType" = 'chapter' THEN 1 ELSE 0 END) as "typeSumChapter",
3234
`;
3335
}
3436
try {
3537
const row = await db.prepare("get", `
36-
SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved",
38+
SELECT SUM(CASE WHEN "actionType" = 'chapter' THEN 0 ELSE ((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views" END) as "minutesSaved",
3739
${additionalQuery}
3840
count(*) as "segmentCount"
3941
FROM "sponsorTimes"
40-
WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1 AND "actionType" != 'chapter'`,
42+
WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`,
4143
[maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds, userID]);
4244
const source = (row.minutesSaved != null) ? row : {};
4345
const handler = { get: (target: Record<string, any>, name: string) => target?.[name] || 0 };
@@ -60,14 +62,16 @@ async function dbGetUserSummary(userID: HashedUserID, fetchCategoryStats: boolea
6062
poi_highlight: proxy.categorySumHighlight,
6163
filler: proxy.categorySumFiller,
6264
exclusive_access: proxy.categorySumExclusiveAccess,
65+
chapter: proxy.categorySumChapter,
6366
};
6467
}
6568
if (fetchActionTypeStats) {
6669
result.actionTypeCount = {
6770
skip: proxy.typeSumSkip,
6871
mute: proxy.typeSumMute,
6972
full: proxy.typeSumFull,
70-
poi: proxy.typeSumPoi
73+
poi: proxy.typeSumPoi,
74+
chapter: proxy.typeSumChapter,
7175
};
7276
}
7377
return result;

‎test/cases/getUserInfo.ts‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ describe("getUserInfo", () => {
1010
const insertUserNameQuery = 'INSERT INTO "userNames" ("userID", "userName") VALUES(?, ?)';
1111
await db.prepare("run", insertUserNameQuery, [getHash("getuserinfo_user_01"), "Username user 01"]);
1212

13-
const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
14-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000001", getHash("getuserinfo_user_01"), 1, 10, "sponsor", 0]);
15-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000002", getHash("getuserinfo_user_01"), 2, 10, "sponsor", 0]);
16-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo1", 1, 11, -1, "uuid000003", getHash("getuserinfo_user_01"), 3, 10, "sponsor", 0]);
17-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo1", 1, 11, -2, "uuid000004", getHash("getuserinfo_user_01"), 4, 10, "sponsor", 1]);
18-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo2", 1, 11, -5, "uuid000005", getHash("getuserinfo_user_01"), 5, 10, "sponsor", 1]);
19-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000007", getHash("getuserinfo_user_02"), 7, 10, "sponsor", 1]);
20-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000008", getHash("getuserinfo_user_02"), 8, 10, "sponsor", 1]);
21-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 0, 36000, 2,"uuid000009", getHash("getuserinfo_user_03"), 8, 10, "sponsor", 0]);
22-
await db.prepare("run", sponsorTimesQuery, ["getUserInfo3", 1, 11, 2, "uuid000006", getHash("getuserinfo_user_02"), 6, 10, "sponsor", 0]);
13+
const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "actionType", "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
14+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000001", getHash("getuserinfo_user_01"), 1, 10, "sponsor", "skip", 0]);
15+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000002", getHash("getuserinfo_user_01"), 2, 10, "sponsor", "skip", 0]);
16+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo1", 1, 11, -1, "uuid000003", getHash("getuserinfo_user_01"), 3, 10, "sponsor", "skip", 0]);
17+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo1", 1, 11, -2, "uuid000004", getHash("getuserinfo_user_01"), 4, 10, "sponsor", "skip", 1]);
18+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo2", 1, 11, -5, "uuid000005", getHash("getuserinfo_user_01"), 5, 10, "sponsor", "skip", 1]);
19+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000007", getHash("getuserinfo_user_02"), 7, 10, "sponsor", "skip", 1]);
20+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2, "uuid000008", getHash("getuserinfo_user_02"), 8, 10, "sponsor", "skip", 1]);
21+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 0, 36000, 2,"uuid000009", getHash("getuserinfo_user_03"), 8, 10, "sponsor", "skip", 0]);
22+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo3", 1, 11, 2, "uuid000006", getHash("getuserinfo_user_02"), 6, 10, "sponsor", "skip", 0]);
23+
await db.prepare("run", sponsorTimesQuery, ["getUserInfo4", 1, 11, 2, "uuid000010", getHash("getuserinfo_user_04"), 9, 10, "chapter", "chapter", 0]);
2324

2425

2526
const insertWarningQuery = 'INSERT INTO warnings ("userID", "issueTime", "issuerUserID", "enabled", "reason") VALUES (?, ?, ?, ?, ?)';
@@ -338,6 +339,29 @@ describe("getUserInfo", () => {
338339
};
339340
assert.ok(partialDeepEquals(res.data, expected));
340341
done(); // pass
342+
});
343+
});
344+
345+
it("Should ignore chapters for saved time calculations", (done) => {
346+
client.get(endpoint, { params: { userID: "getuserinfo_user_04" } })
347+
.then(res => {
348+
assert.strictEqual(res.status, 200);
349+
const expected = {
350+
userName: "f187933817e7b0211a3f6f7d542a63ca9cc289d6cc8a8a79669d69a313671ccf",
351+
userID: "f187933817e7b0211a3f6f7d542a63ca9cc289d6cc8a8a79669d69a313671ccf",
352+
minutesSaved: 0,
353+
viewCount: 10,
354+
ignoredViewCount: 0,
355+
segmentCount: 1,
356+
ignoredSegmentCount: 0,
357+
reputation: 0,
358+
lastSegmentID: "uuid000010",
359+
vip: false,
360+
warnings: 0,
361+
warningReason: ""
362+
};
363+
assert.deepStrictEqual(res.data, expected);
364+
done();
341365
})
342366
.catch(err => done(err));
343367
});

‎test/cases/getUserStats.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ describe("getUserStats", () => {
2222
await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, -2, "skip", "getuserstatsuuid9", getHash("getuserstats_user_02"), 8, 2, "sponsor", 0]);
2323
await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "skip", "getuserstatsuuid10", getHash("getuserstats_user_01"), 8, 2, "filler", 0]);
2424
await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 0, 0, "full", "getuserstatsuuid11", getHash("getuserstats_user_01"), 8, 2, "exclusive_access", 0]);
25-
26-
25+
await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "chapter", "getuserstatsuuid12", getHash("getuserstats_user_01"), 9, 2, "chapter", 0]);
2726
});
2827

2928
it("Should be able to get a 400 (No userID parameter)", (done) => {
@@ -52,17 +51,19 @@ describe("getUserStats", () => {
5251
music_offtopic: 1,
5352
poi_highlight: 1,
5453
filler: 1,
55-
exclusive_access: 1
54+
exclusive_access: 1,
55+
chapter: 1,
5656
},
5757
actionTypeCount: {
5858
mute: 0,
5959
skip: 8,
6060
full: 1,
61-
poi: 1
61+
poi: 1,
62+
chapter: 1,
6263
},
6364
overallStats: {
6465
minutesSaved: 30,
65-
segmentCount: 10
66+
segmentCount: 11
6667
}
6768
};
6869
assert.ok(partialDeepEquals(res.data, expected));

0 commit comments

Comments
 (0)