From f6d6e93847acc2394571699b1a2b0a22aac5e59b Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Fri, 15 Oct 2021 00:14:59 -0400
Subject: [PATCH] Return locked and votes in skipSegment calls

#379
---
 src/routes/getSkipSegments.ts | 2 ++
 test/cases/getSkipSegments.ts | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/routes/getSkipSegments.ts b/src/routes/getSkipSegments.ts
index 7782fed..b1715a5 100644
--- a/src/routes/getSkipSegments.ts
+++ b/src/routes/getSkipSegments.ts
@@ -51,6 +51,8 @@ async function prepareCategorySegments(req: Request, videoID: VideoID, category:
         actionType: chosenSegment.actionType,
         segment: [chosenSegment.startTime, chosenSegment.endTime],
         UUID: chosenSegment.UUID,
+        locked: chosenSegment.locked,
+        votes: chosenSegment.votes,
         videoDuration: chosenSegment.videoDuration
     }));
 }
diff --git a/test/cases/getSkipSegments.ts b/test/cases/getSkipSegments.ts
index 63002f7..cbdf724 100644
--- a/test/cases/getSkipSegments.ts
+++ b/test/cases/getSkipSegments.ts
@@ -7,11 +7,11 @@ describe("getSkipSegments", () => {
     const endpoint = "/api/skipSegments";
     before(async () => {
         const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "actionType", "service", "videoDuration", "hidden", "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", query, ["getSkipSegmentID0", 1, 11, 2, 0, "uuid01", "testman", 0, 50, "sponsor", "skip", "YouTube", 100, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID0", 1, 11, 1, 0, "uuid01", "testman", 0, 50, "sponsor", "skip", "YouTube", 100, 0, 0]);
         await db.prepare("run", query, ["getSkipSegmentID0", 12, 14, 2, 0, "uuid02", "testman", 0, 50, "sponsor", "mute", "YouTube", 100, 0, 0]);
         await db.prepare("run", query, ["getSkipSegmentID0", 20, 33, 2, 0, "uuid03", "testman", 0, 50, "intro", "skip", "YouTube", 101, 0, 0]);
         await db.prepare("run", query, ["getSkipSegmentID1", 1, 11, 2, 0, "uuid10", "testman", 0, 50, "sponsor", "skip", "PeerTube", 120, 0, 0]);
-        await db.prepare("run", query, ["getSkipSegmentID2", 1, 11, 2, 0, "uuid20", "testman", 0, 50, "sponsor", "skip", "YouTube", 140, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID2", 1, 11, 2, 1, "uuid20", "testman", 0, 50, "sponsor", "skip", "YouTube", 140, 0, 0]);
         await db.prepare("run", query, ["getSkipSegmentID3", 1, 11, 2, 0, "uuid30", "testman", 0, 50, "sponsor", "skip", "YouTube", 200, 0, 0]);
         await db.prepare("run", query, ["getSkipSegmentID3", 7, 22, -3, 0, "uuid31", "testman", 0, 50, "sponsor", "skip", "YouTube", 300, 0, 0]);
         await db.prepare("run", query, ["getSkipSegmentMultiple", 1, 11, 2, 0, "uuid40", "testman", 0, 50, "intro", "skip", "YouTube", 400, 0, 0]);
@@ -36,6 +36,8 @@ describe("getSkipSegments", () => {
                 assert.strictEqual(data[0].segment[1], 11);
                 assert.strictEqual(data[0].category, "sponsor");
                 assert.strictEqual(data[0].UUID, "uuid01");
+                assert.strictEqual(data[0].votes, 1);
+                assert.strictEqual(data[0].locked, 0);
                 assert.strictEqual(data[0].videoDuration, 100);
                 done();
             })
@@ -283,6 +285,8 @@ describe("getSkipSegments", () => {
                     segment: [1, 11],
                     category: "sponsor",
                     UUID: "uuid20",
+                    votes: 2,
+                    locked: 1
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();