From f51efdf3e780e03e2b4e1bd91473f856e166af40 Mon Sep 17 00:00:00 2001
From: Fingadumbledore <53864355+Fingadumbledore@users.noreply.github.com>
Date: Sun, 5 Feb 2023 13:45:45 +0100
Subject: [PATCH] =?UTF-8?q?aufr=C3=A4umen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server.py | 43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/server.py b/server.py
index 2467d94..f225ba5 100644
--- a/server.py
+++ b/server.py
@@ -187,64 +187,49 @@ def server():
         con = sqlite3.connect("party.db")
         cur = con.cursor()
         l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;"
-        eventname = [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        eventname = [i[0] for i in return_dbcon(l)]
 
         l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;"
-        eventzeit = [i[0] for i in cur.execute(l).fetchall()]
-        #eventtime = re.split(',', eventzeit)
-        con.commit()
+        eventzeit = [i[0] for i in return_dbcon(l)]
 
         creator =  [i[0] for i in cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall()]
         con.commit()
 
         l = f"SELECT count(username) FROM user WHERE sessionID = \'{id}\';"
-        useranzahl = cur.execute(l).fetchall()
+        useranzahl = return_dbcon(l)
 
         l = f"SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\' ORDER BY mateanzahl;"
-        mate = cur.execute(l).fetchall()
-        con.commit()
+        mate = return_dbcon(l)
 
         l = f"SELECT  Spielname FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;"
-        game = [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        game = [i[0] for i in return_dbcon(l)
 
         l = f"SELECT userID FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;"
-        user = [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        user = [i[0] for i in return_dbcon(l)
 
         l = f"SELECT Spielaktivität FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;"
-        aktivitaet = [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        aktivitaet = [i[0] for i in return_dbcon(l)
 
         l = f"SELECT username FROM user WHERE sessionID = \'{id}\';"
-        unames =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        unames =  [i[0] for i in return_dbcon(l)
 
         l = f"SELECT userID FROM user WHERE sessionID = \'{id}\';"
-        uids =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        uids =  [i[0] for i in return_dbcon(l)
 
         l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;"
-        zeit =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
-
+        zeit =  [i[0] for i in return_dbcon(l)
 
         l = f"SELECT Punkte FROM pointgame WHERE sessionID = \'{id}\' ORDER BY Punkte;"
-        p_punkte =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        p_punkte =  [i[0] for i in return_dbcon(l)
 
         l = f"SELECT Spielname FROM pointgame WHERE sessionID = \'{id}\' ORDER BY Punkte;"
-        p_game =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        p_game =  [i[0] for i in return_dbcon(l)
 
         l = f"SELECT Spielaktivität FROM pointgame WHERE sessionID = \'{id}\' ORDER BY Punkte;"
-        p_aktivitaet =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        p_aktivitaet =  [i[0] for i in return_dbcon(l)
 
         l = f"SELECT userID FROM pointgame WHERE sessionID = \'{id}\'ORDER BY Punkte;"
-        p_user =  [i[0] for i in cur.execute(l).fetchall()]
-        con.commit()
+        p_user =  [i[0] for i in return_dbcon(l)
         cur.close()