From 4f4d7bc34284a518c886e424ac5a08524588642d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 10 Jul 2022 14:42:41 +0300 Subject: [PATCH 1/4] Update mautrix-python --- maubot/management/frontend/src/pages/dashboard/Log.js | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maubot/management/frontend/src/pages/dashboard/Log.js b/maubot/management/frontend/src/pages/dashboard/Log.js index 5cd9833..b80e6ad 100644 --- a/maubot/management/frontend/src/pages/dashboard/Log.js +++ b/maubot/management/frontend/src/pages/dashboard/Log.js @@ -41,7 +41,7 @@ class LogEntry extends PureComponent { const req = this.props.line.matrix_http_request return <> - {req.method} {req.path} + {req.method} {req.url || req.path}
{Object.entries(req.content || {}).length > 0 && } diff --git a/requirements.txt b/requirements.txt index d15448c..6c45018 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -mautrix>=0.15.5,<0.17 +mautrix>=0.15.5,<0.18 aiohttp>=3,<4 yarl>=1,<2 SQLAlchemy>=1,<1.4 From 1fe53b4c56640269ed314ed01f6eef7d775af6d0 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 14 Aug 2022 18:51:12 +0300 Subject: [PATCH 2/4] Fix SSO login path --- maubot/management/api/client_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maubot/management/api/client_auth.py b/maubot/management/api/client_auth.py index c5baade..f630931 100644 --- a/maubot/management/api/client_auth.py +++ b/maubot/management/api/client_auth.py @@ -188,7 +188,7 @@ async def _do_sso(req: AuthRequestInfo) -> web.Response: / "client/auth_external_sso/complete" / waiter_id ) - sso_url = req.client.api.base_url.with_path(str(Path.login.sso.redirect)).with_query( + sso_url = req.client.api.base_url.with_path(str(Path.v3.login.sso.redirect)).with_query( {"redirectUrl": str(public_url)} ) sso_waiters[waiter_id] = req, asyncio.get_running_loop().create_future() From d574f84079c2469b71e6c09c4b804e8bf6156153 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 20 Aug 2022 14:37:31 +0300 Subject: [PATCH 3/4] Fix saving plugin configs --- maubot/instance.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maubot/instance.py b/maubot/instance.py index 4d797e4..895c700 100644 --- a/maubot/instance.py +++ b/maubot/instance.py @@ -276,7 +276,11 @@ class PluginInstance(DBInstance): def save_config(self, data: RecursiveDict[CommentedMap]) -> None: buf = io.StringIO() yaml.dump(data, buf) - self.config_str = buf.getvalue() + val = buf.getvalue() + if val != self.config_str: + self.config_str = val + self.log.debug("Creating background task to save updated config") + asyncio.create_task(self.update()) async def start_database( self, upgrade_table: UpgradeTable | None = None, actually_start: bool = True From fbacad8676a8e87ffbf6fe564ef65659c21801ab Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 12 Sep 2022 21:22:33 +0300 Subject: [PATCH 4/4] Add shortcut for redact in MaubotMessageEvent --- maubot/matrix.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maubot/matrix.py b/maubot/matrix.py index 9c90c8f..a66ebfe 100644 --- a/maubot/matrix.py +++ b/maubot/matrix.py @@ -123,6 +123,9 @@ class MaubotMessageEvent(MessageEvent): def react(self, key: str) -> Awaitable[EventID]: return self.client.react(self.room_id, self.event_id, key) + def redact(self, reason: str | None = None) -> Awaitable[EventID]: + return self.client.redact(self.room_id, self.event_id, reason=reason) + def edit( self, content: str | MessageEventContent,