From 2ae41738da72af80bcfd5b08e0d5ddcdc7f74259 Mon Sep 17 00:00:00 2001
From: Collin Pendleton <collinp@collinpendleton.com>
Date: Sun, 22 Dec 2024 12:47:45 -0600
Subject: [PATCH 1/2] rm old webkit 4.0

---
 .github/workflows/build-tauri-clients.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-tauri-clients.yml b/.github/workflows/build-tauri-clients.yml
index 8ce59b47..7339bdf9 100644
--- a/.github/workflows/build-tauri-clients.yml
+++ b/.github/workflows/build-tauri-clients.yml
@@ -99,7 +99,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -qy libgtk-3-dev
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: wasm-addition
         run: |

From 6695890fe9ce19bd59d0679bd78a659a1163aceb Mon Sep 17 00:00:00 2001
From: Collin Pendleton <collinp@collinpendleton.com>
Date: Sun, 22 Dec 2024 13:42:49 -0600
Subject: [PATCH 2/2] modify add user to accept gets

---
 database_functions/functions.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/database_functions/functions.py b/database_functions/functions.py
index 4fd43350..49c28588 100644
--- a/database_functions/functions.py
+++ b/database_functions/functions.py
@@ -447,6 +447,7 @@ def add_person_podcast(cnx, database_type, podcast_values, user_id, username=Non
 def add_user(cnx, database_type, user_values):
     cursor = cnx.cursor()
     try:
+        print(f"Adding user with values: {user_values}")
         if database_type == "postgresql":
             add_user_query = """
                 INSERT INTO "Users"
@@ -469,18 +470,19 @@ def add_user(cnx, database_type, user_values):
             if result is None:
                 raise Exception("Failed to create user - no ID returned")
 
-            # Handle both tuple and dict return types
-            user_id = result[0] if isinstance(result, tuple) else result.get('userid', result[0])
+            # Print the result for debugging
+            print(f"Raw PostgreSQL result: {result}")
+            logging.debug(f"Raw PostgreSQL result: {result}")
 
-            if not user_id:
-                raise Exception("Failed to create user - invalid ID returned")
+            # Handle different return types
+            if isinstance(result, dict):
+                # Try different case variations
+                user_id = result.get('userid') or result.get('UserID') or result.get('userId') or result.get('user_id')
+            else:
+                user_id = result[0]
 
-            logging.debug(f"PostgreSQL insert result: {result}, extracted user_id: {user_id}")
-        else:
-            user_id = cursor.lastrowid
             if not user_id:
-                raise Exception("Failed to create user - no ID returned")
-
+                raise Exception("Failed to create user - invalid ID returned")
         # Add user settings
         settings_query = """
             INSERT INTO "UserSettings"