Merge branch 'master' into ep/smp-server-pages

bots/api/COMMANDS.md

@@ -33,6 +33,7 @@ This file is generated automatically.
 - [APINewPublicGroup](#apinewpublicgroup)
 - [APIGetGroupRelays](#apigetgrouprelays)
 - [APIAddGroupRelays](#apiaddgrouprelays)
+- [APIAllowRelayGroup](#apiallowrelaygroup)
 - [APIUpdateGroupProfile](#apiupdategroupprofile)
 
 [Group link commands](#group-link-commands)
@@ -295,7 +296,7 @@ Send messages.
 ```
 
 ```python
-'/_send ' + str(sendRef) + (' live=on' if liveMessage else '') + ((' ttl=' + str(ttl)) if ttl is not None else '') + ' json ' + json.dumps(composedMessages) # Python
+'/_send ' + ChatRef_cmd_string(sendRef) + (' live=on' if liveMessage else '') + ((' ttl=' + str(ttl)) if ttl is not None else '') + ' json ' + json.dumps(composedMessages) # Python
 ```
 
 **Responses**:
@@ -335,7 +336,7 @@ Update message.
 ```
 
 ```python
-'/_update item ' + str(chatRef) + ' ' + str(chatItemId) + (' live=on' if liveMessage else '') + ' json ' + json.dumps(updatedMessage) # Python
+'/_update item ' + ChatRef_cmd_string(chatRef) + ' ' + str(chatItemId) + (' live=on' if liveMessage else '') + ' json ' + json.dumps(updatedMessage) # Python
 ```
 
 **Responses**:
@@ -374,7 +375,7 @@ Delete message.
 **Syntax**:
 
 ```
-/_delete item <str(chatRef)> <chatItemIds[0]>[,<chatItemIds[1]>...] broadcast|internal|internalMark
+/_delete item <str(chatRef)> <chatItemIds[0]>[,<chatItemIds[1]>...] broadcast|internal|internalMark|history
 ```
 
 ```javascript
@@ -382,7 +383,7 @@ Delete message.
 ```
 
 ```python
-'/_delete item ' + str(chatRef) + ' ' + ','.join(map(str, chatItemIds)) + ' ' + str(deleteMode) # Python
+'/_delete item ' + ChatRef_cmd_string(chatRef) + ' ' + ','.join(map(str, chatItemIds)) + ' ' + str(deleteMode) # Python
 ```
 
 **Responses**:
@@ -464,7 +465,7 @@ Add/remove message reaction.
 ```
 
 ```python
-'/_reaction ' + str(chatRef) + ' ' + str(chatItemId) + ' ' + ('on' if add else 'off') + ' ' + json.dumps(reaction) # Python
+'/_reaction ' + ChatRef_cmd_string(chatRef) + ' ' + str(chatItemId) + ' ' + ('on' if add else 'off') + ' ' + json.dumps(reaction) # Python
 ```
 
 **Responses**:
@@ -1080,6 +1081,43 @@ ChatCmdError: Command error (only used in WebSockets API).
 ---
 
 
+### APIAllowRelayGroup
+
+Clear relay rejection for a channel (relay operator).
+
+*Network usage*: background.
+
+**Parameters**:
+- groupId: int64
+
+**Syntax**:
+
+```
+/_relay allow #<groupId>
+```
+
+```javascript
+'/_relay allow #' + groupId // JavaScript
+```
+
+```python
+'/_relay allow #' + str(groupId) # Python
+```
+
+**Responses**:
+
+RelayGroupAllowed: Relay rejection cleared for a channel.
+- type: "relayGroupAllowed"
+- user: [User](./TYPES.md#user)
+- groupInfo: [GroupInfo](./TYPES.md#groupinfo)
+
+ChatCmdError: Command error (only used in WebSockets API).
+- type: "chatCmdError"
+- chatError: [ChatError](./TYPES.md#chaterror)
+
+---
+
+
 ### APIUpdateGroupProfile
 
 Update group profile.
@@ -1386,7 +1424,7 @@ Connect via prepared SimpleX link. The link can be 1-time invitation link, conta
 ```
 
 ```python
-'/_connect ' + str(userId) + ((' ' + str(preparedLink_)) if preparedLink_ is not None else '') # Python
+'/_connect ' + str(userId) + ((' ' + CreatedConnLink_cmd_string(preparedLink_)) if preparedLink_ is not None else '') # Python
 ```
 
 **Responses**:
@@ -1644,7 +1682,7 @@ Get chat previews. Supports time-based pagination — use this instead of APILis
 ```
 
 ```python
-'/_get chats ' + str(userId) + (' pcc=on' if pendingConnections else '') + ' ' + str(pagination) + ' ' + json.dumps(query) # Python
+'/_get chats ' + str(userId) + (' pcc=on' if pendingConnections else '') + ' ' + PaginationByTime_cmd_string(pagination) + ' ' + json.dumps(query) # Python
 ```
 
 **Responses**:
@@ -1682,7 +1720,7 @@ Delete chat.
 ```
 
 ```python
-'/_delete ' + str(chatRef) + ' ' + str(chatDeleteMode) # Python
+'/_delete ' + ChatRef_cmd_string(chatRef) + ' ' + ChatDeleteMode_cmd_string(chatDeleteMode) # Python
 ```
 
 **Responses**:

bots/api/TYPES.md

@@ -589,6 +589,7 @@ ChatBanner:
 - "broadcast"
 - "internal"
 - "internalMark"
+- "history"
 
 
 ---
@@ -1373,7 +1374,7 @@ ChatType.cmdString(chatType) + chatId + (chatScope ? GroupChatScope.cmdString(ch
 ```
 
 ```python
-str(chatType) + str(chatId) + ((str(chatScope)) if chatScope is not None else '') # Python
+ChatType_cmd_string(chatType) + str(chatId) + ((GroupChatScope_cmd_string(chatScope)) if chatScope is not None else '') # Python
 ```
 
 
@@ -3347,6 +3348,7 @@ ParseError:
 - "accepted"
 - "active"
 - "inactive"
+- "rejected"
 
 
 ---