Merge 3c17aa3789 into 2f6867348f

Replace Twitter link in footer with Masto/Bluesky (#2282 )
Add changelog
2026-04-29 13:54:10 +02:00 · 2025-12-21 12:01:52 -07:00 · 2025-12-19 15:59:08 +00:00 · 2025-07-25 10:44:39 +02:00 · 2025-07-25 09:56:33 +02:00
4 changed files with 39 additions and 15 deletions
--- a/changelogs/client_server/newsfragments/2181.clarification
+++ b/changelogs/client_server/newsfragments/2181.clarification
@ -0,0 +1,2 @@
+Clarify that the stripped state in `invite_state` and `knock_state` in `GET /sync` response must
+include the full `m.room.member` event of the user.
--- a/changelogs/internal/newsfragments/2282.clarification
+++ b/changelogs/internal/newsfragments/2282.clarification
@ -0,0 +1 @@
+Replace the Twitter link in the footer with our BlueSky and Mastodon socials.
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@ -106,25 +106,30 @@ sidebar_menu_compact = true
 #   desc = "Matrix on GitHub"
 # Custom links shown in the center of the footer. (Only supported by our fork of docsy's 'footer/central' partial.)
 [[params.links.bottom]]
-	name = "GitHub"
-	url = "https://github.com/matrix-org"
-	icon = "fab fa-github"
+  name = "GitHub"
+  url = "https://github.com/matrix-org"
+  icon = "fab fa-github"
  desc = "Matrix on GitHub"
 [[params.links.bottom]]
-	name = "GitLab"
-	url = "https://gitlab.matrix.org/matrix-org"
-	icon = "fab fa-gitlab"
+  name = "GitLab"
+  url = "https://gitlab.matrix.org/matrix-org"
+  icon = "fab fa-gitlab"
  desc = "Matrix on GitLab"
 [[params.links.bottom]]
-	name = "YouTube"
-	url = "https://www.youtube.com/channel/UCVFkW-chclhuyYRbmmfwt6w"
-	icon = "fab fa-youtube"
+  name = "YouTube"
+  url = "https://www.youtube.com/channel/UCVFkW-chclhuyYRbmmfwt6w"
+  icon = "fab fa-youtube"
  desc = "Matrix YouTube channel"
 [[params.links.bottom]]
-	name = "Twitter"
-	url = "https://twitter.com/matrixdotorg"
-	icon = "fab fa-x-twitter"
-  desc = "Matrix on Twitter"
+  name = "Mastodon"
+  url = "https://mastodon.matrix.org/@matrix"
+  icon = "fab fa-mastodon"
+  desc = "Matrix on Mastodon"
+[[params.links.bottom]]
+  name = "Bluesky"
+  url = "https://bsky.app/profile/matrix.org"
+  icon = "fab fa-bluesky"
+  desc = "Matrix on Bluesky"


 # configuration for the hugo development server
--- a/data/api/client-server/sync.yaml
+++ b/data/api/client-server/sync.yaml
@ -374,8 +374,14 @@ paths:
                                    description: |-
                                      The [stripped state events](/client-server-api/#stripped-state) that form the
                                      invite state.
+
+                                      MUST also include the `m.room.member` event of the user with a membership of
+                                      `invite`, and using the same event format as joined rooms with the `event_id`
+                                      and `origin_server_ts` fields.
                                    items:
-                                      $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                      anyOf:
+                                        - $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                        - $ref: definitions/client_event_without_room_id.yaml
                                    type: array
                      knock:
                        title: Knocked rooms
@ -399,8 +405,14 @@ paths:
                                    description: |-
                                      The [stripped state events](/client-server-api/#stripped-state) that form the
                                      knock state.
+
+                                      MUST also include the `m.room.member` event of the user with a membership of
+                                      `knock`, and using the same event format as joined rooms with the `event_id` and
+                                      `origin_server_ts` fields.
                                    items:
-                                      $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                      anyOf:
+                                        - $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                        - $ref: definitions/client_event_without_room_id.yaml
                                    type: array
                      leave:
                        title: Left rooms
@ -633,6 +645,8 @@ paths:
                                "sender": "@alice:example.com",
                                "type": "m.room.member",
                                "state_key": "@bob:example.com",
+                                "event_id": "$19dl9d3848dJLle:example.com",
+                                "origin_server_ts": 1432735439654,
                                "content": {
                                  "membership": "invite"
                                }
@ -657,6 +671,8 @@ paths:
                                "sender": "@bob:example.com",
                                "type": "m.room.member",
                                "state_key": "@bob:example.com",
+                                "event_id": "$Fg83Kl3764di23a:example.com",
+                                "origin_server_ts": 143273039402,
                                "content": {
                                  "membership": "knock"
                                }
Author	SHA1	Message	Date
Kévin Commaille	adf7ba6358	Merge `3c17aa3789` into `2f6867348f`	2025-12-21 12:01:52 -07:00
Andrew Morgan	2f6867348f	Replace Twitter link in footer with Masto/Bluesky (#2282 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details	2025-12-19 15:59:08 +00:00
Kévin Commaille	3c17aa3789	Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-07-25 10:44:39 +02:00
Kévin Commaille	506bc1a164	Clarify that stripped state in /sync response must include `m.room.member` event of user And that event has the same format as in join rooms, with `event_id` and `origin_server_ts`. This has always been the case in homeserver implementations. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-07-25 09:56:33 +02:00
				`@ -0,0 +1 @@`
				`Replace the Twitter link in the footer with our BlueSky and Mastodon socials.`