From 8b82926a64de9c538663d604db8295772582cb1d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 22 Oct 2018 14:21:53 +0100 Subject: [PATCH] nopaste: Cleanup expiry time calculation Signed-off-by: Michael Tremer --- src/backend/nopaste.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/backend/nopaste.py b/src/backend/nopaste.py index bab855ba..cb621cd9 100644 --- a/src/backend/nopaste.py +++ b/src/backend/nopaste.py @@ -1,4 +1,6 @@ -#!/usr/bin/python +#!/usr/bin/python3 + +import datetime from .misc import Object @@ -10,12 +12,13 @@ class Nopaste(Object): if account: uid = account.uid + if expires: + expires = datetime.datetime.utcnow() + datetime.timedelta(seconds=expires) + # http://blog.00null.net/easily-generating-random-strings-in-postgresql/ res = self.db.get("INSERT INTO nopaste(uuid, subject, content, time_expires, address, \ - uid, mimetype, size) VALUES(random_slug(), %s, %s, \ - (CASE WHEN %s = 0 THEN NULL ELSE NOW() + INTERVAL '%s seconds' END), \ - %s, %s, %s, %s) RETURNING uuid", - subject, content, expires, expires, address, uid, mimetype, len(content)) + uid, mimetype, size) VALUES(random_slug(), %s, %s, %s, %s, %s, %s, %s) RETURNING uuid", + subject, content, expires, address, uid, mimetype, len(content)) if res: return res.uuid -- 2.47.3