Merge pull request #63 from CoolerMinecraft/stuff

deletion of old images

Author: dev-banane

server/routes/admin/updateModals.ts

@@ -12,6 +12,7 @@ import {
     unpublishUpdateModal
 } from '../../db/updateModals.js';
 import { getClientIp } from '../../utils/getIpAddress.js';
+import { deleteOldImage } from '../uploads.js';
 
 const router = express.Router();
 
@@ -91,8 +92,21 @@ router.put('/:id', async (req, res) => {
             return res.status(400).json({ error: 'Invalid modal ID' });
         }
 
+        const currentModal = await getUpdateModalById(numericId);
+        if (!currentModal) {
+            return res.status(404).json({ error: 'Modal not found' });
+        }
+
         const modal = await updateUpdateModal(numericId, { title, content, banner_url });
 
+        if (currentModal.banner_url && currentModal.banner_url !== modal?.banner_url) {
+            try {
+                await deleteOldImage(currentModal.banner_url);
+            } catch (deleteError) {
+                console.error('Error deleting old modal banner:', deleteError);
+            }
+        }
+
         if (req.user?.userId) {
             const ip = getClientIp(req);
             await logAdminAction({
@@ -121,8 +135,21 @@ router.delete('/:id', async (req, res) => {
             return res.status(400).json({ error: 'Invalid modal ID' });
         }
 
+        const modal = await getUpdateModalById(numericId);
+        if (!modal) {
+            return res.status(404).json({ error: 'Modal not found' });
+        }
+
         await deleteUpdateModal(numericId);
 
+        if (modal.banner_url) {
+            try {
+                await deleteOldImage(modal.banner_url);
+            } catch (deleteError) {
+                console.error('Error deleting modal banner during deletion:', deleteError);
+            }
+        }
+
         if (req.user?.userId) {
             const ip = getClientIp(req);
             await logAdminAction({

server/routes/uploads.ts

@@ -13,7 +13,7 @@ const CEPHIE_API_KEY = process.env.CEPHIE_API_KEY;
 const CEPHIE_UPLOAD_URL = 'https://api.cephie.app/api/v1/pfcontrol/upload';
 const CEPHIE_DELETE_URL = 'https://api.cephie.app/api/v1/pfcontrol/delete';
 
-async function deleteOldImage(url: string | undefined) {
+export async function deleteOldImage(url: string | undefined) {
     if (!url) return;
     try {
         const response = await axios.delete(CEPHIE_DELETE_URL, {