Improve command help and don't allow management commands if the AS bot is not in the room

This commit is contained in:
Tulir Asokan
2018-01-29 23:49:59 +02:00
parent f843fd7e85
commit e6bc4c6a2d
2 changed files with 9 additions and 3 deletions
+3 -2
View File
@@ -411,12 +411,13 @@ _**Telegram actions**: commands for using the bridge to interact with Telegram._
**search** [_-r|--remote_] <_query_> - Search your contacts or the Telegram servers for users. **search** [_-r|--remote_] <_query_> - Search your contacts or the Telegram servers for users.
**pm** <_identifier_> - Open a private chat with the given Telegram user. The identifier is either **pm** <_identifier_> - Open a private chat with the given Telegram user. The identifier is either
the internal user ID, the username or the phone number. the internal user ID, the username or the phone number.
**join** <_link_> - Join a chat with an invite link. **join** <_link_> - Join a chat with an invite link.
**create** [_type_] - Create a Telegram chat of the given type for the current Matrix room. **create** [_type_] - Create a Telegram chat of the given type for the current Matrix room.
The type is either `group`, `supergroup` or `channel` (defaults to `group`). The type is either `group`, `supergroup` or `channel` (defaults to `group`).
**upgrade** - Upgrade a normal Telegram group to a supergroup. **upgrade** - Upgrade a normal Telegram group to a supergroup.
**invitelink** - Get a Telegram invite link to the current chat. **invitelink** - Get a Telegram invite link to the current chat.
**deleteportal** - Forget the current portal room. **deleteportal** - Forget the current portal room. Only works for group chats; to delete a private
chat portal, simply leave the room.
""" """
return self.reply(management_status + help) return self.reply(management_status + help)
+6 -1
View File
@@ -153,7 +153,12 @@ class MatrixHandler:
if message["msgtype"] != "m.text": if message["msgtype"] != "m.text":
return return
is_management = len(self.az.intent.get_room_members(room)) == 2 try:
is_management = len(self.az.intent.get_room_members(room)) == 2
except MatrixRequestError:
# The AS bot is not in the room.
return
if is_command or is_management: if is_command or is_management:
try: try:
command, arguments = text.split(" ", 1) command, arguments = text.split(" ", 1)