kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Allow SlidingSyncStreamToken in /relations

Browse Source
This commit is contained in:
Devon Hudson
2025-10-09 11:28:33 -06:00
parent 4d7826b006
commit 4cb0eeabdf
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
synapse/streams/config.py
View File

@@ -58,19 +58,41 @@ class PaginationConfig:
from_tok_str = parse_string(request, "from")
to_tok_str = parse_string(request, "to")
# Helper function to extract StreamToken from either StreamToken or SlidingSyncStreamToken format
def extract_stream_token(token_str: str) -> str:
"""
Extract the StreamToken portion from a token string.
Handles both:
- StreamToken format: "s123_456_..."
- SlidingSyncStreamToken format: "5/s123_456_..." (extracts part after /)
This allows clients using sliding sync to use their pos tokens
with endpoints like /relations and /messages.
"""
if "/" in token_str:
# SlidingSyncStreamToken format: "connection_position/stream_token"
# Split and return just the stream_token part
parts = token_str.split("/", 1)
if len(parts) == 2:
return parts[1]
return token_str
try:
from_tok = None
if from_tok_str == "END":
from_tok = None # For backwards compat.
elif from_tok_str:
from_tok = await StreamToken.from_string(store, from_tok_str)
stream_token_str = extract_stream_token(from_tok_str)
from_tok = await StreamToken.from_string(store, stream_token_str)
except Exception:
raise SynapseError(400, "'from' parameter is invalid")
try:
to_tok = None
if to_tok_str:
to_tok = await StreamToken.from_string(store, to_tok_str)
stream_token_str = extract_stream_token(to_tok_str)
to_tok = await StreamToken.from_string(store, stream_token_str)
except Exception:
raise SynapseError(400, "'to' parameter is invalid")

2
tests/rest/client/sliding_sync/test_extension_threads.py
View File

@@ -595,7 +595,7 @@ class SlidingSyncThreadsExtensionTestCase(SlidingSyncBase):
# Now use the prev_batch token with /relations endpoint to paginate backwards
channel = self.make_request(
"GET",
f"/_matrix/client/v1/rooms/{room_id}/relations/{thread_root_id}?from={prev_batch}&dir=b",
f"/_matrix/client/v1/rooms/{room_id}/relations/{thread_root_id}?from={prev_batch}&to={sync_pos}&dir=b",
access_token=user1_tok,
)
self.assertEqual(channel.code, 200, channel.json_body)