From 870ade6fa9abc44daad3e1c0a9d9bdef3a641f2e Mon Sep 17 00:00:00 2001 From: Michael C Date: Thu, 16 Sep 2021 20:44:12 -0400 Subject: [PATCH] postSkipSegments --- test/cases/postSkipSegments.ts | 491 +++++++++++++++------------------ test/utils.ts | 9 +- 2 files changed, 236 insertions(+), 264 deletions(-) diff --git a/test/cases/postSkipSegments.ts b/test/cases/postSkipSegments.ts index 0fef115..75ae64a 100644 --- a/test/cases/postSkipSegments.ts +++ b/test/cases/postSkipSegments.ts @@ -1,7 +1,7 @@ import fetch from "node-fetch"; import {config} from "../../src/config"; import {getHash} from "../../src/utils/getHash"; -import {Done, getbaseURL, partialDeepEquals} from "../utils"; +import {Done, getbaseURL, partialDeepEquals, postJSON} from "../utils"; import {db} from "../../src/databases/databases"; import {ImportMock} from "ts-mock-imports"; import * as YouTubeAPIModule from "../../src/utils/youtubeApi"; @@ -12,19 +12,40 @@ const mockManager = ImportMock.mockStaticClass(YouTubeAPIModule, "YouTubeAPI"); const sinonStub = mockManager.mock("listVideos"); sinonStub.callsFake(YouTubeApiMock.listVideos); +// Constant and helpers +const submitUserOne = `PostSkipUser1${".".repeat(18)}`; +const submitUserTwo = `PostSkipUser2${".".repeat(18)}`; +const submitUserThree = `PostSkipUser3${".".repeat(18)}`; + +const warnUser01 = "warn-user01-qwertyuiopasdfghjklzxcvbnm"; +const warnUser01Hash = getHash(warnUser01); +const warnUser02 = "warn-user02-qwertyuiopasdfghjklzxcvbnm"; +const warnUser02Hash = getHash(warnUser02); +const warnUser03 = "warn-user03-qwertyuiopasdfghjklzxcvbnm"; +const warnUser03Hash = getHash(warnUser03); +const warnUser04 = "warn-user04-qwertyuiopasdfghjklzxcvbnm"; +const warnUser04Hash = getHash(warnUser04); + +const submitUserOneHash = getHash(submitUserOne); +const submitVIPuser = `VIPPostSkipUser${".".repeat(16)}`; +const warnVideoID = "dQw4w9WgXcF"; +const badInputVideoID = "dQw4w9WgXcQ"; + +const queryDatabase = async (videoID: string) => await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID]); +const queryDatabaseActionType = async(videoID: string) => await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "actionType" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID]); +const queryDatabaseDuration = async (videoID: string) => await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID]); + +const endpoint = `${getbaseURL()}/api/skipSegments`; + describe("postSkipSegments", () => { before(() => { const insertSponsorTimeQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'; - db.prepare("run", insertSponsorTimeQuery, ["80percent_video", 0, 1000, 0, "80percent-uuid-0", getHash("testtesttesttesttesttesttesttesttest"), 0, 0, "interaction", 0, "80percent_video"]); - db.prepare("run", insertSponsorTimeQuery, ["80percent_video", 1001, 1005, 0, "80percent-uuid-1", getHash("testtesttesttesttesttesttesttesttest"), 0, 0, "interaction", 0, "80percent_video"]); - db.prepare("run", insertSponsorTimeQuery, ["80percent_video", 0, 5000, -2, "80percent-uuid-2", getHash("testtesttesttesttesttesttesttesttest"), 0, 0, "interaction", 0, "80percent_video"]); + db.prepare("run", insertSponsorTimeQuery, ["80percent_video", 0, 1000, 0, "80percent-uuid-0", submitUserOneHash, 0, 0, "interaction", 0, "80percent_video"]); + db.prepare("run", insertSponsorTimeQuery, ["80percent_video", 1001, 1005, 0, "80percent-uuid-1", submitUserOneHash, 0, 0, "interaction", 0, "80percent_video"]); + db.prepare("run", insertSponsorTimeQuery, ["80percent_video", 0, 5000, -2, "80percent-uuid-2", submitUserOneHash, 0, 0, "interaction", 0, "80percent_video"]); const now = Date.now(); const warnVip01Hash = getHash("warn-vip01-qwertyuiopasdfghjklzxcvbnm"); - const warnUser01Hash = getHash("warn-user01-qwertyuiopasdfghjklzxcvbnm"); - const warnUser02Hash = getHash("warn-user02-qwertyuiopasdfghjklzxcvbnm"); - const warnUser03Hash = getHash("warn-user03-qwertyuiopasdfghjklzxcvbnm"); - const warnUser04Hash = getHash("warn-user04-qwertyuiopasdfghjklzxcvbnm"); const reason01 = "Reason01"; const reason02 = ""; const reason03 = "Reason03"; @@ -32,39 +53,40 @@ describe("postSkipSegments", () => { const MILLISECONDS_IN_HOUR = 3600000; const warningExpireTime = MILLISECONDS_IN_HOUR * config.hoursAfterWarningExpires; - const insertWarningQuery = 'INSERT INTO warnings ("userID", "issueTime", "issuerUserID", "enabled", "reason") VALUES(?, ?, ?, ?, ?)'; - db.prepare("run", insertWarningQuery, [warnUser01Hash, now, warnVip01Hash, 1, reason01]); - db.prepare("run", insertWarningQuery, [warnUser01Hash, (now - 1000), warnVip01Hash, 1, reason01]); - db.prepare("run", insertWarningQuery, [warnUser01Hash, (now - 2000), warnVip01Hash, 1, reason01]); - db.prepare("run", insertWarningQuery, [warnUser01Hash, (now - 3601000), warnVip01Hash, 1, reason01]); - db.prepare("run", insertWarningQuery, [warnUser02Hash, now, warnVip01Hash, 1, reason02]); - db.prepare("run", insertWarningQuery, [warnUser02Hash, now, warnVip01Hash, 1, reason02]); - db.prepare("run", insertWarningQuery, [warnUser02Hash, (now - (warningExpireTime + 1000)), warnVip01Hash, 1, reason02]); - db.prepare("run", insertWarningQuery, [warnUser02Hash, (now - (warningExpireTime + 2000)), warnVip01Hash, 1, reason02]); - db.prepare("run", insertWarningQuery, [warnUser03Hash, now, warnVip01Hash, 0, reason03]); - db.prepare("run", insertWarningQuery, [warnUser03Hash, (now - 1000), warnVip01Hash, 0, reason03]); - db.prepare("run", insertWarningQuery, [warnUser03Hash, (now - 2000), warnVip01Hash, 1, reason03]); - db.prepare("run", insertWarningQuery, [warnUser03Hash, (now - 3601000), warnVip01Hash, 1, reason03]); - db.prepare("run", insertWarningQuery, [warnUser04Hash, now, warnVip01Hash, 0, reason04]); - db.prepare("run", insertWarningQuery, [warnUser04Hash, (now - 1000), warnVip01Hash, 0, reason04]); - db.prepare("run", insertWarningQuery, [warnUser04Hash, (now - 2000), warnVip01Hash, 1, reason04]); - db.prepare("run", insertWarningQuery, [warnUser04Hash, (now - 3601000), warnVip01Hash, 1, reason04]); + const insertWarningQuery = 'INSERT INTO warnings ("userID", "issuerUserID", "enabled", "reason", issueTime) VALUES(?, ?, ?, ?, ?)'; + // User 1 + db.prepare("run", insertWarningQuery, [warnUser01Hash, warnVip01Hash, 1, reason01, now]); + db.prepare("run", insertWarningQuery, [warnUser01Hash, warnVip01Hash, 1, reason01, (now - 1000)]); + db.prepare("run", insertWarningQuery, [warnUser01Hash, warnVip01Hash, 1, reason01, (now - 2000)]); + db.prepare("run", insertWarningQuery, [warnUser01Hash, warnVip01Hash, 1, reason01, (now - 3601000)]); + // User 2 + db.prepare("run", insertWarningQuery, [warnUser02Hash, warnVip01Hash, 1, reason02, now]); + db.prepare("run", insertWarningQuery, [warnUser02Hash, warnVip01Hash, 1, reason02, now]); + db.prepare("run", insertWarningQuery, [warnUser02Hash, warnVip01Hash, 1, reason02, (now - (warningExpireTime + 1000))]); + db.prepare("run", insertWarningQuery, [warnUser02Hash, warnVip01Hash, 1, reason02, (now - (warningExpireTime + 2000))]); + // User 3 + db.prepare("run", insertWarningQuery, [warnUser03Hash, warnVip01Hash, 0, reason03, now]); + db.prepare("run", insertWarningQuery, [warnUser03Hash, warnVip01Hash, 0, reason03, (now - 1000)]); + db.prepare("run", insertWarningQuery, [warnUser03Hash, warnVip01Hash, 1, reason03, (now - 2000)]); + db.prepare("run", insertWarningQuery, [warnUser03Hash, warnVip01Hash, 1, reason03, (now - 3601000)]); + // User 4 + db.prepare("run", insertWarningQuery, [warnUser04Hash, warnVip01Hash, 0, reason04, now]); + db.prepare("run", insertWarningQuery, [warnUser04Hash, warnVip01Hash, 0, reason04, (now - 1000)]); + db.prepare("run", insertWarningQuery, [warnUser04Hash, warnVip01Hash, 1, reason04, (now - 2000)]); + db.prepare("run", insertWarningQuery, [warnUser04Hash, warnVip01Hash, 1, reason04, (now - 3601000)]); const insertVipUserQuery = 'INSERT INTO "vipUsers" ("userID") VALUES (?)'; - db.prepare("run", insertVipUserQuery, [getHash("VIPUserSubmissionVIPUserSubmissionVIPUserSubmission")]); + db.prepare("run", insertVipUserQuery, [getHash(submitVIPuser)]); }); it("Should be able to submit a single time (Params method)", (done: Done) => { - fetch(`${getbaseURL() - }/api/postVideoSponsorTimes?videoID=dQw4w9WgXcR&startTime=2&endTime=10&userID=testtesttesttesttesttesttesttesttest&category=sponsor`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXcR"; + fetch(`${endpoint}?videoID=${videoID}&startTime=2&endTime=10&userID=${submitUserOne}&category=sponsor`, { + method: "POST" }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcR"]); + const row = await queryDatabase(videoID); const expected = { startTime: 2, endTime: 10, @@ -77,14 +99,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit a single time (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXcF"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcF", + userID: submitUserOne, + videoID, segments: [{ segment: [0, 10], category: "sponsor", @@ -93,7 +113,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcF"]); + const row = await queryDatabase(videoID); const expected = { startTime: 0, endTime: 10, @@ -107,14 +127,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit a single time with an action type (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXcV"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcV", + userID: submitUserOne, + videoID, segments: [{ segment: [0, 10], category: "sponsor", @@ -124,7 +142,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "actionType" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcV"]); + const row = await queryDatabaseActionType(videoID); const expected = { startTime: 0, endTime: 10, @@ -138,14 +156,12 @@ describe("postSkipSegments", () => { }); it("Should not be able to submit an intro with mute action type (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXpQ"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXpQ", + userID: submitUserOne, + videoID, segments: [{ segment: [0, 10], category: "intro", @@ -155,7 +171,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 400); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "actionType" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXpQ"]); + const row = await queryDatabaseActionType(videoID); assert.strictEqual(row, undefined); done(); }) @@ -163,14 +179,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit a single time with a duration from the YouTube API (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXZX"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXZX", + userID: submitUserOne, + videoID, videoDuration: 100, segments: [{ segment: [0, 10], @@ -180,7 +194,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXZX"]); + const row = await queryDatabaseDuration(videoID); const expected = { startTime: 0, endTime: 10, @@ -194,14 +208,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit a single time with a precise duration close to the one from the YouTube API (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXZH"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXZH", + userID: submitUserOne, + videoID, videoDuration: 4980.20, segments: [{ segment: [1, 10], @@ -211,7 +223,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXZH"]); + const row = await queryDatabaseDuration(videoID); const expected = { startTime: 1, endTime: 10, @@ -226,14 +238,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit a single time with a duration in the body (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "noDuration"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "noDuration", + userID: submitUserOne, + videoID, videoDuration: 100, segments: [{ segment: [0, 10], @@ -243,7 +253,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["noDuration"]); + const row = await queryDatabaseDuration(videoID); const expected = { startTime: 0, endTime: 10, @@ -258,18 +268,16 @@ describe("postSkipSegments", () => { }); it("Should be able to submit with a new duration, and hide old submissions and remove segment locks", async () => { + const videoID = "noDuration"; await db.prepare("run", `INSERT INTO "lockCategories" ("userID", "videoID", "category") - VALUES(?, ?, ?)`, [getHash("VIPUser-lockCategories"), "noDuration", "sponsor"]); + VALUES(?, ?, ?)`, [getHash("VIPUser-lockCategories"), videoID, "sponsor"]); try { - const res = await fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const res = await fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "noDuration", + userID: submitUserOne, + videoID, videoDuration: 100, segments: [{ segment: [1, 10], @@ -278,11 +286,11 @@ describe("postSkipSegments", () => { }), }); assert.strictEqual(res.status, 200); - const lockCategoriesRow = await db.prepare("get", `SELECT * from "lockCategories" WHERE videoID = ?`, ["noDuration"]); + const lockCategoriesRow = await db.prepare("get", `SELECT * from "lockCategories" WHERE videoID = ?`, [videoID]); const videoRows = await db.prepare("all", `SELECT "startTime", "endTime", "locked", "category", "videoDuration" - FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 0`, ["noDuration"]); + FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 0`, [videoID]); const hiddenVideoRows = await db.prepare("all", `SELECT "startTime", "endTime", "locked", "category", "videoDuration" - FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 1`, ["noDuration"]); + FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 1`, [videoID]); assert.ok(!lockCategoriesRow); const expected = { startTime: 1, @@ -300,8 +308,8 @@ describe("postSkipSegments", () => { }); it("Should still not be allowed if youtube thinks duration is 0", (done: Done) => { - fetch(`${getbaseURL() - }/api/postVideoSponsorTimes?videoID=noDuration&startTime=30&endTime=10000&userID=testtesttesttesttesttesttesttesttesting`, { + const videoID= "noDuration"; + fetch(`${endpoint}?videoID=${videoID}&startTime=30&endTime=10000&userID=${submitUserThree}&category=sponsor`, { method: "POST", }) .then(async res => { @@ -312,14 +320,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit a single time under a different service (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXcG"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcG", + userID: submitUserOne, + videoID, service: "PeerTube", segments: [{ segment: [0, 10], @@ -329,7 +335,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "service" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcG"]); + const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category", "service" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID]); const expected = { startTime: 0, endTime: 10, @@ -344,14 +350,12 @@ describe("postSkipSegments", () => { }); it("VIP submission should start locked", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "vipuserIDSubmission"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "VIPUserSubmissionVIPUserSubmissionVIPUserSubmission", - videoID: "vipuserIDSubmission", + userID: submitVIPuser, + videoID, segments: [{ segment: [0, 10], category: "sponsor", @@ -360,7 +364,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["vipuserIDSubmission"]); + const row = await queryDatabase(videoID); const expected = { startTime: 0, endTime: 10, @@ -374,14 +378,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit multiple times (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "dQw4w9WgXcT"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcT", + userID: submitUserOne, + videoID, segments: [{ segment: [3, 10], category: "sponsor", @@ -393,7 +395,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcT"]); + const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID]); const expected = [{ startTime: 3, endTime: 10, @@ -410,14 +412,12 @@ describe("postSkipSegments", () => { }).timeout(5000); it("Should allow multiple times if total is under 80% of video(JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "L_jWHffIx5E"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "L_jWHffIx5E", + userID: submitUserOne, + videoID, segments: [{ segment: [3, 3000], category: "sponsor", @@ -435,7 +435,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["L_jWHffIx5E"]); + const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, [videoID]); const expected = [{ startTime: 3, endTime: 3000, @@ -460,14 +460,12 @@ describe("postSkipSegments", () => { }).timeout(5000); it("Should reject multiple times if total is over 80% of video (JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "n9rIGdXnSJc"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "n9rIGdXnSJc", + userID: submitUserOne, + videoID, segments: [{ segment: [0, 2000], category: "interaction", @@ -485,7 +483,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 403); - const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["n9rIGdXnSJc"]); + const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, [videoID]); assert.deepStrictEqual(rows, []); done(); }) @@ -493,14 +491,12 @@ describe("postSkipSegments", () => { }).timeout(5000); it("Should reject multiple times if total is over 80% of video including previosuly submitted times(JSON method)", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const videoID = "80percent_video"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "80percent_video", + userID: submitUserOne, + videoID, segments: [{ segment: [2000, 4000], category: "sponsor", @@ -528,7 +524,7 @@ describe("postSkipSegments", () => { startTime: 4050, endTime: 4750 }]; - const rows = await db.prepare("all", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["80percent_video"]); + const rows = await queryDatabase(videoID); assert.notDeepStrictEqual(rows, expected); done(); }) @@ -536,8 +532,8 @@ describe("postSkipSegments", () => { }).timeout(5000); it("Should be accepted if a non-sponsor is less than 1 second", (done: Done) => { - fetch(`${getbaseURL() - }/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30.5&userID=testtesttesttesttesttesttesttesttesting&category=intro`, { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=30&endTime=30.5&userID=${submitUserTwo}&category=intro`, { method: "POST", }) .then(res => { @@ -548,8 +544,8 @@ describe("postSkipSegments", () => { }); it("Should be rejected if segment starts and ends at the same time", (done: Done) => { - fetch(`${getbaseURL() - }/api/skipSegments?videoID=qqwerty&startTime=90&endTime=90&userID=testtesttesttesttesttesttesttesttesting&category=intro`, { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=90&endTime=90&userID=${submitUserTwo}&category=intro`, { method: "POST", }) .then(res => { @@ -560,8 +556,8 @@ describe("postSkipSegments", () => { }); it("Should be accepted if highlight segment starts and ends at the same time", (done: Done) => { - fetch(`${getbaseURL() - }/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30&userID=testtesttesttesttesttesttesttesttesting&category=poi_highlight`, { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=30&endTime=30&userID=${submitUserTwo}&category=poi_highlight`, { method: "POST", }) .then(res => { @@ -572,8 +568,8 @@ describe("postSkipSegments", () => { }); it("Should be rejected if highlight segment doesn't start and end at the same time", (done: Done) => { - fetch(`${getbaseURL() - }/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30.5&userID=testtesttesttesttesttesttesttesttesting&category=poi_highlight`, { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=30&endTime=30.5&userID=${submitUserTwo}&category=poi_highlight`, { method: "POST", }) .then(res => { @@ -584,8 +580,8 @@ describe("postSkipSegments", () => { }); it("Should be rejected if a sponsor is less than 1 second", (done: Done) => { - fetch(`${getbaseURL() - }/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30.5&userID=testtesttesttesttesttesttesttesttesting`, { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=30&endTime=30.5&userID=${submitUserTwo}`, { method: "POST", }) .then(res => { @@ -596,34 +592,37 @@ describe("postSkipSegments", () => { }); it("Should be rejected if over 80% of the video", (done: Done) => { - fetch(`${getbaseURL() - }/api/postVideoSponsorTimes?videoID=qqwerty&startTime=30&endTime=1000000&userID=testtesttesttesttesttesttesttesttesting`) - .then(res => { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=30&endTime=1000000&userID=${submitUserTwo}&category=sponsor`, { + method: "POST", + }) + .then( async res => { assert.strictEqual(res.status, 403); + console.log(res.text()); done(); }) .catch(err => done(err)); }); it("Should be rejected if NB's predicted probability is <70%.", (done: Done) => { - fetch(`${getbaseURL() - }/api/postVideoSponsorTimes?videoID=LevkAjUE6d4&startTime=40&endTime=60&userID=testtesttesttesttesttesttesttesttesting`) - .then(res => { + const videoID = "LevkAjUE6d4"; + fetch(`${endpoint}?videoID=${videoID}&startTime=40&endTime=60&userID=${submitUserTwo}&category=sponsor`, { + method: "POST", + }) + .then(async res => { assert.strictEqual(res.status, 200); + console.log(res.text()); done(); }) .catch(err => done(err)); }); it("Should be rejected with custom message if user has to many active warnings", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "warn-user01-qwertyuiopasdfghjklzxcvbnm", - videoID: "dQw4w9WgXcF", + userID: warnUser01, + videoID: warnVideoID, segments: [{ segment: [0, 10], category: "sponsor", @@ -634,11 +633,10 @@ describe("postSkipSegments", () => { assert.strictEqual(res.status, 403); const errorMessage = await res.text(); const reason = "Reason01"; - const userID = "09dee632bfbb1acc9fda3169cc14b46e459b45cee4f4449be305590e612b5eb7"; const expected = "Submission rejected due to a warning from a moderator. This means that we noticed you were making some common mistakes" + " that are not malicious, and we just want to clarify the rules. " + "Could you please send a message in discord.gg/SponsorBlock or matrix.to/#/#sponsor:ajay.app so we can further help you? " - + `Your userID is ${userID}.\n\nWarning reason: '${reason}'`; + + `Your userID is ${warnUser01Hash}.\n\nWarning reason: '${reason}'`; assert.strictEqual(errorMessage, expected); done(); @@ -647,14 +645,11 @@ describe("postSkipSegments", () => { }); it("Should be accepted if user has some active warnings", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "warn-user02-qwertyuiopasdfghjklzxcvbnm", - videoID: "dQw4w9WgXcF", + userID: warnUser02, + videoID: warnVideoID, segments: [{ segment: [50, 60], category: "sponsor", @@ -673,14 +668,11 @@ describe("postSkipSegments", () => { }); it("Should be accepted if user has some warnings removed", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "warn-user03-qwertyuiopasdfghjklzxcvbnm", - videoID: "dQw4w9WgXcF", + userID: warnUser03, + videoID: warnVideoID, segments: [{ segment: [53, 60], category: "sponsor", @@ -699,8 +691,7 @@ describe("postSkipSegments", () => { }); it("Should return 400 for missing params (Params method)", (done: Done) => { - fetch(`${getbaseURL() - }/api/postVideoSponsorTimes?startTime=9&endTime=10&userID=testtesttesttesttesttesttesttesttest`, { + fetch(`${endpoint}?startTime=9&endTime=10&userID=${submitUserOne}`, { method: "POST", }) .then(async res => { @@ -711,14 +702,11 @@ describe("postSkipSegments", () => { }); it("Should be rejected with default message if user has to many active warnings", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "warn-user01-qwertyuiopasdfghjklzxcvbnm", - videoID: "dQw4w9WgXcF", + userID: warnUser01, + videoID: warnVideoID, segments: [{ segment: [0, 10], category: "sponsor", @@ -735,13 +723,10 @@ describe("postSkipSegments", () => { }); it("Should return 400 for missing params (JSON method) 1", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", + userID: submitUserOne, segments: [{ segment: [9, 10], category: "sponsor", @@ -758,14 +743,11 @@ describe("postSkipSegments", () => { .catch(err => done(err)); }); it("Should return 400 for missing params (JSON method) 2", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcQ", + userID: submitUserOne, + videoID: badInputVideoID, }), }) .then(res => { @@ -775,14 +757,11 @@ describe("postSkipSegments", () => { .catch(err => done(err)); }); it("Should return 400 for missing params (JSON method) 3", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcQ", + userID: submitUserOne, + videoID: badInputVideoID, segments: [{ segment: [0], category: "sponsor", @@ -799,14 +778,11 @@ describe("postSkipSegments", () => { .catch(err => done(err)); }); it("Should return 400 for missing params (JSON method) 4", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcQ", + userID: submitUserOne, + videoID: badInputVideoID, segments: [{ segment: [9, 10], }, { @@ -822,14 +798,11 @@ describe("postSkipSegments", () => { .catch(err => done(err)); }); it("Should return 400 for missing params (JSON method) 5", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcQ", + userID: submitUserOne, + videoID: badInputVideoID, }), }) .then(res => { @@ -840,18 +813,16 @@ describe("postSkipSegments", () => { }); it("Should return 403 and custom reason for submiting in lockedCategory", async () => { + const videoID = "lockedVideo"; await db.prepare("run", `INSERT INTO "lockCategories" ("userID", "videoID", "category", "reason") - VALUES(?, ?, ?, ?)`, [getHash("VIPUser-lockCategories"), "lockedVideo", "sponsor", "Custom Reason"]); + VALUES(?, ?, ?, ?)`, [getHash("VIPUser-lockCategories"), videoID, "sponsor", "Custom Reason"]); try { - const res = await fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const res = await fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "lockedVideo", + userID: submitUserOne, + videoID, segments: [{ segment: [1, 10], category: "sponsor", @@ -868,18 +839,16 @@ describe("postSkipSegments", () => { }); it("Should return 403 for submiting in lockedCategory", async () => { + const videoID = "lockedVideo1"; await db.prepare("run", `INSERT INTO "lockCategories" ("userID", "videoID", "category", "reason") - VALUES(?, ?, ?, ?)`, [getHash("VIPUser-lockCategories"), "lockedVideo1", "intro", ""]); + VALUES(?, ?, ?, ?)`, [getHash("VIPUser-lockCategories"), videoID, "intro", ""]); try { - const res = await fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, + const res = await fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "lockedVideo1", + userID: submitUserOne, + videoID, segments: [{ segment: [1, 10], category: "intro", @@ -896,14 +865,14 @@ describe("postSkipSegments", () => { }).timeout(5000); it("Should be able to submit with custom user-agent 1", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { + fetch(endpoint, { method: "POST", headers: { "Content-Type": "application/json", "User-Agent": "com.google.android.youtube/5.0" }, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", + userID: submitUserOne, videoID: "userAgent-1", segments: [{ segment: [0, 10], @@ -926,14 +895,14 @@ describe("postSkipSegments", () => { }); it("Should be able to submit with empty user-agent", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { + fetch(endpoint, { method: "POST", headers: { "Content-Type": "application/json", "User-Agent": "" }, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", + userID: submitUserOne, videoID: "userAgent-3", segments: [{ segment: [0, 10], @@ -956,13 +925,13 @@ describe("postSkipSegments", () => { }); it("Should be able to submit with custom userAgent in body", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { + fetch(endpoint, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", + userID: submitUserOne, videoID: "userAgent-4", segments: [{ segment: [0, 10], @@ -986,14 +955,12 @@ describe("postSkipSegments", () => { }); it("Should be able to submit with commas in timestamps", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json" - }, + const videoID = "commas-1"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "commas-1", + userID: submitUserOne, + videoID, segments: [{ segment: ["0,2", "10,392"], category: "sponsor", @@ -1002,7 +969,7 @@ describe("postSkipSegments", () => { }) .then(async res => { assert.strictEqual(res.status, 200); - const row = await db.prepare("get", `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["commas-1"]); + const row = await queryDatabase(videoID); const expected = { startTime: 0.2, endTime: 10.392 @@ -1014,8 +981,8 @@ describe("postSkipSegments", () => { }); it("Should be rejected if a POI is at less than 1 second", (done: Done) => { - fetch(`${getbaseURL() - }/api/skipSegments?videoID=qqwerty&startTime=0.5&endTime=0.5&category=poi_highlight&userID=testtesttesttesttesttesttesttesttesting`, { + const videoID = "qqwerty"; + fetch(`${endpoint}?videoID=${videoID}&startTime=0.5&endTime=0.5&category=poi_highlight&userID=${submitUserTwo}`, { method: "POST", }) .then(res => { @@ -1026,14 +993,12 @@ describe("postSkipSegments", () => { }); it("Should not be able to submit with colons in timestamps", (done: Done) => { - fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, { - method: "POST", - headers: { - "Content-Type": "application/json" - }, + const videoID = "colon-1"; + fetch(endpoint, { + ...postJSON, body: JSON.stringify({ - userID: "testtesttesttesttesttesttesttesttest", - videoID: "colon-1", + userID: submitUserOne, + videoID, segments: [{ segment: ["0:2.000", "3:10.392"], category: "sponsor", diff --git a/test/utils.ts b/test/utils.ts index 3636151..6bebf00 100644 --- a/test/utils.ts +++ b/test/utils.ts @@ -37,4 +37,11 @@ export const partialDeepEquals = (actual: Record, expected: Record< function printActualExpected(actual: Record, expected: Record): void { Logger.error(`Actual: ${JSON.stringify(actual)}`); Logger.error(`Expected: ${JSON.stringify(expected)}`); -} \ No newline at end of file +} + +export const postJSON = { + method: "POST", + headers: { + "Content-Type": "application/json", + }, +}; \ No newline at end of file