From e0304c627bf01ce908dca56e97f0b870202355f3 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 23 Jan 2026 14:41:06 +0000 Subject: [PATCH] `created_at` -> `created_at_sec` --- .../synapse/synapse_guest_module/guest_module.py | 6 +++--- .../guest_registration_servlet.py | 11 +++++++++-- .../synapse/synapse_guest_module/guest_user_reaper.py | 2 +- modules/restricted-guests/synapse/tests/__init__.py | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/restricted-guests/synapse/synapse_guest_module/guest_module.py b/modules/restricted-guests/synapse/synapse_guest_module/guest_module.py index 7f53f5052e..93092a9be2 100644 --- a/modules/restricted-guests/synapse/synapse_guest_module/guest_module.py +++ b/modules/restricted-guests/synapse/synapse_guest_module/guest_module.py @@ -219,15 +219,15 @@ class GuestModule: CREATE TABLE IF NOT EXISTS guest_module_mas_users ( mas_user_id TEXT PRIMARY KEY, user_id TEXT, - created_at BIGINT NOT NULL + created_at_sec BIGINT NOT NULL ) """, (), ) txn.execute( """ - CREATE INDEX IF NOT EXISTS guest_module_mas_users_created_at - ON guest_module_mas_users (created_at) + CREATE INDEX IF NOT EXISTS guest_module_mas_users_created_at_sec + ON guest_module_mas_users (created_at_sec) """, (), ) diff --git a/modules/restricted-guests/synapse/synapse_guest_module/guest_registration_servlet.py b/modules/restricted-guests/synapse/synapse_guest_module/guest_registration_servlet.py index 41257e5726..0d5dd51b7c 100644 --- a/modules/restricted-guests/synapse/synapse_guest_module/guest_registration_servlet.py +++ b/modules/restricted-guests/synapse/synapse_guest_module/guest_registration_servlet.py @@ -135,7 +135,14 @@ class GuestRegistrationServlet(DirectServeJsonResource): return 500, {"msg": "Internal error: Could not find a free username"} - async def _store_mas_user(self, mas_user_id: str, user_id: str, created_at: int) -> None: + async def _store_mas_user(self, mas_user_id: str, user_id: str, created_at_sec: int) -> None: + """Store details about the MAS user in the DB + + Args: + mas_user_id: The MAS user ID + user_id: The Matrix user ID + created_at_sec: The creation timestamp in seconds since the unix epoch + """ if self._mas_tables_ready is not None: await self._mas_tables_ready.wait() @@ -146,7 +153,7 @@ class GuestRegistrationServlet(DirectServeJsonResource): values={ "mas_user_id": mas_user_id, "user_id": user_id, - "created_at": created_at, + "created_at_sec": created_at_sec, }, ) diff --git a/modules/restricted-guests/synapse/synapse_guest_module/guest_user_reaper.py b/modules/restricted-guests/synapse/synapse_guest_module/guest_user_reaper.py index dd2163b428..24fd5db2ce 100644 --- a/modules/restricted-guests/synapse/synapse_guest_module/guest_user_reaper.py +++ b/modules/restricted-guests/synapse/synapse_guest_module/guest_user_reaper.py @@ -121,7 +121,7 @@ class GuestUserReaper: """ SELECT mas_user_id FROM guest_module_mas_users - WHERE created_at < ? + WHERE created_at_sec < ? """, (expire_ts_seconds,), ) diff --git a/modules/restricted-guests/synapse/tests/__init__.py b/modules/restricted-guests/synapse/tests/__init__.py index b97dd1c45b..f62fc2cbf4 100644 --- a/modules/restricted-guests/synapse/tests/__init__.py +++ b/modules/restricted-guests/synapse/tests/__init__.py @@ -160,5 +160,5 @@ def _setup_db(conn: sqlite3.Connection) -> None: "CREATE TABLE users(name text, deactivated smallint, creation_ts bigint)" ) conn.execute( - "CREATE TABLE guest_module_mas_users(mas_user_id text, user_id text, created_at bigint)" + "CREATE TABLE guest_module_mas_users(mas_user_id text, user_id text, created_at_sec bigint)" )