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

Add free chapters access

Browse Source
This commit is contained in:
Ajay
2022-09-01 03:21:14 -04:00
parent 7060c0ab0d
commit acec7e58e7
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app.ts
View File

@@ -197,7 +197,7 @@ function setupRoutes(router: Router) {
router.post("/api/feature", addFeature); router.post("/api/feature", addFeature);
router.get("/api/generateToken/:type", generateTokenRequest); router.get("/api/generateToken/:type", generateTokenRequest);
router.get("/api/verifyToken/", verifyTokenRequest); router.get("/api/verifyToken", verifyTokenRequest);
if (config.postgres?.enabled) { if (config.postgres?.enabled) {
router.get("/database", (req, res) => dumpDatabase(req, res, true)); router.get("/database", (req, res) => dumpDatabase(req, res, true));

13
src/routes/getUserInfo.ts
View File

@@ -8,6 +8,7 @@ import { getReputation } from "../utils/reputation";
import { Category, SegmentUUID } from "../types/segments.model"; import { Category, SegmentUUID } from "../types/segments.model";
import { config } from "../config"; import { config } from "../config";
import { canSubmit } from "../utils/permissions"; import { canSubmit } from "../utils/permissions";
import { oneOf } from "../utils/promise";
const maxRewardTime = config.maxRewardTimePerSegmentInSeconds; const maxRewardTime = config.maxRewardTimePerSegmentInSeconds;
async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> { async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> {
@@ -115,6 +116,13 @@ async function getPermissions(userID: HashedUserID): Promise<Record<string, bool
return result; return result;
} }
async function getFreeChaptersAccess(userID: HashedUserID): Promise<boolean> {
return await oneOf([isUserVIP(userID),
(async () => (await getReputation(userID)) > 0)(),
(async () => !!(await db.prepare("get", `SELECT "timeSubmitted" FROM "sponsorTimes" WHERE "timeSubmitted" < 1590969600000 AND "userID" = ? LIMIT 1`, [userID], { useReplica: true })))()
]);
}
type cases = Record<string, any> type cases = Record<string, any>
const executeIfFunction = (f: any) => const executeIfFunction = (f: any) =>
@@ -139,7 +147,8 @@ const dbGetValue = (userID: HashedUserID, property: string): Promise<string|Segm
reputation: () => getReputation(userID), reputation: () => getReputation(userID),
vip: () => isUserVIP(userID), vip: () => isUserVIP(userID),
lastSegmentID: () => dbGetLastSegmentForUser(userID), lastSegmentID: () => dbGetLastSegmentForUser(userID),
permissions: () => getPermissions(userID) permissions: () => getPermissions(userID),
freeChaptersAccess: () => getFreeChaptersAccess(userID)
})("")(property); })("")(property);
}; };
@@ -149,7 +158,7 @@ async function getUserInfo(req: Request, res: Response): Promise<Response> {
const defaultProperties: string[] = ["userID", "userName", "minutesSaved", "segmentCount", "ignoredSegmentCount", const defaultProperties: string[] = ["userID", "userName", "minutesSaved", "segmentCount", "ignoredSegmentCount",
"viewCount", "ignoredViewCount", "warnings", "warningReason", "reputation", "viewCount", "ignoredViewCount", "warnings", "warningReason", "reputation",
"vip", "lastSegmentID"]; "vip", "lastSegmentID"];
const allProperties: string[] = [...defaultProperties, "banned", "permissions"]; const allProperties: string[] = [...defaultProperties, "banned", "permissions", "freeChaptersAccess"];
let paramValues: string[] = req.query.values let paramValues: string[] = req.query.values
? JSON.parse(req.query.values as string) ? JSON.parse(req.query.values as string)
: req.query.value : req.query.value