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

Add proper message when requesting to join via invite link

Browse Source
This commit is contained in:
Tulir Asokan
2022-03-28 15:03:04 +03:00
parent c536c4a265
commit 2b8b853fec
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands/telegram/misc.py
+3
View File
@@ -26,6 +26,7 @@ from telethon.errors import (
EmoticonInvalidError, EmoticonInvalidError,
InviteHashExpiredError, InviteHashExpiredError,
InviteHashInvalidError, InviteHashInvalidError,
InviteRequestSentError,
OptionsTooMuchError, OptionsTooMuchError,
TakeoutInitDelayError, TakeoutInitDelayError,
UserAlreadyParticipantError, UserAlreadyParticipantError,
@@ -171,6 +172,8 @@ async def _join(
return (await evt.sender.client(ImportChatInviteRequest(identifier))), None return (await evt.sender.client(ImportChatInviteRequest(identifier))), None
except UserAlreadyParticipantError: except UserAlreadyParticipantError:
return None, await evt.reply("You are already in that chat.") return None, await evt.reply("You are already in that chat.")
except InviteRequestSentError:
return None, await evt.reply("Invite request sent successfully.")
else: else:
channel = await evt.sender.client.get_entity(identifier) channel = await evt.sender.client.get_entity(identifier)
if not channel: if not channel:
requirements.txt
+1 -1
View File
@@ -6,7 +6,7 @@ yarl>=1,<2
mautrix>=0.15.4,<0.16 mautrix>=0.15.4,<0.16
#telethon>=1.24,<1.25 #telethon>=1.24,<1.25
# Fork to make session storage async and update to layer 138 # Fork to make session storage async and update to layer 138
tulir-telethon==1.25.0a5 tulir-telethon==1.25.0a6
asyncpg>=0.20,<0.26 asyncpg>=0.20,<0.26
mako>=1,<2 mako>=1,<2
setuptools setuptools