Move stuff to random service

src/commands/boobs.ts

@@ -4,7 +4,7 @@ import type { ProcessableMessage } from "@/service/command.js";
 import type { MessageCommand } from "@/commands/command.js";
 import * as boob from "@/storage/boob.js";
 import log from "@log";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 interface Booba {
     description: string;

src/commands/dadJoke.ts

@@ -4,7 +4,7 @@ import type { ProcessableMessage } from "@/service/command.js";
 import type { SpecialCommand } from "@/commands/command.js";
 import type { BotContext } from "@/context.js";
 import { substringAfter } from "@/utils/stringUtils.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 type Lang = "german" | "austrian";
 

src/commands/ficktabelle.ts

@@ -1,6 +1,6 @@
 import type { MessageCommand } from "@/commands/command.js";
 import type { ProcessableMessage } from "@/service/command.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 const FICKTABELLE_URL =
     "https://cdn.discordapp.com/attachments/620721921767505942/636149543154614272/20160901-164533-Kovrtep-id1487186.png";

src/commands/gegenstand.ts

@@ -16,7 +16,7 @@ import type { ApplicationCommand } from "@/commands/command.js";
 import type { LootUseCommandInteraction } from "@/storage/loot.js";
 import * as lootService from "@/service/loot.js";
 import * as lootRoleService from "@/service/lootRoles.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 import { ensureChatInputCommand } from "@/utils/interactionUtils.js";
 import * as imageService from "@/service/image.js";
 

src/commands/google.ts

@@ -7,7 +7,7 @@ import {
 } from "discord.js";
 
 import type { ApplicationCommand } from "@/commands/command.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 const replies = [
     "Da bitte, dein Suchergebnis, du Opfer: {0}",

src/commands/metafrage.ts

@@ -7,7 +7,7 @@ import type { ProcessableMessage } from "@/service/command.js";
 import { parseLegacyMessageParts } from "@/service/command.js";
 import { defer } from "@/utils/interactionUtils.js";
 
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 const argsConfig = {
     options: {

src/commands/stempeln.ts

@@ -7,7 +7,7 @@ import {
 
 import type { ApplicationCommand } from "@/commands/command.js";
 import * as stempelService from "@/service/stempel.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 const replies = [
     "Der Bruder {0} hat den neuen Bruder {1} eingeladen und du hast dies so eben bestätigt!",

src/handler/voiceHandler.ts

@@ -1,5 +1,4 @@
 import path from "node:path";
-import fs from "node:fs/promises";
 import { setTimeout } from "node:timers/promises";
 import { readdir } from "node:fs/promises";
 
@@ -21,7 +20,7 @@ import * as sentry from "@sentry/bun";
 
 import type { BotContext } from "@/context.js";
 
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 import log from "@log";
 
 const player = createAudioPlayer();

src/service/banner.ts

@@ -2,7 +2,7 @@ import * as path from "node:path";
 import * as fs from "node:fs/promises";
 
 import type { BotContext } from "@/context.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 import log from "@log";
 
 export const rotate = async (context: BotContext) => {

src/service/lootDegradation.ts

@@ -4,7 +4,7 @@ import * as time from "@/utils/time.js";
 import * as lootService from "@/service/loot.js";
 import { LootAttributeKindId, LootKindId } from "@/service/lootData.js";
 import log from "@log";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 
 export async function degradeItems(_context: BotContext) {
     log.info("Degrading loot items");

src/service/lootDrop.ts

@@ -16,12 +16,11 @@ import * as sentry from "@sentry/bun";
 
 import type { BotContext } from "@/context.js";
 import type { Loot, LootId } from "@/storage/db/model.js";
-import { randomEntry, randomEntryWeighted } from "@/utils/arrayUtils.js";
+import { randomEntry, randomEntryWeighted } from "@/service/random.js";
 
 import * as lootService from "@/service/loot.js";
 import {
     LootAttributeClassId,
-    LootAttributeKindId,
     lootAttributeTemplates,
     LootKindId,
     lootTemplates,

src/service/nickNameRoll.ts

@@ -1,7 +1,7 @@
 import * as sentry from "@sentry/bun";
 
 import * as nickName from "@/storage/nickName.js";
-import { randomEntry } from "@/utils/arrayUtils.js";
+import { randomEntry } from "@/service/random.js";
 import log from "@log";
 import type { BotContext } from "@/context.js";
 

src/service/random.ts

@@ -23,3 +23,40 @@ export function randomValue(range: Range): number {
     const upperLimit = "maxInclusive" in range ? range.maxInclusive + 1 : range.maxExclusive;
     return Math.round(range.min + Math.random() * (upperLimit - range.min));
 }
+
+export function randomEntry<T>(array: readonly T[]): T {
+    return array[(array.length * Math.random()) | 0];
+}
+
+export function randomEntryWeighted<T>(
+    array: readonly Readonly<T>[],
+    weights: readonly number[],
+): Readonly<T> {
+    if (array.length === 0) {
+        throw new Error("Cannot select random entry from empty array");
+    }
+    if (array.length !== weights.length) {
+        throw new Error("Array and weights must have the same length");
+    }
+
+    const prefixSum = [0];
+    for (let i = 0; i < weights.length; ++i) {
+        prefixSum[i] = weights[i] + (prefixSum[i - 1] ?? 0);
+    }
+
+    const offset = Math.random() * prefixSum[prefixSum.length - 1];
+
+    for (let i = 0; i < array.length; ++i) {
+        if (prefixSum[i] > offset && weights[i] > 0) {
+            return array[i];
+        }
+    }
+
+    for (let i = weights.length - 1; i >= 0; --i) {
+        if (weights[i] > 0) {
+            return array[i];
+        }
+    }
+
+    throw new Error("No valid entry found");
+}

src/utils/arrayUtils.ts

@@ -9,43 +9,6 @@ export function chunkArray<T>(array: readonly T[], chunkSize: number): T[][] {
     return result;
 }
 
-export function randomEntry<T>(array: readonly T[]): T {
-    return array[(array.length * Math.random()) | 0];
-}
-
-export function randomEntryWeighted<T>(
-    array: readonly Readonly<T>[],
-    weights: readonly number[],
-): Readonly<T> {
-    if (array.length === 0) {
-        throw new Error("Cannot select random entry from empty array");
-    }
-    if (array.length !== weights.length) {
-        throw new Error("Array and weights must have the same length");
-    }
-
-    const prefixSum = [0];
-    for (let i = 0; i < weights.length; ++i) {
-        prefixSum[i] = weights[i] + (prefixSum[i - 1] ?? 0);
-    }
-
-    const offset = Math.random() * prefixSum[prefixSum.length - 1];
-
-    for (let i = 0; i < array.length; ++i) {
-        if (prefixSum[i] > offset && weights[i] > 0) {
-            return array[i];
-        }
-    }
-
-    for (let i = weights.length - 1; i >= 0; --i) {
-        if (weights[i] > 0) {
-            return array[i];
-        }
-    }
-
-    throw new Error("No valid entry found");
-}
-
 export function shuffleArray<T>(array: readonly T[], biasFn: (item: T) => number): T[] {
     return array
         .map((value, _idx) => ({ value, bias: biasFn(value) }))