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

Make puppets leave room instead of kicking by AS bot

Browse Source
This commit is contained in:
Tulir Asokan
2018-03-11 13:09:04 +02:00
parent 4448077d43
commit 54d2b4bba8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/portal.py
+6 -3
View File
@@ -494,10 +494,13 @@ class Portal:
except MatrixRequestError: except MatrixRequestError:
members = [] members = []
for user in members: for user in members:
is_puppet = p.Puppet.get_id_from_mxid(user) puppet = p.Puppet.get_by_mxid(user, create=False)
if user != intent.mxid and (not puppets_only or is_puppet): if user != intent.mxid and (not puppets_only or puppet):
try: try:
await intent.kick(room_id, user, message) if puppet:
await puppet.intent.leave_room(room_id)
else:
await intent.kick(room_id, user, message)
except (MatrixRequestError, IntentError): except (MatrixRequestError, IntentError):
pass pass
await intent.leave_room(room_id) await intent.leave_room(room_id)