Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-19 05:58:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix same ip being fetched multiple times from postgres

Browse Source
This commit is contained in:
Ajay
2024-02-07 23:36:45 -05:00
parent 8574ec3a0c
commit a929f69452
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/routes/getSkipSegments.ts
View File

@@ -43,20 +43,20 @@ async function prepareCategorySegments(req: Request, videoID: VideoID, service:
try { try {
if (db.highLoad() || privateDB.highLoad()) throw new Error("High load, not handling shadowhide"); if (db.highLoad() || privateDB.highLoad()) throw new Error("High load, not handling shadowhide");
cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted] = await promiseOrTimeout(QueryCacher.get(fetchData, shadowHiddenIPKey(videoID, segment.timeSubmitted, service)), 150); cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted] = promiseOrTimeout(QueryCacher.get(fetchData, shadowHiddenIPKey(videoID, segment.timeSubmitted, service)), 150);
} catch (e) { } catch (e) {
// give up on shadowhide for now // give up on shadowhide for now
cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted] = null; cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted] = null;
} }
} }
const ipList = cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted]; const ipList = await cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted];
if (ipList?.length > 0 && cache.userHashedIP === undefined) { if (ipList?.length > 0 && cache.userHashedIP === undefined) {
cache.userHashedIP = await cache.userHashedIPPromise; cache.userHashedIP = await cache.userHashedIPPromise;
} }
//if this isn't their ip, don't send it to them //if this isn't their ip, don't send it to them
const shouldShadowHide = cache.shadowHiddenSegmentIPs[videoID][segment.timeSubmitted]?.some( const shouldShadowHide = ipList?.some(
(shadowHiddenSegment) => shadowHiddenSegment.hashedIP === cache.userHashedIP) ?? false; (shadowHiddenSegment) => shadowHiddenSegment.hashedIP === cache.userHashedIP) ?? false;
if (shouldShadowHide) useCache = false; if (shouldShadowHide) useCache = false;

2
src/types/segments.model.ts
View File

@@ -103,7 +103,7 @@ export interface VideoData {
} }
export interface SegmentCache { export interface SegmentCache {
shadowHiddenSegmentIPs: SBRecord<VideoID, SBRecord<string, {hashedIP: HashedIP}[]>>, shadowHiddenSegmentIPs: SBRecord<VideoID, SBRecord<string, Promise<{hashedIP: HashedIP}[] | null>>>,
userHashedIP?: HashedIP userHashedIP?: HashedIP
userHashedIPPromise?: Promise<HashedIP>; userHashedIPPromise?: Promise<HashedIP>;
} }