Merge branch 'master' into rlottie

This commit is contained in:
Lawrence
2019-09-29 20:21:56 +03:00
committed by GitHub
9 changed files with 103 additions and 29 deletions
+4
View File
@@ -102,6 +102,7 @@ class Config(BaseBridgeConfig):
copy("bridge.image_as_file_size")
copy("bridge.max_document_size")
copy("bridge.animated_sticker_target_type")
copy("bridge.federate_rooms")
copy("bridge.bot_messages_as_notices")
if isinstance(self["bridge.bridge_notices"], bool):
@@ -145,6 +146,9 @@ class Config(BaseBridgeConfig):
if "bridge.relaybot" not in self:
copy("bridge.authless_relaybot_portals", "bridge.relaybot.authless_portals")
else:
copy("bridge.relaybot.private_chat.invite")
copy("bridge.relaybot.private_chat.state_changes")
copy("bridge.relaybot.private_chat.message")
copy("bridge.relaybot.authless_portals")
copy("bridge.relaybot.whitelist_group_admins")
copy("bridge.relaybot.whitelist")