Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
17f977a9
Commit
17f977a9
authored
10 years ago
by
Paul "LeoNerd" Evans
Browse files
Options
Downloads
Patches
Plain Diff
Include 'messages' snapshot in room initialSync
parent
31a049eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/handlers/message.py
+20
-1
20 additions, 1 deletion
synapse/handlers/message.py
tests/rest/test_rooms.py
+4
-0
4 additions, 0 deletions
tests/rest/test_rooms.py
with
24 additions
and
1 deletion
synapse/handlers/message.py
+
20
−
1
View file @
17f977a9
...
...
@@ -308,10 +308,29 @@ class MessageHandler(BaseHandler):
room_id
=
room_id
))
now_token
=
yield
self
.
hs
.
get_event_sources
().
get_current_token
()
limit
=
pagin_config
.
limit
if
pagin_config
else
None
if
limit
is
None
:
limit
=
10
messages
,
token
=
yield
self
.
store
.
get_recent_events_for_room
(
room_id
,
limit
=
limit
,
end_token
=
now_token
.
room_key
,
)
start_token
=
now_token
.
copy_and_replace
(
"
room_key
"
,
token
[
0
])
end_token
=
now_token
.
copy_and_replace
(
"
room_key
"
,
token
[
1
])
defer
.
returnValue
({
"
membership
"
:
member_event
.
membership
,
"
room_id
"
:
room_id
,
#"messages": messages,
"
messages
"
:
{
"
chunk
"
:
[
self
.
hs
.
serialize_event
(
m
)
for
m
in
messages
],
"
start
"
:
start_token
.
to_string
(),
"
end
"
:
end_token
.
to_string
(),
},
"
state
"
:
state
,
#"presence": presence
})
This diff is collapsed.
Click to expand it.
tests/rest/test_rooms.py
+
4
−
0
View file @
17f977a9
...
...
@@ -1050,6 +1050,10 @@ class RoomInitialSyncTestCase(RestTestCase):
self
.
assertTrue
(
"
m.room.create
"
in
state
)
self
.
assertTrue
(
"
messages
"
in
response
)
self
.
assertTrue
(
"
chunk
"
in
response
[
"
messages
"
])
self
.
assertTrue
(
"
end
"
in
response
[
"
messages
"
])
# (code, response) = yield self.mock_resource.trigger("GET", path, None)
# self.assertEquals(200, code, msg=str(response))
# self.assert_dict(json.loads(content), response)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment