Fix bug in !tg create. Fixes #736
This commit is contained in:
@@ -1,3 +1,9 @@
|
|||||||
|
# unreleased
|
||||||
|
|
||||||
|
* Added simple fallback message for live location and venue messages from Telegram.
|
||||||
|
* Added support for `t.me/+code` style invite links in `!tg join`.
|
||||||
|
* Fixed bug in v0.11.0 that broke `!tg create`.
|
||||||
|
|
||||||
# v0.11.1 (2021-01-10)
|
# v0.11.1 (2021-01-10)
|
||||||
|
|
||||||
* Added support for message reactions.
|
* Added support for message reactions.
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ async def create(evt: CommandEvent) -> EventID:
|
|||||||
about=about,
|
about=about,
|
||||||
encrypted=encrypted,
|
encrypted=encrypted,
|
||||||
)
|
)
|
||||||
invites, errors = await portal.get_telegram_users_in_matrix_room(evt.sender)
|
invites, errors = await portal.get_telegram_users_in_matrix_room(evt.sender, pre_create=True)
|
||||||
if len(errors) > 0:
|
if len(errors) > 0:
|
||||||
error_list = "\n".join(f"* [{mxid}](https://matrix.to/#/{mxid})" for mxid in errors)
|
error_list = "\n".join(f"* [{mxid}](https://matrix.to/#/{mxid})" for mxid in errors)
|
||||||
await evt.reply(
|
await evt.reply(
|
||||||
|
|||||||
@@ -436,12 +436,11 @@ class Portal(DBPortal, BasePortal):
|
|||||||
# region Matrix -> Telegram metadata
|
# region Matrix -> Telegram metadata
|
||||||
|
|
||||||
async def get_telegram_users_in_matrix_room(
|
async def get_telegram_users_in_matrix_room(
|
||||||
self, source: u.User
|
self, source: u.User, pre_create: bool = False
|
||||||
) -> tuple[list[InputPeerUser], list[UserID]]:
|
) -> tuple[list[InputPeerUser], list[UserID]]:
|
||||||
user_tgids = {}
|
user_tgids = {}
|
||||||
user_mxids = await self.main_intent.get_room_members(
|
intent = self.az.intent if pre_create else self.main_intent
|
||||||
self.mxid, (Membership.JOIN, Membership.INVITE)
|
user_mxids = await intent.get_room_members(self.mxid, (Membership.JOIN, Membership.INVITE))
|
||||||
)
|
|
||||||
for mxid in user_mxids:
|
for mxid in user_mxids:
|
||||||
if mxid == self.az.bot_mxid:
|
if mxid == self.az.bot_mxid:
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user