diff --git a/src/middleware/queryCacher.ts b/src/middleware/queryCacher.ts index ec48114..64cf206 100644 --- a/src/middleware/queryCacher.ts +++ b/src/middleware/queryCacher.ts @@ -1,7 +1,8 @@ import redis from "../utils/redis"; import { Logger } from "../utils/logger"; -import { skipSegmentsHashKey, skipSegmentsKey } from "./redisKeys"; +import { skipSegmentsHashKey, skipSegmentsKey, reputationKey } from "./redisKeys"; import { Service, VideoID, VideoIDHash } from "../types/segments.model"; +import { UserID } from "../types/user.model"; async function get(fetchFromDB: () => Promise, key: string): Promise { const {err, reply} = await redis.getAsync(key); @@ -21,10 +22,11 @@ async function get(fetchFromDB: () => Promise, key: string): Promise { return data; } -function clearVideoCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHash; service: Service; }) { +function clearVideoCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHash; service: Service; userID: UserID; }) { if (videoInfo) { redis.delAsync(skipSegmentsKey(videoInfo.videoID, videoInfo.service)); redis.delAsync(skipSegmentsHashKey(videoInfo.hashedVideoID, videoInfo.service)); + redis.delAsync(reputationKey(videoInfo.userID)); } } diff --git a/src/middleware/redisKeys.ts b/src/middleware/redisKeys.ts index 5234a51..1a0491c 100644 --- a/src/middleware/redisKeys.ts +++ b/src/middleware/redisKeys.ts @@ -13,6 +13,6 @@ export function skipSegmentsHashKey(hashedVideoIDPrefix: VideoIDHash, service: S return "segments." + service + "." + hashedVideoIDPrefix; } -export function userKey(userID: UserID): string { - return "user." + userID; +export function reputationKey(userID: UserID): string { + return "reputation.user." + userID; } \ No newline at end of file diff --git a/src/middleware/reputation.ts b/src/middleware/reputation.ts index 99bda65..cb18b24 100644 --- a/src/middleware/reputation.ts +++ b/src/middleware/reputation.ts @@ -1,7 +1,7 @@ import { db } from "../databases/databases"; import { UserID } from "../types/user.model"; import { QueryCacher } from "./queryCacher"; -import { userKey } from "./redisKeys"; +import { reputationKey } from "./redisKeys"; interface ReputationDBResult { totalSubmissions: number, @@ -19,7 +19,7 @@ export async function getReputation(userID: UserID) { SUM(CASE WHEN "timeSubmitted" < ? AND "votes" > 0 THEN 1 ELSE 0 END) AS "oldUpvotedSubmissions" FROM "sponsorTimes" WHERE "userID" = ?`, [pastDate, userID]) as Promise; - const result = await QueryCacher.get(fetchFromDB, userKey(userID)); + const result = await QueryCacher.get(fetchFromDB, reputationKey(userID)); // Grace period if (result.totalSubmissions < 5) { diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts index 2806e8a..b46bfe3 100644 --- a/src/routes/postSkipSegments.ts +++ b/src/routes/postSkipSegments.ts @@ -532,7 +532,8 @@ export async function postSkipSegments(req: Request, res: Response) { QueryCacher.clearVideoCache({ videoID, hashedVideoID, - service + service, + userID }); } catch (err) { //a DB change probably occurred diff --git a/src/routes/voteOnSponsorTime.ts b/src/routes/voteOnSponsorTime.ts index c7bb6e7..39ebfd8 100644 --- a/src/routes/voteOnSponsorTime.ts +++ b/src/routes/voteOnSponsorTime.ts @@ -156,8 +156,8 @@ async function categoryVote(UUID: SegmentUUID, userID: UserID, isVIP: boolean, i return; } - const videoInfo = (await db.prepare('get', `SELECT "category", "videoID", "hashedVideoID", "service" FROM "sponsorTimes" WHERE "UUID" = ?`, - [UUID])) as {category: Category, videoID: VideoID, hashedVideoID: VideoIDHash, service: Service}; + const videoInfo = (await db.prepare('get', `SELECT "category", "videoID", "hashedVideoID", "service", "userID" FROM "sponsorTimes" WHERE "UUID" = ?`, + [UUID])) as {category: Category, videoID: VideoID, hashedVideoID: VideoIDHash, service: Service, userID: UserID}; if (!videoInfo) { // Submission doesn't exist res.status(400).send("Submission doesn't exist."); @@ -364,8 +364,8 @@ export async function voteOnSponsorTime(req: Request, res: Response) { } //check if the increment amount should be multiplied (downvotes have more power if there have been many views) - const videoInfo = await db.prepare('get', `SELECT "videoID", "hashedVideoID", "service", "votes", "views" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]) as - {videoID: VideoID, hashedVideoID: VideoIDHash, service: Service, votes: number, views: number}; + const videoInfo = await db.prepare('get', `SELECT "videoID", "hashedVideoID", "service", "votes", "views", "userID" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]) as + {videoID: VideoID, hashedVideoID: VideoIDHash, service: Service, votes: number, views: number, userID: UserID}; if (voteTypeEnum === voteTypes.normal) { if ((isVIP || isOwnSubmission) && incrementAmount < 0) {