iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix small mistakes

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-11 15:09:44 +03:00
parent bf49843721
commit ad5cace75b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands/manhole.py
+3 -2
View File
@@ -92,14 +92,15 @@ async def open_manhole(evt: CommandEvent) -> None:
path = evt.config["manhole.path"] path = evt.config["manhole.path"]
wl_list = list(whitelist) 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]) if len(wl_list) > 1 else wl_list[0])
evt.log.info(f"{evt.sender.mxid} opened a manhole with {whitelist_str} whitelisted.") 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, server, close = await start_manhole(path=path, banner=banner, namespace=namespace,
loop=evt.loop, whitelist=whitelist) loop=evt.loop, whitelist=whitelist)
evt.bridge.manhole = ManholeState(server=server, opened_by=evt.sender.mxid, close=close, evt.bridge.manhole = ManholeState(server=server, opened_by=evt.sender.mxid, close=close,
whitelist=whitelist) 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() await server.wait_closed()
evt.bridge.manhole = None evt.bridge.manhole = None
try: try:
setup.py
+1 -1
View File
@@ -32,7 +32,7 @@ setuptools.setup(
install_requires=[ install_requires=[
"aiohttp>=3.0.1,<4", "aiohttp>=3.0.1,<4",
"mautrix>=0.4.0.dev55,<0.5", "mautrix>=0.4.0.dev56,<0.5",
"SQLAlchemy>=1.2.3,<2", "SQLAlchemy>=1.2.3,<2",
"alembic>=1.0.0,<2", "alembic>=1.0.0,<2",
"commonmark>=0.8.1,<1", "commonmark>=0.8.1,<1",