vbatts/maubot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into bump-mautrix-python-version

Browse source
This commit is contained in:
Alejandro Herrera 2022-09-27 22:50:40 -05:00 • committed by GitHub
commit 51fa7ffa36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
maubot/instance.py
View file

@ -276,7 +276,11 @@ class PluginInstance(DBInstance):
def save_config(self, data: RecursiveDict[CommentedMap]) -> None: def save_config(self, data: RecursiveDict[CommentedMap]) -> None:
buf = io.StringIO() buf = io.StringIO()
yaml.dump(data, buf) 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( async def start_database(
self, upgrade_table: UpgradeTable | None = None, actually_start: bool = True self, upgrade_table: UpgradeTable | None = None, actually_start: bool = True

2
maubot/management/api/client_auth.py
View file

@ -188,7 +188,7 @@ async def _do_sso(req: AuthRequestInfo) -> web.Response:
/ "client/auth_external_sso/complete" / "client/auth_external_sso/complete"
/ waiter_id / 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)} {"redirectUrl": str(public_url)}
) )
sso_waiters[waiter_id] = req, asyncio.get_running_loop().create_future() sso_waiters[waiter_id] = req, asyncio.get_running_loop().create_future()

2
maubot/management/frontend/src/pages/dashboard/Log.js
View file

@ -41,7 +41,7 @@ class LogEntry extends PureComponent {
const req = this.props.line.matrix_http_request const req = this.props.line.matrix_http_request
return <> return <>
{req.method} {req.path} {req.method} {req.url || req.path}
<div className="content"> <div className="content">
{Object.entries(req.content || {}).length > 0 {Object.entries(req.content || {}).length > 0
&& <JSONTree data={{ content: req.content }} hideRoot={true}/>} && <JSONTree data={{ content: req.content }} hideRoot={true}/>}

3
maubot/matrix.py
View file

@ -123,6 +123,9 @@ class MaubotMessageEvent(MessageEvent):
def react(self, key: str) -> Awaitable[EventID]: def react(self, key: str) -> Awaitable[EventID]:
return self.client.react(self.room_id, self.event_id, key) 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( def edit(
self, self,
content: str | MessageEventContent, content: str | MessageEventContent,