apply suggestions

Author: FrenchGithubUser

changelog.d/19722.feature

@@ -1 +1 @@
-MSC4311: invites and knocks should contain the create event. Contributed by @FrenchGithubUser @Famedly
+Partial [MSC4311](https://github.com/matrix-org/matrix-spec-proposals/pull/4311) implementation: `m.room.create` is now a required part of stripped `invite_state`/`knock_state` . Contributed by @FrenchGithubUser @Famedly.

tests/config/test_api.py

@@ -5,7 +5,6 @@
 from synapse.config import ConfigError
 from synapse.config._base import RootConfig
 from synapse.config.api import ApiConfig
-from synapse.types.state import StateFilter
 
 DEFAULT_PREJOIN_STATE_PAIRS = {
     ("m.room.join_rules", ""),

tests/rest/client/test_sync.py

@@ -418,17 +418,15 @@ def test_create_event_present_in_invite_state(self) -> None:
         invitee_tok = self.login("invitee", "pass")
 
         room_id = self.helper.create_room_as(inviter, tok=inviter_tok)
-        self.helper.invite(
-            room=room_id, src=inviter, targ="@invitee:test", tok=inviter_tok
-        )
+        self.helper.invite(room=room_id, src=inviter, targ=invitee, tok=inviter_tok)
 
         channel = self.make_request("GET", "/sync", access_token=invitee_tok)
         self.assertEqual(channel.code, 200, channel.json_body)
 
         invite_state_events = channel.json_body["rooms"]["invite"][room_id][
             "invite_state"
         ]["events"]
-        event_types = {e["type"] for e in invite_state_events}
+        event_types = {stripped_event["type"] for stripped_event in invite_state_events}
         self.assertIn(EventTypes.Create, event_types)
 
     def test_create_event_present_in_knock_state(self) -> None:
@@ -448,27 +446,15 @@ def test_create_event_present_in_knock_state(self) -> None:
             tok=host_tok,
         )
 
-        channel = self.make_request("GET", "/sync", access_token=knocker_tok)
-        self.assertEqual(channel.code, 200, channel.json_body)
-        next_batch = channel.json_body["next_batch"]
-
-        channel = self.make_request(
-            "POST",
-            f"/_matrix/client/r0/knock/{room_id}",
-            b"{}",
-            knocker_tok,
-        )
-        self.assertEqual(200, channel.code, channel.result)
+        self.helper.knock(room_id, knocker, tok=knocker_tok)
 
-        channel = self.make_request(
-            "GET", f"/sync?since={next_batch}", access_token=knocker_tok
-        )
+        channel = self.make_request("GET", "/sync", access_token=knocker_tok)
         self.assertEqual(channel.code, 200, channel.json_body)
 
         knock_state_events = channel.json_body["rooms"]["knock"][room_id][
             "knock_state"
         ]["events"]
-        event_types = {e["type"] for e in knock_state_events}
+        event_types = {stripped_event["type"] for stripped_event in knock_state_events}
         self.assertIn(EventTypes.Create, event_types)