fdfsa

src/inc/routes/apiv2/upload.mjs

@@ -3,6 +3,7 @@ import { spawn as _spawnRaw } from 'child_process';
 import db from '../../sql.mjs';
 import lib from '../../lib.mjs';
 import cfg from '../../config.mjs';
+import { getEnableItemSlugs } from '../../settings.mjs';
 import { applyWordFilter } from '../../wordfilter.mjs';
 import queue from '../../queue.mjs';
 import path from "path";
@@ -160,6 +161,48 @@ const getTargetVisibility = (req, postVis) => {
         : sysDefault;
 };
 
+export function calculateExpiresAt(expiryVal, baseStamp = ~~(Date.now() / 1000)) {
+    if (cfg.enable_expiring_uploads === false || cfg.websrv?.enable_expiring_uploads === false) {
+        return null;
+    }
+    if (!expiryVal || expiryVal === 'permanent' || expiryVal === 'never' || expiryVal === '0') {
+        return null;
+    }
+    const val = expiryVal.toString().trim().toLowerCase();
+    switch (val) {
+        case '30minutes':
+        case '30m':
+        case '1800':
+            return baseStamp + 1800;
+        case '1hour':
+        case '1h':
+        case '3600':
+            return baseStamp + 3600;
+        case '24hours':
+        case '24h':
+        case '1day':
+        case '86400':
+            return baseStamp + 86400;
+        case '1week':
+        case '1w':
+        case '7days':
+        case '604800':
+            return baseStamp + 604800;
+        case '1month':
+        case '1m':
+        case '30days':
+        case '2592000':
+            return baseStamp + 2592000;
+        default:
+            const parsed = parseInt(val, 10);
+            if (!isNaN(parsed) && parsed > 0) {
+                return parsed > 2000000000 ? parsed : baseStamp + parsed;
+            }
+            return null;
+    }
+}
+
+
 // Collect request body as buffer with debug logging
 const collectBody = (req) => {
     return new Promise((resolve, reject) => {
@@ -393,7 +436,9 @@ export default router => {
                     const filename = `yt:${videoId}`;
 
                     const targetVisibility = getTargetVisibility(req, req.post?.visibility);
-                    const itemSlug = (cfg.enable_item_slugs !== false) ? lib.generateSlug(11) : null;
+                    const itemSlug = lib.generateSlug(11);
+                    const nowStamp = ~~(Date.now() / 1000);
+                    const targetExpiresAt = calculateExpiresAt(req.post?.expiry || req.headers['x-upload-expiry'] || req.post?.expires_at, nowStamp);
 
                     const [{ id: itemid }] = await db`
                         insert into items ${db({
@@ -406,13 +451,14 @@ export default router => {
                             username: req.session.user,
                             userchannel: 'web',
                             usernetwork: 'web',
-                            stamp: ~~(Date.now() / 1000),
+                            stamp: nowStamp,
                             active: !isApprovalRequired,
                             is_oc: !!is_oc,
                             title: title,
                             visibility: targetVisibility,
-                            slug: itemSlug
-                        }, 'src', 'dest', 'mime', 'size', 'checksum', 'phash', 'username', 'userchannel', 'usernetwork', 'stamp', 'active', 'is_oc', 'title', 'visibility', 'slug')}
+                            slug: itemSlug,
+                            expires_at: targetExpiresAt
+                        }, 'src', 'dest', 'mime', 'size', 'checksum', 'phash', 'username', 'userchannel', 'usernetwork', 'stamp', 'active', 'is_oc', 'title', 'visibility', 'slug', 'expires_at')}
                         RETURNING id
                     `;
 
@@ -466,7 +512,7 @@ export default router => {
                 } else {
                     // ===== REGULAR URL DOWNLOAD (Asynchronous) =====
                     const targetVisibility = getTargetVisibility(req, req.post?.visibility);
-                    const itemSlug = (cfg.enable_item_slugs !== false) ? lib.generateSlug(11) : null;
+                    const itemSlug = lib.generateSlug(11);
 
                     const session = { 
                         id: req.session.id, 
@@ -705,6 +751,7 @@ export default router => {
                             await fs.unlink(source).catch(() => { });
 
                             const insertChecksum = getBypassDuplicateCheck() ? `${checksum}_bypass_${Date.now()}` : checksum;
+                            const targetExpiresAt = calculateExpiresAt(req.post?.expiry || req.headers['x-upload-expiry'] || req.post?.expires_at, nowStamp);
 
                             const [{ id: itemid }] = await db`
                                 insert into items ${db({
@@ -717,13 +764,14 @@ export default router => {
                                     username: session.user,
                                     userchannel: 'web',
                                     usernetwork: 'web',
-                                    stamp: ~~(Date.now() / 1000),
+                                    stamp: nowStamp,
                                     active: !isApprovalRequired,
                                     is_oc: !!is_oc,
                                     title: title,
                                     visibility: targetVisibility,
-                                    slug: itemSlug
-                                }, 'src', 'dest', 'mime', 'size', 'checksum', 'phash', 'username', 'userchannel', 'usernetwork', 'stamp', 'active', 'is_oc', 'title', 'visibility', 'slug')}
+                                    slug: itemSlug,
+                                    expires_at: targetExpiresAt
+                                }, 'src', 'dest', 'mime', 'size', 'checksum', 'phash', 'username', 'userchannel', 'usernetwork', 'stamp', 'active', 'is_oc', 'title', 'visibility', 'slug', 'expires_at')}
                                 RETURNING id
                             `;