From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Oct 2018 13:21:53 +0000 (+0100)
Subject: nopaste: Cleanup expiry time calculation
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b82926a64de9c538663d604db8295772582cb1d;p=ipfire.org.git

nopaste: Cleanup expiry time calculation

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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