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

turt2live merged 24 commits into main from travis/spec/v8-v9

Jan 18, 2022

Member

turt2live commented Sep 8, 2021 •

edited by github-actions bot

Loading

MSCs:

Preview: https://pr3387--matrix-org-previews.netlify.app

turt2live added 2 commits

September 7, 2021 23:11


          Room versions 8 and 9: Restricted rooms

e650fca

MSCs:
* #3083
* #3289
* #3375


          Changelogs

7a5e820

turt2live requested a review from a team

September 8, 2021 05:14

This was referenced Sep 8, 2021

MSC3083: Restricting room membership based on membership in other rooms #3083

Merged

MSC3289: Room version 8 #3289

Merged

MSC3375: Room version 9 #3375

Merged

clokep reviewed

View reviewed changes

content/server-server-api.md Outdated Show resolved Hide resolved

clokep reviewed

View reviewed changes

content/server-server-api.md Outdated Show resolved Hide resolved

clokep reviewed

View reviewed changes

content/server-server-api.md Outdated Show resolved Hide resolved

clokep reviewed

View reviewed changes

data/api/server-server/joins-v1.yaml Outdated Show resolved Hide resolved

clokep reviewed

View reviewed changes

data/api/server-server/joins-v1.yaml Show resolved Hide resolved

clokep reviewed

View reviewed changes

content/rooms/v8.md Outdated Show resolved Hide resolved

clokep reviewed

View reviewed changes

content/rooms/v9.md Outdated Show resolved Hide resolved

turt2live removed the request for review from a team

September 8, 2021 15:45

turt2live marked this pull request as draft

September 8, 2021 15:45

turt2live and others added 4 commits

September 8, 2021 09:46


          Capitalization

Co-authored-by: Patrick Cloke <[email protected]>


          Remove verbiage for spaces because they don't exist

f7f2ea8


          Iterations on text

2ccae80


          Merge remote-tracking branch 'origin/travis/spec/v8-v9' into travis/s…

e3b7735

…pec/v8-v9

turt2live requested a review from clokep

September 8, 2021 22:13


          Another clarification

db2a738

clokep reviewed

View reviewed changes

Member

clokep left a comment

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 added 2 commits

September 24, 2021 15:13


          Make error code descriptions consistent

c613d2e


          Merge remote-tracking branch 'origin/main' into travis/spec/v8-v9

d521f25

turt2live marked this pull request as ready for review

September 24, 2021 21:13

turt2live requested a review from a team

September 24, 2021 21:13


          Apply consistency

157f750


          Add changelogs

42195ca

richvdh reviewed

View reviewed changes

changelogs/room_versions/newsfragments/3387.feature.1 Show resolved Hide resolved

richvdh reviewed

View reviewed changes

content/client-server-api/_index.md Show resolved Hide resolved

richvdh requested changes

View reviewed changes

Member

richvdh left a comment

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

Member

richvdh Jan 7, 2022

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

Member Author

turt2live Jan 10, 2022

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

richvdh reviewed

View reviewed changes

content/server-server-api.md Outdated Show resolved Hide resolved

turt2live and others added 3 commits

January 9, 2022 19:46


          Review part 1

56bf4a4


          Apply suggestions from code review

245cc17

Co-authored-by: Richard van der Hoff <[email protected]>


          Split out redaction sections

fd82238

Member Author

turt2live commented Jan 10, 2022

blocked on internal SCT review.

turt2live added the blocked label

Member Author

turt2live commented Jan 10, 2022

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.


          Clarify general case of join conditions

cc65d8a

turt2live removed the blocked label

turt2live requested a review from richvdh

January 18, 2022 00:33

Member Author

turt2live commented Jan 18, 2022

@richvdh this should be ready for re-review.

richvdh reviewed

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

Member

richvdh Jan 18, 2022

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.

Member Author

turt2live Jan 18, 2022

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.

Member Author

turt2live Jan 18, 2022

richvdh approved these changes

View reviewed changes

Member

richvdh left a comment

generally seems fine, maybe a couple of nits


          Update diagram

e58bc1b

turt2live merged commit 6c4aabd into main

turt2live deleted the travis/spec/v8-v9 branch

January 18, 2022 16:55

gnieto mentioned this pull request

Missing knock rule on v7 room #3648

Closed

clokep mentioned this pull request

MSC3589: Room version 9 as the default room version #3589

Merged

S7evinK mentioned this pull request

Declare support for Matrix 1.2 matrix-org/dendrite#3218

Open

16 tasks

DMRobertson mentioned this pull request

S2S v1 send_join: event response property not documented matrix-org/matrix-spec#1515

Open

richvdh mentioned this pull request

Clarify that join events only need to be signed by resident servers if using join_authorised_via_users_server matrix-org/matrix-spec#1708

Closed

matrixbot mentioned this pull request

Declare support for Matrix 1.2 element-hq/dendrite#3218

Open

16 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet