Merge branch 'master' into fix/general-fixes

src/routes/dumpDatabase.ts

@@ -118,6 +118,12 @@ export default async function dumpDatabase(req: Request, res: Response, showPage
             Then, you can download the csv files below, or use the links returned from the JSON request. 
             A dump will also be triggered by making a request to one of these urls.
 
+            <h3>Keeping your dump up to date</h3>
+
+            If you want a live dump, please do not continually fetch this url. 
+            Please instead use the <a href="https://github.com/mchangrh/sb-mirror">sb-mirror</a> project.
+            This can automatically fetch new data and will not require a redownload each time, saving bandwith.
+
             <h3>Links</h3>
             <table>
                 <thead>
@@ -184,7 +190,7 @@ export async function redirectLink(req: Request, res: Response): Promise<void> {
         res.sendStatus(404);
     }
 
-    await queueDump();
+    if (req.query.generate !== "false") await queueDump();
 }
 
 function updateQueueTime(): void {

src/routes/getLockReason.ts

@@ -8,7 +8,9 @@ const possibleCategoryList = config.categoryList;
 interface lockArray {
     category: Category;
     locked: number,
-    reason: string
+    reason: string,
+    userID: string,
+    userName: string,
 }
 
 export async function getLockReason(req: Request, res: Response): Promise<Response> {
@@ -38,31 +40,49 @@ export async function getLockReason(req: Request, res: Response): Promise<Respon
 
     try {
         // Get existing lock categories markers
-        const row = await db.prepare("all", 'SELECT "category", "reason" from "lockCategories" where "videoID" = ?', [videoID]) as {category: Category, reason: string}[];
+        const row = await db.prepare("all", 'SELECT "category", "reason", "userID" from "lockCategories" where "videoID" = ?', [videoID]) as {category: Category, reason: string, userID: string }[];
         // map to object array
         const locks = [];
-        const lockedCategories = [] as string[];
+        const userIDs = new Set();
         // get all locks for video, check if requested later
         for (const lock of row) {
             locks.push({
                 category: lock.category,
                 locked: 1,
-                reason: lock.reason
+                reason: lock.reason,
+                userID: lock?.userID || "",
+                userName: "",
             } as lockArray);
-            lockedCategories.push(lock.category);
+            userIDs.add(lock.userID);
         }
-        // add empty locks for categories requested but not locked
-        const noLockCategories = searchCategories.filter(x => !lockedCategories.includes(x));
-        for (const noLock of noLockCategories) {
-            locks.push({
-                category: noLock,
-                locked: 0,
-                reason: ""
-            } as lockArray);
+        // all userName from userIDs
+        const userNames = await db.prepare(
+            "all",
+            `SELECT "userName", "userID" FROM "userNames" WHERE "userID" IN (${Array.from("?".repeat(userIDs.size)).join()}) LIMIT ?`,
+            [...userIDs, userIDs.size]
+        ) as { userName: string, userID: string }[];
+
+        const results = [];
+        for (const category of searchCategories)  {
+            const lock = locks.find(l => l.category === category);
+            if (lock?.userID) {
+                // mapping userName to locks
+                const user = userNames.find(u => u.userID === lock.userID);
+                lock.userName = user?.userName || "";
+                results.push(lock);
+            } else {
+                // add empty locks for categories requested but not locked
+                results.push({
+                    category,
+                    locked: 0,
+                    reason: "",
+                    userID: "",
+                    userName: "",
+                } as lockArray);
+            }
         }
-        // return real and fake locks that were requested
-        const filtered = locks.filter(lock => searchCategories.includes(lock.category));
-        return res.send(filtered);
+
+        return res.send(results);
     } catch (err) {
         Logger.error(err as string);
         return res.sendStatus(500);

src/routes/getStatus.ts

@@ -1,6 +1,7 @@
 import { db } from "../databases/databases";
 import { Logger } from "../utils/logger";
 import { Request, Response } from "express";
+import os from "os";
 
 export async function getStatus(req: Request, res: Response): Promise<Response> {
     const startTime = Date.now();
@@ -14,8 +15,9 @@ export async function getStatus(req: Request, res: Response): Promise<Response>
             db: Number(dbVersion),
             startTime,
             processTime: Date.now() - startTime,
+            loadavg: os.loadavg().slice(1) // only return 5 & 15 minute load average
         };
-        return value ? res.send(String(statusValues[value])) : res.send(statusValues);
+        return value ? res.send(JSON.stringify(statusValues[value])) : res.send(statusValues);
     } catch (err) {
         Logger.error(err as string);
         return res.sendStatus(500);

src/routes/postSkipSegments.ts

@@ -6,7 +6,6 @@ import { getSubmissionUUID } from "../utils/getSubmissionUUID";
 import { getHash } from "../utils/getHash";
 import { getIP } from "../utils/getIP";
 import { getFormattedTime } from "../utils/getFormattedTime";
-import { isUserTrustworthy } from "../utils/isUserTrustworthy";
 import { dispatchEvent } from "../utils/webhookUtils";
 import { Request, Response } from "express";
 import { ActionType, Category, CategoryActionType, IncomingSegment, SegmentUUID, Service, VideoDuration, VideoID } from "../types/segments.model";
@@ -622,13 +621,6 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
         //check to see if this user is shadowbanned
         const shadowBanRow = await db.prepare("get", `SELECT count(*) as "userCount" FROM "shadowBannedUsers" WHERE "userID" = ? LIMIT 1`, [userID]);
 
-        let shadowBanned = shadowBanRow.userCount;
-
-        if (!(await isUserTrustworthy(userID))) {
-            //hide this submission as this user is untrustworthy
-            shadowBanned = 1;
-        }
-
         const startingVotes = 0 + decreaseVotes;
         const reputation = await getReputation(userID);
 
@@ -644,7 +636,7 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
                 await db.prepare("run", `INSERT INTO "sponsorTimes" 
                     ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "actionType", "service", "videoDuration", "reputation", "shadowHidden", "hashedVideoID", "userAgent")
                     VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-                    videoID, segmentInfo.segment[0], segmentInfo.segment[1], startingVotes, startingLocked, UUID, userID, timeSubmitted, 0, segmentInfo.category, segmentInfo.actionType, service, videoDuration, reputation, shadowBanned, hashedVideoID, userAgent
+                    videoID, segmentInfo.segment[0], segmentInfo.segment[1], startingVotes, startingLocked, UUID, userID, timeSubmitted, 0, segmentInfo.category, segmentInfo.actionType, service, videoDuration, reputation, 0, hashedVideoID, userAgent
                 ],
                 );