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.

Sign up for GitHub

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

Jump to bottom

Room versions 8 and 9: Restricted rooms #3387

Merged
merged 24 commits into from
Jan 18, 2022
Merged

Room versions 8 and 9: Restricted rooms #3387

merged 24 commits into from
Jan 18, 2022

Conversation

turt2live
Copy link
Member

@turt2live turt2live commented Sep 8, 2021 •
edited by github-actions bot
Loading

@turt2live turt2live requested a review from a team September 8, 2021 05:14
This was referenced Sep 8, 2021
Merged
Merged
Merged
clokep
clokep reviewed Sep 8, 2021
View reviewed changes
content/server-server-api.md Outdated Show resolved Hide resolved
clokep
clokep reviewed Sep 8, 2021
View reviewed changes
content/server-server-api.md Outdated Show resolved Hide resolved
clokep
clokep reviewed Sep 8, 2021
View reviewed changes
content/server-server-api.md Outdated Show resolved Hide resolved
clokep
clokep reviewed Sep 8, 2021
View reviewed changes
content/rooms/v8.md Outdated Show resolved Hide resolved
clokep
clokep reviewed Sep 8, 2021
View reviewed changes
content/rooms/v9.md Outdated Show resolved Hide resolved
@turt2live turt2live removed the request for review from a team September 8, 2021 15:45
@turt2live turt2live marked this pull request as draft September 8, 2021 15:45
clokep
clokep reviewed Sep 10, 2021
View reviewed changes
Copy link
Member

@clokep clokep left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good except for a couple of inconsistencies!

data/api/server-server/joins-v1.yaml Outdated Show resolved Hide resolved
data/api/server-server/joins-v2.yaml Outdated Show resolved Hide resolved
@turt2live turt2live marked this pull request as ready for review September 24, 2021 21:13
@turt2live turt2live requested a review from a team September 24, 2021 21:13
@turt2live
Copy link
Member Author

@richvdh this is ready for re-review. I've broken the commits down since your last review roughly by related review threads, though it's still not the clearest thing (sorry).

This also now adopts all the "fully specify room versions" and "added in vX" stuff.

richvdh
richvdh requested changes Jan 7, 2022
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for your work on this!

I'm afraid I'd completely paged out where we'd got to previously, so unlucky for you, you get a complete re-review. A few bits and bobs, hopefully nothing major.

content/client-server-api/_index.md Show resolved Hide resolved
content/client-server-api/_index.md Outdated Show resolved Hide resolved
content/client-server-api/_index.md Show resolved Hide resolved
content/client-server-api/_index.md Outdated Show resolved Hide resolved
data/event-schemas/schema/m.room.join_rules.yaml Show resolved Hide resolved
content/rooms/fragments/v8-auth-rules.md Outdated Show resolved Hide resolved
content/rooms/v8.md Outdated Show resolved Hide resolved
content/rooms/v8.md Outdated Show resolved Hide resolved
content/rooms/v8.md Show resolved Hide resolved
data/api/server-server/definitions/send_join_response.yaml
title: SignedMembershipEvent
x-addedInMatrixVersion: "1.2"
description: |-
Required if the room version [supports restricted join rules](/rooms/#feature-matrix). The signed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be always required as of this matrix version.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MSC doesn't call for this, and Synapse doesn't appear to check it that way. Source?

turt2live and others added 3 commits January 9, 2022 19:46
@turt2live
Review part 1
56bf4a4
@turt2live @richvdh
Apply suggestions from code review
245cc17 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@turt2live
Split out redaction sections
fd82238
@turt2live
Copy link
Member Author

blocked on internal SCT review.

@turt2live turt2live added the blocked Something needs to be done before action can be taken on this PR/issue. label Jan 10, 2022
@turt2live
Copy link
Member Author

conclusion from internally appears to be that these do indeed only affect requests with the given room version - to capture the nuance, we'll probably want to look at adjusting the "Joining Rooms" section of the spec to cover signatures, residents, etc.

The original worry was that suggestions to change the spec implied that the process was changed universally, which is not the case.

Still blocked on me adapting the notes to the PR though.

@turt2live turt2live removed the blocked Something needs to be done before action can be taken on this PR/issue. label Jan 18, 2022
@turt2live
Copy link
Member Author

@richvdh this should be ready for re-review.

richvdh
richvdh reviewed Jan 18, 2022
View reviewed changes
content/client-server-api/_index.md Show resolved Hide resolved
content/rooms/v7.md
@@ -199,6 +199,10 @@ completeness.

{{% rver-fragment name="v4-event-format" %}}

### Handling redactions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it'd be nice if we could figure out what order these things go in (in v5 'Handling redactions' is before 'Event IDs' and 'Event format'), but I guess I'm just nit-picking really.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they're supposed to be consistent, but that ship sailed when I thought they were consistent last time. Will attempt to fix in a future PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#3656

richvdh
richvdh approved these changes Jan 18, 2022
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generally seems fine, maybe a couple of nits

@turt2live turt2live merged commit 6c4aabd into main Jan 18, 2022
@turt2live turt2live deleted the travis/spec/v8-v9 branch January 18, 2022 16:55
@gnieto gnieto mentioned this pull request Jan 19, 2022
Closed
@clokep clokep mentioned this pull request Jan 26, 2022
Merged
@S7evinK S7evinK mentioned this pull request Sep 29, 2023
Open
16 tasks
@DMRobertson DMRobertson mentioned this pull request Dec 6, 2023
Open
@richvdh richvdh mentioned this pull request Jun 4, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clokep clokep clokep approved these changes

@richvdh richvdh richvdh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Spec Core Team Backlog
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@turt2live @richvdh @anoadragon453 @clokep