From 28845b9daffe1ef0361c24fc5db46d6f1c8ccd94 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 5 Jan 2022 20:53:15 +0200
Subject: [PATCH] Update dependencies and fix some things in config updater

---
 mautrix_telegram/config.py | 10 ++++------
 optional-requirements.txt  |  2 +-
 requirements.txt           |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mautrix_telegram/config.py b/mautrix_telegram/config.py
index 1fc93a3d..3df73c91 100644
--- a/mautrix_telegram/config.py
+++ b/mautrix_telegram/config.py
@@ -171,12 +171,10 @@ class Config(BaseBridgeConfig):
 
         copy("bridge.bot_messages_as_notices")
         if isinstance(self["bridge.bridge_notices"], bool):
-            base["bridge.bridge_notices"] = {
-                "default": self["bridge.bridge_notices"],
-                "exceptions": ["@importantbot:example.com"],
-            }
+            base["bridge.bridge_notices"]["default"] = self["bridge.bridge_notices"]
         else:
-            copy("bridge.bridge_notices")
+            copy("bridge.bridge_notices.default")
+            copy("bridge.bridge_notices.exceptions")
 
         if "bridge.message_formats.m_text" in self:
             del self["bridge.message_formats"]
@@ -205,7 +203,7 @@ class Config(BaseBridgeConfig):
                 permissions[entry] = "admin"
             base["bridge.permissions"] = permissions
         else:
-            copy_dict("bridge.permissions")
+            copy_dict("bridge.permissions", override_existing_map=True)
 
         if "bridge.relaybot" not in self:
             copy("bridge.authless_relaybot_portals", "bridge.relaybot.authless_portals")
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 00b69c9e..73333ea8 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -8,7 +8,7 @@ aiodns
 brotli
 
 #/qr_login
-pillow>=4,<9
+pillow>=4,<10
 qrcode>=6,<8
 
 #/hq_thumbnails
diff --git a/requirements.txt b/requirements.txt
index d7a4cbe1..de3568a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ python-magic>=0.4,<0.5
 commonmark>=0.8,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
-mautrix>=0.14.1,<0.15
+mautrix>=0.14.3,<0.15
 #telethon>=1.24,<1.25
 # Fork to make session storage async and update to layer 137
 tulir-telethon==1.25.0a3