From 0b186d987bb2936150ca1eff9a3e3f0d2e1f5809 Mon Sep 17 00:00:00 2001 From: Aevann Date: Mon, 2 Oct 2023 11:25:19 +0300 Subject: [PATCH] delete the orgy when it expires --- files/classes/orgy.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/files/classes/orgy.py b/files/classes/orgy.py index d1039d6f42..4aab0e6bad 100644 --- a/files/classes/orgy.py +++ b/files/classes/orgy.py @@ -34,10 +34,12 @@ class Orgy(Base): def get_orgy(v): if not (v and v.allowed_in_chat): return None - t = int(time.time()) - return g.db.query(Orgy).filter( - or_( - Orgy.end_utc == None, - Orgy.end_utc > t, - ) - ).one_or_none() + + orgy = g.db.query(Orgy).one_or_none() + if not orgy: return False + + if orgy.end_utc and orgy.end_utc < time.time(): + g.db.delete(orgy) + return False + + return True