From ad5cace75b5ed913f9e1a486a4e0ce8725e84e88 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 11 Aug 2019 15:09:44 +0300 Subject: [PATCH] Fix small mistakes --- mautrix_telegram/commands/manhole.py | 5 +++-- setup.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mautrix_telegram/commands/manhole.py b/mautrix_telegram/commands/manhole.py index 2c8f3abb..ad4cdce8 100644 --- a/mautrix_telegram/commands/manhole.py +++ b/mautrix_telegram/commands/manhole.py @@ -92,14 +92,15 @@ async def open_manhole(evt: CommandEvent) -> None: path = evt.config["manhole.path"] wl_list = list(whitelist) - whitelist_str = (f"{', '.join(wl_list[:-1])} and {wl_list[-1]}" + whitelist_str = (f"{', '.join(str(uid) for uid in wl_list[:-1])} and {wl_list[-1]}" if len(wl_list) > 1 else wl_list[0]) evt.log.info(f"{evt.sender.mxid} opened a manhole with {whitelist_str} whitelisted.") server, close = await start_manhole(path=path, banner=banner, namespace=namespace, loop=evt.loop, whitelist=whitelist) evt.bridge.manhole = ManholeState(server=server, opened_by=evt.sender.mxid, close=close, whitelist=whitelist) - await evt.reply(f"Opened manhole at unix://{path}") + plrl = "s" if len(whitelist) != 1 else "" + await evt.reply(f"Opened manhole at unix://{path} with UID{plrl} {whitelist_str} whitelisted") await server.wait_closed() evt.bridge.manhole = None try: diff --git a/setup.py b/setup.py index 91b1d422..fe99bb85 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setuptools.setup( install_requires=[ "aiohttp>=3.0.1,<4", - "mautrix>=0.4.0.dev55,<0.5", + "mautrix>=0.4.0.dev56,<0.5", "SQLAlchemy>=1.2.3,<2", "alembic>=1.0.0,<2", "commonmark>=0.8.1,<1",