Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix /sync may contain duplicate EDUs and EDUs for left rooms #752

Merged
merged 5 commits into from Jul 31, 2019

Conversation

@Cnly
Copy link
Collaborator

commented Jul 19, 2019

In 29841be (#718), EDUs are added to /sync responses for rooms listed
in joinedRoomIDs returned by addPDUDeltaToResponse. However this list
may contain rooms other than those currently joined.

Some variable renamings are done to make golangci-lint pass.

Signed-off-by: Alex Chen minecnly@gmail.com

Pull Request Checklist

  • I have added any new tests that need to pass to testfile as specified in docs/sytest.md
  • Pull request includes a sign off
Fix /sync may add EDUs for left rooms
In 29841be (#718), EDUs are added to /sync responses for rooms listed
in joinedRoomIDs returned by addPDUDeltaToResponse. However this list
may contain rooms other than those currently joined.

Some variable renamings are done to make golangci-lint pass.

Signed-off-by: Alex Chen <minecnly@gmail.com>

@Cnly Cnly requested a review from anoadragon453 Jul 19, 2019

@anoadragon453 anoadragon453 added this to In progress in Homeserver Task Board via automation Jul 25, 2019

@anoadragon453 anoadragon453 moved this from In progress to Community PRs in Homeserver Task Board Jul 25, 2019

syncapi/storage/syncserver.go Outdated Show resolved Hide resolved

@Cnly Cnly changed the title Fix /sync may add EDUs for left rooms Fix /sync may contain duplicate EDUs and EDUs for left rooms Jul 25, 2019

Cnly added some commits Jul 25, 2019

Return joinedRoomIDs directly from getStateDeltas
Signed-off-by: Alex Chen <minecnly@gmail.com>
syncapi/storage/syncserver.go Outdated Show resolved Hide resolved

Cnly added some commits Jul 31, 2019

@anoadragon453
Copy link
Member

left a comment

LGTM

@anoadragon453 anoadragon453 merged commit 0dcf0a7 into matrix-org:master Jul 31, 2019

8 checks passed

buildkite/dendrite Build #159 passed (3 minutes, 7 seconds)
Details
buildkite/dendrite/build-slash-go-1-dot-11 Passed (53 seconds)
Details
buildkite/dendrite/build-slash-go-1-dot-12 Passed (56 seconds)
Details
buildkite/dendrite/lint-slash-go-1-dot-12 Passed (1 minute, 55 seconds)
Details
buildkite/dendrite/pipeline Passed (7 seconds)
Details
buildkite/dendrite/unit-tests-slash-go-1-dot-11 Passed (1 minute, 1 second)
Details
buildkite/dendrite/unit-tests-slash-go-1-dot-12 Passed (54 seconds)
Details
ci/circleci: dendrite Your tests passed on CircleCI!
Details

Homeserver Task Board automation moved this from Community PRs to Done Jul 31, 2019

Trion129 pushed a commit to Trion129/dendrite that referenced this pull request Jul 31, 2019

Fix /sync may contain duplicate EDUs and EDUs for left rooms (matrix-…
…org#752)

In 29841be (matrix-org#718), EDUs are added to /sync responses for rooms listed
in joinedRoomIDs returned by addPDUDeltaToResponse. However this list
may contain rooms other than those currently joined.

Some variable renamings are done to make golangci-lint pass.

Signed-off-by: Alex Chen minecnly@gmail.com
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
You can’t perform that action at this time.