Move video label request to request folder

src/utils/videoLabels.ts → src/requests/videoLabels.ts

@@ -1,8 +1,8 @@
-import { asyncRequestToServer } from "../requests/requests";
 import { Category, CategorySkipOption, VideoID } from "../types";
 import Utils from "../utils";
-import { getHash } from "../utils/hash";
-import { logWarn } from "./logger";
+import { getVideoIDHash } from "../utils/hash";
+import { logWarn } from "../utils/logger";
+import { asyncRequestToServer } from "./requests";
 
 const utils = new Utils();
 
@@ -55,7 +55,7 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
 }
 
 export async function getVideoLabel(videoID: VideoID): Promise<Category | null> {
-    const prefix = (await getHash(videoID, 1)).slice(0, 3);
+    const prefix = (await getVideoIDHash(videoID)).slice(0, 3);
     const result = await getLabelHashBlock(prefix);
 
     if (result) {

src/thumbnail-utils/thumbnails.ts

@@ -1,7 +1,7 @@
 import Config from "../config";
 import { waitFor } from "../utils/";
 import { getBvIDFromURL } from "../utils/parseVideoID";
-import { getVideoLabel } from "../utils/videoLabels";
+import { getVideoLabel } from "../requests/videoLabels";
 
 export async function labelThumbnails(thumbnails: HTMLElement[]): Promise<void> {
     await Promise.all(thumbnails.map((t) => labelThumbnail(t as HTMLImageElement)));

src/utils.ts

@@ -11,7 +11,7 @@ import {
 
 import { isSafari } from "./config/config";
 import { findValidElementFromSelector } from "./utils/dom";
-import { getHash, HashedValue } from "./utils/hash";
+import { getHash, getVideoIDHash, HashedValue } from "./utils/hash";
 
 export default class Utils {
     // Contains functions needed from the background script
@@ -245,7 +245,7 @@ export default class Utils {
         )
             return;
 
-        const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
+        const hashedVideoID = (await getVideoIDHash(videoID)).slice(0, 4) as VideoID & HashedValue;
         const UUIDHash = await getHash(segmentUUID, 1);
 
         const allDownvotes = Config.local.downvotedSegments;

src/utils/hash.ts

@@ -26,3 +26,7 @@ export async function getHash<T extends string>(value: T, times = 5000): Promise
 
     return hashHex as T & HashedValue;
 }
+
+export async function getVideoIDHash(videoID: string): Promise<string> {
+    return getHash(videoID, 1);
+}