Remove unused config fields

config/bridge.go

@@ -77,7 +77,6 @@ type BridgeConfig struct {
 
 	PortalMessageBuffer int `yaml:"portal_message_buffer"`
 
-	SyncWithCustomPuppets bool `yaml:"sync_with_custom_puppets"`
 	SyncDirectChatList    bool `yaml:"sync_direct_chat_list"`
 	FederateRooms         bool `yaml:"federate_rooms"`
 	DefaultBridgeReceipts bool `yaml:"default_bridge_receipts"`

config/upgrade.go

@@ -38,7 +38,6 @@ func DoUpgrade(helper *up.Helper) {
 	helper.Copy(up.Bool, "bridge", "workspace_avatar_in_rooms")
 	helper.Copy(up.Int, "bridge", "participant_sync_count")
 	helper.Copy(up.Bool, "bridge", "participant_sync_only_on_create")
-	helper.Copy(up.Bool, "bridge", "sync_with_custom_puppets")
 	helper.Copy(up.Bool, "bridge", "sync_direct_chat_list")
 	helper.Copy(up.Bool, "bridge", "federate_rooms")
 	if legacyPrivateChatPortalMeta, ok := helper.Get(up.Bool, "bridge", "private_chat_portal_meta"); ok {
@@ -55,7 +54,6 @@ func DoUpgrade(helper *up.Helper) {
 	helper.Copy(up.Map, "bridge", "double_puppet_server_map")
 	helper.Copy(up.Bool, "bridge", "double_puppet_allow_discovery")
 	helper.Copy(up.Map, "bridge", "login_shared_secret_map")
-	helper.Copy(up.Map, "bridge", "message_handling_timeout")
 	helper.Copy(up.Str, "bridge", "command_prefix")
 	helper.Copy(up.Str, "bridge", "management_room_text", "welcome")
 	helper.Copy(up.Str, "bridge", "management_room_text", "welcome_connected")

example-config.yaml

@@ -65,7 +65,6 @@ appservice:
 
     # Whether or not to receive ephemeral events via appservice transactions.
     # Requires MSC2409 support (i.e. Synapse 1.22+).
-    # You should disable bridge -> sync_with_custom_puppets when this is enabled.
     ephemeral_events: true
 
     # Should incoming events be handled asynchronously?
@@ -145,8 +144,6 @@ bridge:
     # If you want participants to always be accurately synced, set participant_sync_count to a high value and this to false.
     participant_sync_only_on_create: true
 
-    # Should the bridge sync with double puppeting to receive EDUs that aren't normally sent to appservices.
-    sync_with_custom_puppets: false
     # Should the bridge update the m.direct account data event when double puppeting is enabled.
     # Note that updating the m.direct event is not atomic (except with mautrix-asmux)
     # and is therefore prone to race conditions.
@@ -168,15 +165,6 @@ bridge:
     login_shared_secret_map:
         example.com: foobar
 
-    message_handling_timeout:
-        # Send an error message after this timeout, but keep waiting for the response until the deadline.
-        # This is counted from the origin_server_ts, so the warning time is consistent regardless of the source of delay.
-        # If the message is older than this when it reaches the bridge, the message won't be handled at all.
-        error_after: 10s
-        # Drop messages after this timeout. They may still go through if the message got sent to the servers.
-        # This is counted from the time the bridge starts handling the message.
-        deadline: 60s
-
     # The prefix for commands. Only required in non-management rooms.
     command_prefix: '!slack'
     # Messages sent upon joining a management room.