diff --git a/src/routes/getSkipSegments.ts b/src/routes/getSkipSegments.ts index 0e5ce19..5e15b1a 100644 --- a/src/routes/getSkipSegments.ts +++ b/src/routes/getSkipSegments.ts @@ -1,15 +1,15 @@ import { Request, Response } from 'express'; import { config } from '../config'; import { db, privateDB } from '../databases/databases'; -import { skipSegmentsHashKey, skipSegmentsKey } from '../middleware/redisKeys'; +import { skipSegmentsHashKey, skipSegmentsKey } from '../utils/redisKeys'; import { SBRecord } from '../types/lib.model'; import { Category, CategoryActionType, DBSegment, HashedIP, IPAddress, OverlappingSegmentGroup, Segment, SegmentCache, Service, VideoData, VideoID, VideoIDHash, Visibility, VotableObject } from "../types/segments.model"; import { getCategoryActionType } from '../utils/categoryInfo'; import { getHash } from '../utils/getHash'; import { getIP } from '../utils/getIP'; import { Logger } from '../utils/logger'; -import { QueryCacher } from '../middleware/queryCacher' -import { getReputation } from '../middleware/reputation'; +import { QueryCacher } from '../utils/queryCacher' +import { getReputation } from '../utils/reputation'; async function prepareCategorySegments(req: Request, videoID: VideoID, category: Category, segments: DBSegment[], cache: SegmentCache = {shadowHiddenSegmentIPs: {}}): Promise { diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts index 9c28964..a5137f9 100644 --- a/src/routes/postSkipSegments.ts +++ b/src/routes/postSkipSegments.ts @@ -11,13 +11,13 @@ import {getFormattedTime} from '../utils/getFormattedTime'; import {isUserTrustworthy} from '../utils/isUserTrustworthy'; import {dispatchEvent} from '../utils/webhookUtils'; import {Request, Response} from 'express'; -import { skipSegmentsHashKey, skipSegmentsKey } from '../middleware/redisKeys'; +import { skipSegmentsHashKey, skipSegmentsKey } from '../utils/redisKeys'; import redis from '../utils/redis'; import { Category, CategoryActionType, IncomingSegment, Segment, SegmentUUID, Service, VideoDuration, VideoID } from '../types/segments.model'; import { deleteLockCategories } from './deleteLockCategories'; import { getCategoryActionType } from '../utils/categoryInfo'; -import { QueryCacher } from '../middleware/queryCacher'; -import { getReputation } from '../middleware/reputation'; +import { QueryCacher } from '../utils/queryCacher'; +import { getReputation } from '../utils/reputation'; interface APIVideoInfo { err: string | boolean, diff --git a/src/routes/voteOnSponsorTime.ts b/src/routes/voteOnSponsorTime.ts index 39ebfd8..25a331f 100644 --- a/src/routes/voteOnSponsorTime.ts +++ b/src/routes/voteOnSponsorTime.ts @@ -12,7 +12,7 @@ import {config} from '../config'; import { UserID } from '../types/user.model'; import { Category, CategoryActionType, HashedIP, IPAddress, SegmentUUID, Service, VideoID, VideoIDHash } from '../types/segments.model'; import { getCategoryActionType } from '../utils/categoryInfo'; -import { QueryCacher } from '../middleware/queryCacher'; +import { QueryCacher } from '../utils/queryCacher'; const voteTypes = { normal: 0, diff --git a/src/middleware/queryCacher.ts b/src/utils/queryCacher.ts similarity index 100% rename from src/middleware/queryCacher.ts rename to src/utils/queryCacher.ts diff --git a/src/middleware/redisKeys.ts b/src/utils/redisKeys.ts similarity index 94% rename from src/middleware/redisKeys.ts rename to src/utils/redisKeys.ts index 1a0491c..fde37f3 100644 --- a/src/middleware/redisKeys.ts +++ b/src/utils/redisKeys.ts @@ -1,6 +1,6 @@ import { Service, VideoID, VideoIDHash } from "../types/segments.model"; import { UserID } from "../types/user.model"; -import { Logger } from "../utils/logger"; +import { Logger } from "./logger"; export function skipSegmentsKey(videoID: VideoID, service: Service): string { return "segments." + service + ".videoID." + videoID; diff --git a/src/middleware/reputation.ts b/src/utils/reputation.ts similarity index 100% rename from src/middleware/reputation.ts rename to src/utils/reputation.ts