From c0c2b365ae1b18cbb14ccdeae3a3830175b1cd5f Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Thu, 6 Jan 2022 15:17:21 -0500
Subject: [PATCH] Fix full video different category duplicate error

---
 src/routes/postSkipSegments.ts | 4 ++--
 src/utils/getSubmissionUUID.ts | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts
index 64e27ff..50c527e 100644
--- a/src/routes/postSkipSegments.ts
+++ b/src/routes/postSkipSegments.ts
@@ -239,7 +239,7 @@ async function autoModerateSubmission(apiVideoInfo: APIVideoInfo,
                     const startTime = parseFloat(segments[i].segment[0]);
                     const endTime = parseFloat(segments[i].segment[1]);
 
-                    const UUID = getSubmissionUUID(submission.videoID, segments[i].actionType, submission.userID, startTime, endTime, submission.service);
+                    const UUID = getSubmissionUUID(submission.videoID, segments[i].category, segments[i].actionType, submission.userID, startTime, endTime, submission.service);
                     // Send to Discord
                     // Note, if this is too spammy. Consider sending all the segments as one Webhook
                     sendWebhooksNB(submission.userID, submission.videoID, UUID, startTime, endTime, segments[i].category, nbPredictions.probabilities[predictionIdx], data);
@@ -654,7 +654,7 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
             //this can just be a hash of the data
             //it's better than generating an actual UUID like what was used before
             //also better for duplication checking
-            const UUID = getSubmissionUUID(videoID, segmentInfo.actionType, userID, parseFloat(segmentInfo.segment[0]), parseFloat(segmentInfo.segment[1]), service);
+            const UUID = getSubmissionUUID(videoID, segmentInfo.category, segmentInfo.actionType, userID, parseFloat(segmentInfo.segment[0]), parseFloat(segmentInfo.segment[1]), service);
             const hashedVideoID = getHash(videoID, 1);
 
             const startingLocked = isVIP ? 1 : 0;
diff --git a/src/utils/getSubmissionUUID.ts b/src/utils/getSubmissionUUID.ts
index 4d90c58..89a525c 100644
--- a/src/utils/getSubmissionUUID.ts
+++ b/src/utils/getSubmissionUUID.ts
@@ -1,15 +1,16 @@
 import { getHash } from "./getHash";
 import { HashedValue } from "../types/hash.model";
-import { ActionType, VideoID, Service } from "../types/segments.model";
+import { ActionType, VideoID, Service, Category } from "../types/segments.model";
 import { UserID } from "../types/user.model";
 
 export function getSubmissionUUID(
     videoID: VideoID,
+    category: Category,
     actionType: ActionType,
     userID: UserID,
     startTime: number,
     endTime: number,
     service: Service
 ) : HashedValue {
-    return `5${getHash(`${videoID}${startTime}${endTime}${userID}${actionType}${service}`, 1)}` as HashedValue;
+    return `${getHash(`${videoID}${startTime}${endTime}${userID}${category}${actionType}${service}`, 1)}6` as HashedValue;
 }