Add a constant for m.federate. (#10775)

changelog.d/10775.misc

@@ -0,0 +1 @@
+Add a constant for `m.federate`.

synapse/api/constants.py

@@ -198,6 +198,9 @@ class EventContentFields:
  # cf https://github.com/matrix-org/matrix-doc/pull/1772
  ROOM_TYPE = "type"
 
+ # Whether a room can federate.
+ FEDERATE = "m.federate"
+
  # The creator of the room, as used in `m.room.create` events.
  ROOM_CREATOR = "creator"
 

synapse/event_auth.py

@@ -21,7 +21,13 @@
 from signedjson.sign import SignatureVerifyException, verify_signed_json
 from unpaddedbase64 import decode_base64
 
-from synapse.api.constants import MAX_PDU_SIZE, EventTypes, JoinRules, Membership
+from synapse.api.constants import (
+ MAX_PDU_SIZE,
+ EventContentFields,
+ EventTypes,
+ JoinRules,
+ Membership,
+)
 from synapse.api.errors import AuthError, EventSizeError, SynapseError
 from synapse.api.room_versions import (
  KNOWN_ROOM_VERSIONS,
@@ -236,7 +242,7 @@ def _can_federate(event: EventBase, auth_events: StateMap[EventBase]) -> bool:
  if not creation_event:
  return False
 
- return creation_event.content.get("m.federate", True) is True
+ return creation_event.content.get(EventContentFields.FEDERATE, True) is True
 
 
 def _is_membership_change_allowed(

synapse/handlers/register.py

@@ -21,7 +21,13 @@
 from typing_extensions import TypedDict
 
 from synapse import types
-from synapse.api.constants import MAX_USERID_LENGTH, EventTypes, JoinRules, LoginType
+from synapse.api.constants import (
+ MAX_USERID_LENGTH,
+ EventContentFields,
+ EventTypes,
+ JoinRules,
+ LoginType,
+)
 from synapse.api.errors import AuthError, Codes, ConsentNotGivenError, SynapseError
 from synapse.appservice import ApplicationService
 from synapse.config.server import is_threepid_reserved
@@ -405,7 +411,7 @@ async def _create_and_join_rooms(self, user_id: str) -> None:
 
  # Choose whether to federate the new room.
  if not self.hs.config.registration.autocreate_auto_join_rooms_federated:
- stub_config["creation_content"] = {"m.federate": False}
+ stub_config["creation_content"] = {EventContentFields.FEDERATE: False}
 
  for r in self.hs.config.registration.auto_join_rooms:
  logger.info("Auto-joining %s to %s", user_id, r)

synapse/handlers/room.py

@@ -390,9 +390,9 @@ async def clone_existing_room(
  old_room_create_event = await self.store.get_create_event_for_room(old_room_id)
 
  # Check if the create event specified a non-federatable room
- if not old_room_create_event.content.get("m.federate", True):
+ if not old_room_create_event.content.get(EventContentFields.FEDERATE, True):
  # If so, mark the new room as non-federatable as well
- creation_content["m.federate"] = False
+ creation_content[EventContentFields.FEDERATE] = False
 
  initial_state = {}
 

synapse/handlers/room_list.py

@@ -313,7 +313,9 @@ async def generate_room_entry(
 
  # Return whether this room is open to federation users or not
  create_event = current_state[EventTypes.Create, ""]
- result["m.federate"] = create_event.content.get("m.federate", True)
+ result["m.federate"] = create_event.content.get(
+ EventContentFields.FEDERATE, True
+ )
 
  name_event = current_state.get((EventTypes.Name, ""))
  if name_event:

synapse/handlers/stats.py

@@ -254,7 +254,7 @@ async def _handle_deltas(
 
  elif typ == EventTypes.Create:
  room_state["is_federatable"] = (
- event_content.get("m.federate", True) is True
+ event_content.get(EventContentFields.FEDERATE, True) is True
  )
  elif typ == EventTypes.JoinRules:
  room_state["join_rules"] = event_content.get("join_rule")

synapse/storage/databases/main/stats.py

@@ -22,7 +22,7 @@
 
 from twisted.internet.defer import DeferredLock
 
-from synapse.api.constants import EventTypes, Membership
+from synapse.api.constants import EventContentFields, EventTypes, Membership
 from synapse.api.errors import StoreError
 from synapse.storage.database import DatabasePool
 from synapse.storage.databases.main.state_deltas import StateDeltasStore
@@ -590,7 +590,7 @@ def _fetch_current_state_stats(txn):
  room_state["canonical_alias"] = event.content.get("alias")
  elif event.type == EventTypes.Create:
  room_state["is_federatable"] = (
- event.content.get("m.federate", True) is True
+ event.content.get(EventContentFields.FEDERATE, True) is True
  )
 
  await self.update_room_state(room_id, room_state)