diff --git a/src/routes/getBranding.ts b/src/routes/getBranding.ts index f7a42e0..fd99638 100644 --- a/src/routes/getBranding.ts +++ b/src/routes/getBranding.ts @@ -24,20 +24,18 @@ enum BrandingSubmissionType { export async function getVideoBranding(res: Response, videoID: VideoID, service: Service, ip: IPAddress, returnUserID: boolean): Promise { const getTitles = () => db.prepare( "all", - `SELECT DISTINCT ON ("titles"."userID") "titles"."title", "titles"."original", "titleVotes"."votes", "titleVotes"."locked", "titleVotes"."shadowHidden", "titles"."UUID", "titles"."videoID", "titles"."hashedVideoID", "titleVotes"."verification", "titles"."userID" + `SELECT "titles"."title", "titles"."original", "titleVotes"."votes", "titleVotes"."locked", "titleVotes"."shadowHidden", "titles"."UUID", "titles"."videoID", "titles"."hashedVideoID", "titleVotes"."verification", "titles"."userID" FROM "titles" JOIN "titleVotes" ON "titles"."UUID" = "titleVotes"."UUID" - WHERE "titles"."videoID" = ? AND "titles"."service" = ? AND "titleVotes"."votes" > -2 - ORDER BY "titles"."userID", "titleVotes"."votes", "titles"."timeSubmitted" DESC`, + WHERE "titles"."videoID" = ? AND "titles"."service" = ? AND "titleVotes"."votes" > -2`, [videoID, service], { useReplica: true } ) as Promise; const getThumbnails = () => db.prepare( "all", - `SELECT DISTINCT ON ("thumbnails"."userID") "thumbnailTimestamps"."timestamp", "thumbnails"."original", "thumbnailVotes"."votes", "thumbnailVotes"."locked", "thumbnailVotes"."shadowHidden", "thumbnails"."UUID", "thumbnails"."videoID", "thumbnails"."hashedVideoID", "thumbnails"."userID" + `SELECT "thumbnailTimestamps"."timestamp", "thumbnails"."original", "thumbnailVotes"."votes", "thumbnailVotes"."locked", "thumbnailVotes"."shadowHidden", "thumbnails"."UUID", "thumbnails"."videoID", "thumbnails"."hashedVideoID", "thumbnails"."userID" FROM "thumbnails" LEFT JOIN "thumbnailVotes" ON "thumbnails"."UUID" = "thumbnailVotes"."UUID" LEFT JOIN "thumbnailTimestamps" ON "thumbnails"."UUID" = "thumbnailTimestamps"."UUID" - WHERE "thumbnails"."videoID" = ? AND "thumbnails"."service" = ? AND "thumbnailVotes"."votes" > -2 - ORDER BY "thumbnails"."userID", "thumbnailVotes"."votes", "thumbnails"."timeSubmitted" DESC`, + WHERE "thumbnails"."videoID" = ? AND "thumbnails"."service" = ? AND "thumbnailVotes"."votes" > -2`, [videoID, service], { useReplica: true } ) as Promise; diff --git a/test/cases/getBranding.ts b/test/cases/getBranding.ts index 7ee4b42..1758cd4 100644 --- a/test/cases/getBranding.ts +++ b/test/cases/getBranding.ts @@ -45,8 +45,6 @@ describe("getBranding", () => { db.prepare("run", titleQuery, [videoID1, "title1", 0, "userID1", Service.YouTube, videoID1Hash, 1, "UUID1"]), db.prepare("run", titleQuery, [videoID1, "title2", 0, "userID2", Service.YouTube, videoID1Hash, 1, "UUID2"]), db.prepare("run", titleQuery, [videoID1, "title3", 1, "userID3", Service.YouTube, videoID1Hash, 1, "UUID3"]), - // Will be ignored since it has the same userID, but less votes - db.prepare("run", titleQuery, [videoID1, "some badly written title", 0, "userID3", Service.YouTube, videoID1Hash, 1, "UUID4"]), db.prepare("run", thumbnailQuery, [videoID1, 0, "userID1", Service.YouTube, videoID1Hash, 1, "UUID1T"]), db.prepare("run", thumbnailQuery, [videoID1, 1, "userID2", Service.YouTube, videoID1Hash, 1, "UUID2T"]), db.prepare("run", thumbnailQuery, [videoID1, 0, "userID3", Service.YouTube, videoID1Hash, 1, "UUID3T"]),