Merge 3c17aa3789 into 13aa6e83ae

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

assets/js/versions.template.js

@@ -44,10 +44,10 @@ function appendVersion(parent, name, segment, url) {
     // The list item
     const li = document.createElement("li");
     if (segment === selected) {
-        li.classList.add("selected");
+        li.classList.add("version-picker-selected");
     }
     if (segment === "latest") {
-        li.classList.add("latest");
+        li.classList.add("version-picker-latest");
     }
     parent.appendChild(li);
 

assets/scss/_styles_project.scss

@@ -57,18 +57,13 @@ Custom SCSS for the Matrix spec
     overflow-y: auto;
   }
 
-  /* As these styles are only applied by JavaScript, PurgeCSS doesn't see them
-   * in the source code and removes them unless we explicitly tell it not to.
-   */
-  /* purgecss start ignore */
-  ul#version-selector li.selected a {
+  ul#version-selector li.version-picker-selected a {
     font-weight: bold;
   }
 
-  ul#version-selector li.latest a {
+  ul#version-selector li.version-picker-latest a {
     color: $secondary;
   }
-  /* purgecss end ignore */
 }
 
 /* Styles for the sidebar nav */

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.

changelogs/internal/newsfragments/2264.clarification

@@ -0,0 +1 @@
+Add version picker in the navbar.

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"
                                 }

postcss.config.js

@@ -16,6 +16,9 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
             extensions: ["json"],
         },
     ],
+    // As these classes are only applied by JavaScript, PurgeCSS doesn't see them
+    // in the source code and removes them unless we explicitly tell it not to.
+    safelist: ['version-picker-selected', 'version-picker-latest']
 });
 
 module.exports = {