MSC4319 is now merged

synapse/rest/client/sync.py

@@ -460,10 +460,7 @@ class SyncRestServlet(RestServlet):
                 invited_state = []
 
             invited_state = list(invited_state)
-            # Add the invite itself
-            #
-            # FIXME: Doesn't seem to be in the spec but tracked by
-            # [MSC4319](https://github.com/matrix-org/matrix-spec-proposals/pull/4319)
+            # MSC4319: Add the invite itself
             invited_state.append(strip_event(room.invite))
             invited[room.room_id] = {"invite_state": {"events": invited_state}}
 
@@ -510,13 +507,10 @@ class SyncRestServlet(RestServlet):
                 knocked_state = []
             knocked_state = list(knocked_state)
 
-            # Append the actual knock membership event itself as well. This provides
-            # the client with:
+            # MSC4319: Append the actual knock membership event itself as well. This
+            # provides the client with:
             #
             # * A knock state event that they can use for easier internal tracking
-            #
-            # FIXME: Doesn't seem to be in the spec but tracked by
-            # [MSC4319](https://github.com/matrix-org/matrix-spec-proposals/pull/4319)
             knocked_state.append(strip_event(room.knock))
 
             # Build the `knock_state` dictionary, which will contain the state of the

synapse/storage/databases/main/events_worker.py

@@ -1175,11 +1175,8 @@ class EventsWorkerStore(SQLBaseStore):
         # Start with the configured default set of stripped state to include
         state_filter = self._room_prejoin_state_types
 
-        # We want to send membership events of the inviter, so that the invitee can
-        # display the inviter's profile information if the room lacks any.
-        #
-        # FIXME: Doesn't seem to be in the spec but tracked by
-        # [MSC4319](https://github.com/matrix-org/matrix-spec-proposals/pull/4319)
+        # MSC4319: We want to send membership events of the inviter, so that the invitee
+        # can display the inviter's profile information if the room lacks any.
         is_invite_event = (
             event.type == EventTypes.Member and event.membership == Membership.INVITE
         )