Print cock differently

Author: holzmaster

src/commands/penis.ts

@@ -6,43 +6,9 @@ import type { ProcessableMessage } from "@/service/command.js";
 import type { Penis } from "@/storage/db/model.js";
 import { NormalDistribution, RandomNumberGenerator, SecureRandomSource } from "@/service/random.js";
 import * as penis from "@/storage/penis.js";
-import { clamp } from "@/utils/math.js";
 
 import log from "@log";
 
-export type Radius = 0 | 1 | 2 | 3;
-
-const RADIUS_CHARS: Record<Radius, string> = {
-    0: "",
-    1: "‒",
-    2: "=",
-    3: "≡",
-};
-
-const PENIS_LENGTH_MAX = 30;
-const PENIS_RADIUS_MAX = 3;
-
-const sendPenis = async (
-    user: User,
-    message: ProcessableMessage,
-    size: number,
-    radius: Radius,
-    measurement: Date = new Date(),
-): Promise<void> => {
-    const radiusChar = RADIUS_CHARS[radius];
-    const penis = `8${radiusChar.repeat(size | 0)}D`;
-    const circumference = (Math.PI * radius * 2).toFixed(2);
-
-    await message.reply(
-        `Pimmel von ${user}:\n${penis}\n(Länge: ${size.toFixed(2)} cm, Umfang: ${circumference} cm, Gemessen um ${time(measurement, TimestampStyles.LongDateTime)})`,
-    );
-};
-
-const isNewLongestDick = async (size: number): Promise<boolean> => {
-    const oldLongest = (await penis.longestRecentMeasurement()) ?? -1;
-    return oldLongest < size;
-};
-
 const randomSource = new SecureRandomSource();
 
 const lengthDistribution = new NormalDistribution(
@@ -64,6 +30,33 @@ const radiusDistribution = new NormalDistribution(11.85 / (Math.PI * 2), 1 / (Ma
 
 const sizeGenerator = new RandomNumberGenerator(lengthDistribution, randomSource);
 const radiusGenerator = new RandomNumberGenerator(radiusDistribution, randomSource);
+
+const RADIUS_CHARS = ["‒", "=", "≡"];
+
+const sendPenis = async (
+    user: User,
+    message: ProcessableMessage,
+    size: number,
+    radius: number,
+    measurement: Date,
+): Promise<void> => {
+    const radiusChar =
+        radius < radiusDistribution.mean
+            ? RADIUS_CHARS[0]
+            : radius < radiusDistribution.mean + radiusDistribution.standardDeviation
+              ? RADIUS_CHARS[1]
+              : RADIUS_CHARS[2];
+
+    const length = size | 0;
+
+    const penis = `8${radiusChar.repeat(length)}D`;
+    const circumference = (Math.PI * radius * 2).toFixed(2);
+
+    await message.reply(
+        `Pimmel von ${user}:\n${penis}\n(Länge: ${size.toFixed(2)} cm, Umfang: ${circumference} cm, Gemessen um ${time(measurement, TimestampStyles.LongDateTime)})`,
+    );
+};
+
 /**
  * Penis command. Displays the users penis length
  */
@@ -152,10 +145,8 @@ export default class PenisCommand implements MessageCommand {
 
         log.debug(`No recent measuring of ${userToMeasure.id} found. Creating Measurement.`);
 
-        const size = clamp(sizeGenerator.get(), 1, PENIS_LENGTH_MAX); // TODO: Do we really want to clamp here? Maybe just clamp(v, 1, Infinity)?
-
-        // TODO: Maye we want the radius to be integer only for display (and keep the float internally)
-        const radius = clamp(Math.round(radiusGenerator.get()), 1, PENIS_RADIUS_MAX) as Radius; // TODO: Do we really want to clamp here? Maybe just clamp(v, 1, Infinity)?
+        const size = Math.max(sizeGenerator.get(), 1);
+        const radius = Math.max(radiusGenerator.get(), 1);
 
         if (await isNewLongestDick(size)) {
             log.debug(`${userToMeasure} has the new longest dick with size ${size}`);
@@ -164,3 +155,8 @@ export default class PenisCommand implements MessageCommand {
         return await penis.insertMeasurement(userToMeasure, size, radius);
     }
 }
+
+async function isNewLongestDick(size: number) {
+    const oldLongest = (await penis.longestRecentMeasurement()) ?? -1;
+    return oldLongest < size;
+}

src/storage/db/model.ts

@@ -1,8 +1,6 @@
 import type { Snowflake } from "discord.js";
 import type { ColumnType, Generated, GeneratedAlways, Insertable, Selectable } from "kysely";
 
-import type { Radius } from "@/commands/penis.js";
-
 export type Date = ColumnType<string, string, string>; // TODO: Date is not supported by DB Driver
 
 export interface Database {
@@ -114,7 +112,7 @@ export interface PenisTable extends AuditedTable {
 
     userId: Snowflake;
     size: number;
-    radius: Radius;
+    radius: number;
     measuredAt: Generated<string>; // TODO: Date is not supported by the DB driver
 }
 

src/storage/penis.ts

@@ -1,7 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill"; // TODO: Remove once bun ships temporal
 import type { Snowflake, User } from "discord.js";
 
-import type { Radius } from "@/commands/penis.js";
 import type { Penis } from "@/storage/db/model.js";
 
 import { getStartAndEndDay } from "@/utils/dateUtils.js";
@@ -11,7 +10,7 @@ import log from "@log";
 export function insertMeasurement(
     user: User,
     size: number,
-    radius: Radius,
+    radius: number,
     ctx = db(),
 ): Promise<Penis> {
     log.debug(`Saving Penis Measurement for user ${user.id} with size ${size}`);