Move nanoid generator to lib

2 files changed, 16 insertions, 10 deletions

diff --git a/src/routes/event.ts b/src/routes/event.ts
index c418893..375871b 100644
--- a/src/routes/event.ts
+++ b/src/routes/event.ts
@@ -1,10 +1,13 @@
 import { Router, Response, Request } from "express";
-import { customAlphabet } from "nanoid";
 import multer from "multer";
 import Jimp from "jimp";
 import moment from "moment-timezone";
 import { marked } from "marked";
-import { generateEditToken, generateRSAKeypair } from "../util/generator.js";
+import {
+    generateEditToken,
+    generateEventID,
+    generateRSAKeypair,
+} from "../util/generator.js";
 import { validateEventData } from "../util/validation.js";
 import { addToLog } from "../helpers.js";
 import Event from "../models/Event.js";
@@ -25,13 +28,6 @@ import crypto from "crypto";
 
 const config = getConfig();
 
-// This alphabet (used to generate all event, group, etc. IDs) is missing '-'
-// because ActivityPub doesn't like it in IDs
-const nanoid = customAlphabet(
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_",
-    21,
-);
-
 const storage = multer.memoryStorage();
 // Accept only JPEG, GIF or PNG images, up to 10MB
 const upload = multer({
@@ -67,7 +63,7 @@ router.post(
             });
         }
 
-        let eventID = nanoid();
+        let eventID = generateEventID();
         let editToken = generateEditToken();
         let eventImageFilename;
         let isPartOfEventGroup = false;
diff --git a/src/util/generator.ts b/src/util/generator.ts
index c3712c1..882f114 100644
--- a/src/util/generator.ts
+++ b/src/util/generator.ts
@@ -1,5 +1,13 @@
 import crypto from "crypto";
 
+import { customAlphabet } from "nanoid";
+// This alphabet (used to generate all event, group, etc. IDs) is missing '-'
+// because ActivityPub doesn't like it in IDs
+const nanoid = customAlphabet(
+    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_",
+    21,
+);
+
 const generateAlphanumericString = (length: number) => {
     return Array(length)
         .fill(0)
@@ -7,6 +15,8 @@ const generateAlphanumericString = (length: number) => {
         .join("");
 };
 
+export const generateEventID = () => nanoid();
+
 export const generateEditToken = () => generateAlphanumericString(32);
 
 export const generateRSAKeypair = () => {