notes updating

Author: octo-kumo

backend/src/routes/raw.ts

@@ -1,5 +1,5 @@
 import express, {Router} from "express";
-import {checkUser, hasPermissions, noteCache} from "../utils";
+import {checkUser, getNote, hasPermissions} from "../utils";
 import {COLLECTION_IMAGE_STORE, COLLECTION_NOTES_STORE, USERS_STORE} from "../storage";
 import {
     COLLECTION_IMAGE_PATH,
@@ -33,8 +33,8 @@ export async function noteHandler(req: express.Request, res: express.Response) {
     const r = COLLECTION_NOTES_STORE.read(COLLECTION_NOTE_PATH(req.params.cid, req.params.nid));
     res.set('Cache-control', `public, max-age=${CACHE_TIME}`);
     if (r) return r?.pipe(res);
-    const note = noteCache.get(req.params.cid)?.find(n => n.nid === req.params.nid);
-    if (note?.url && note.url !== COLLECTION_NOTE_URL(note.cid, note.nid)) return res.redirect(note.url);
+    const note = await getNote(req.params.cid, req.params.nid);
+    if (note?.url && note?.url !== COLLECTION_NOTE_URL(note.cid, note.nid)) return res.redirect(note.url);
     else return res.sendStatus(404);
 }
 

backend/src/utils.ts

@@ -99,12 +99,13 @@ export function updateRoleCache(rid: string, value?: Role) {
     else roleCache.del(rid);
 }
 
-export async function getNote(cid: string, nid: string): Promise<Note | undefined> {
+export async function getNote(cid?: string, nid?: string): Promise<Note | undefined> {
     let notes = await getNotes(cid);
     if (notes) return notes.find(note => note.nid === nid);
 }
 
-export async function getNotes(cid: string): Promise<Note[] | undefined> {
+export async function getNotes(cid?: string): Promise<Note[] | undefined> {
+    if (!cid) return undefined;
     if (noteCache.has(cid)) return noteCache.get(cid);
     else {
         if (!collectionCache.get(cid)) return [];