Revert "Drop unused tables & unneeded access token ID for events. (#1…

…6268)" (#16465) This reverts commit cabd577. There are additional usages of these tables which need to be removed first.
matrix-org · Oct 12, 2023 · 4cc729d · 4cc729d
1 parent f710d54
commit 4cc729d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 29 deletions.
diff --git a/changelog.d/16268.misc b/changelog.d/16268.misc
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
@@ -693,9 +693,13 @@ async def create_event(
         if require_consent and not is_exempt:
             await self.assert_accepted_privacy_policy(requester)
 
-        # Save the the device ID and the transaction ID in the event internal metadata.
-        # This is useful to determine if we should echo the transaction_id in events.
+        # Save the access token ID, the device ID and the transaction ID in the event
+        # internal metadata. This is useful to determine if we should echo the
+        # transaction_id in events.
         # See `synapse.events.utils.EventClientSerializer.serialize_event`
+        if requester.access_token_id is not None:
+            builder.internal_metadata.token_id = requester.access_token_id
+
         if requester.device_id is not None:
             builder.internal_metadata.device_id = requester.device_id
 

diff --git a/synapse/storage/schema/__init__.py b/synapse/storage/schema/__init__.py
@@ -125,8 +125,8 @@
 
 
 SCHEMA_COMPAT_VERSION = (
-    # The event_txn_id table and tables from MSC2716 no longer exist.
-    82
+    # The `event_txn_id_device_id` must be written to for new events.
+    80
 )
 """Limit on how far the synapse codebase can be rolled back without breaking db compat
 

diff --git a/synapse/storage/schema/main/delta/82/03_drop_old_tables.sql b/synapse/storage/schema/main/delta/82/03_drop_old_tables.sql