Require permission for filler submissions

src/routes/addFeature.ts

@@ -18,10 +18,12 @@ interface AddFeatureRequest extends Request {
 
 const allowedFeatures = {
     vip: [
-        Feature.ChapterSubmitter
+        Feature.ChapterSubmitter,
+        Feature.FillerSubmitter
     ],
     admin: [
-        Feature.ChapterSubmitter
+        Feature.ChapterSubmitter,
+        Feature.FillerSubmitter
     ]
 }
 

src/routes/getUserInfo.ts

@@ -5,9 +5,9 @@ import { Request, Response } from "express";
 import { Logger } from "../utils/logger";
 import { HashedUserID, UserID } from "../types/user.model";
 import { getReputation } from "../utils/reputation";
-import { SegmentUUID } from "../types/segments.model";
+import { Category, SegmentUUID } from "../types/segments.model";
 import { config } from "../config";
-import { canSubmitChapter } from "../utils/permissions";
+import { canSubmit } from "../utils/permissions";
 const maxRewardTime = config.maxRewardTimePerSegmentInSeconds;
 
 async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> {
@@ -106,6 +106,15 @@ async function dbGetBanned(userID: HashedUserID): Promise<boolean> {
     }
 }
 
+async function getPermissions(userID: HashedUserID): Promise<Record<string, boolean>> {
+    const result: Record<string, boolean> = {};
+    for (const category of config.categoryList) {
+        result[category] = (await canSubmit(userID, category as Category)).canSubmit;
+    }
+
+    return result;
+}
+
 type cases = Record<string, any>
 
 const executeIfFunction = (f: any) =>
@@ -130,7 +139,7 @@ const dbGetValue = (userID: HashedUserID, property: string): Promise<string|Segm
         reputation: () => getReputation(userID),
         vip: () => isUserVIP(userID),
         lastSegmentID: () => dbGetLastSegmentForUser(userID),
-        canSubmitChapter: () => canSubmitChapter(userID)
+        permissions: () => getPermissions(userID)
     })("")(property);
 };
 
@@ -140,7 +149,7 @@ async function getUserInfo(req: Request, res: Response): Promise<Response> {
     const defaultProperties: string[] = ["userID", "userName", "minutesSaved", "segmentCount", "ignoredSegmentCount",
         "viewCount", "ignoredViewCount", "warnings", "warningReason", "reputation",
         "vip", "lastSegmentID"];
-    const allProperties: string[] = [...defaultProperties, "banned", "canSubmitChapter"];
+    const allProperties: string[] = [...defaultProperties, "banned", "permissions"];
     let paramValues: string[] = req.query.values
         ? JSON.parse(req.query.values as string)
         : req.query.value

src/routes/postSkipSegments.ts

@@ -21,7 +21,7 @@ import { parseUserAgent } from "../utils/userAgent";
 import { getService } from "../utils/getService";
 import axios from "axios";
 import { vote } from "./voteOnSponsorTime";
-import { canSubmitChapter } from "../utils/permissions";
+import { canSubmit } from "../utils/permissions";
 
 type CheckResult = {
     pass: boolean,
@@ -230,8 +230,10 @@ async function checkInvalidFields(videoID: VideoID, userID: UserID, hashedUserID
             invalidFields.push("segment description");
         }
 
-        if (segmentPair.actionType === ActionType.Chapter && !(await canSubmitChapter(hashedUserID))) {
-            invalidFields.push("permission to submit chapters");
+        const permission = await canSubmit(hashedUserID, segmentPair.category);
+        if (!permission.canSubmit) {
+            invalidFields.push(`permission to submit ${segmentPair.category}`);
+            errors.push(permission.reason);
         }
     }
 
@@ -241,7 +243,7 @@ async function checkInvalidFields(videoID: VideoID, userID: UserID, hashedUserID
         const formattedErrors = errors.reduce((p, c, i) => p + (i !== 0 ? ". " : " ") + c, "");
         return {
             pass: false,
-            errorMessage: `No valid ${formattedFields} field(s) provided.${formattedErrors}`,
+            errorMessage: `No valid ${formattedFields}.${formattedErrors}`,
             errorCode: 400
         };
     }