diff --git a/ci/os/tests_check.os b/ci/os/tests_check.os index c27c52d18f..231d2f52bb 100644 --- a/ci/os/tests_check.os +++ b/ci/os/tests_check.os @@ -61,8 +61,13 @@ Для Каждого Метод Из СтруктураМодуля.Объявления Цикл - Если Метод.Тип = "ОбъявлениеМетода" И Метод.Сигнатура.Экспорт = Истина Тогда - МассивМетодов.Добавить(СтрЗаменить(ТекущаяБиблиотека, " ", "") + "_" + Метод.Сигнатура.Имя); + Если Метод.Тип = "ОбъявлениеМетода" И Метод.Сигнатура.Экспорт = Истина Тогда + ДокКом = СтрПолучитьСтроку(ТекстМодуля, Метод.Сигнатура.Начало.НомерСтроки - 1); + + Если СтрНайти(ДокКом, "//") <> 0 Тогда + МассивМетодов.Добавить(СтрЗаменить(ТекущаяБиблиотека, " ", "") + "_" + Метод.Сигнатура.Имя); + КонецЕсли; + КонецЕсли; КонецЦикла; diff --git a/docs/en/md/Start/CLI_version.md b/docs/en/md/Start/CLI_version.md index 8974616eeb..d628b743d2 100644 --- a/docs/en/md/Start/CLI_version.md +++ b/docs/en/md/Start/CLI_version.md @@ -20,7 +20,7 @@ After the launching of application, you'll see the initial page with a list of a >**Important:** Library names are case-sensitive and should be written in lowercase. Method names are not case-sensitive -![demo](./img/3.gif) +![demo](./img/2.gif) ## Using methods Like most other programs intended for use in bat/sh scripts, each separate action of Oint CLI is called by a full command line of the following form: @@ -37,6 +37,6 @@ When it comes to parameters, most often the data passed there are strings. This After executing the requested action, the program outputs the result and exits. By default, the output is displayed in the console, but you can redirect it to a file using either the standard method `>` or by using the common parameter `--out`. The difference between these two methods lies in the encoding of the saved file: when using `>`, it will be the encoding of the shell, whereas when using `--out`, it will be UTF-8 (used internally by OInt). Additionally, using `--out` is mandatory for methods returning binary data in the response (such as downloading a file from Google Drive, for example) -![demo](./img/2.gif) +![demo](./img/3.gif) You can find all further information you might need for work in other sections of this documentation, as well as in the built-in help of OInt CLI diff --git a/docs/en/md/Start/img/2.gif b/docs/en/md/Start/img/2.gif index e1873142e3..3df10c2f60 100644 Binary files a/docs/en/md/Start/img/2.gif and b/docs/en/md/Start/img/2.gif differ diff --git a/docs/en/md/Start/img/3.gif b/docs/en/md/Start/img/3.gif index b683e0be2e..2ab3d69aea 100644 Binary files a/docs/en/md/Start/img/3.gif and b/docs/en/md/Start/img/3.gif differ diff --git a/docs/ru/md/Start/img/2.gif b/docs/ru/md/Start/img/2.gif index eada59bf51..2db5ef076f 100644 Binary files a/docs/ru/md/Start/img/2.gif and b/docs/ru/md/Start/img/2.gif differ diff --git a/service/vhs/keyboard.json b/service/vhs/keyboard.json new file mode 100644 index 0000000000..12ab23c202 --- /dev/null +++ b/service/vhs/keyboard.json @@ -0,0 +1,23 @@ +{ + "keyboard": [ + [ + { + "text": "Button1", + "callback_data": "Button1" + } + ], + [ + { + "text": "Button2", + "callback_data": "Button2" + } + ], + [ + { + "text": "Button3", + "callback_data": "Button3" + } + ] + ], + "resize_keyboard": true +} diff --git a/service/vhs/telegram.tape b/service/vhs/telegram.tape index b0b8807eb2..4487c1f366 100644 --- a/service/vhs/telegram.tape +++ b/service/vhs/telegram.tape @@ -2,7 +2,7 @@ Set Theme { "name": "OPI", "black": "#090300", "red": "#db2d20", "green": "#002B28", "yellow": "#004943", "blue": "#01a0e4", "magenta": "#a16a94", "cyan": "#b5e4f4", "white": "#000000", "brightBlack": "#5c5855", "brightRed": "#e8bbd0", "brightGreen": "#002B28", "brightYellow": "#004943", "brightBlue": "#807d7c", "brightMagenta": "#d6d5d4", "brightCyan": "#cdab53", "brightWhite": "#000000", "background": "#FFFFFF", "foreground": "#4a4543", "cursor": "#4a4543", "selection": "#a5a2a2" } -Output "D:\REPOS\OpenIntegrations\docs\ru\md\Start\img\2.gif" +Output "D:\REPOS\OpenIntegrations\docs\en\md\Start\img\2.gif" # Require echo @@ -16,4 +16,8 @@ Set Height 619 Type `oint telegram` Sleep 200ms Enter -Sleep 15s +Sleep 7s + +Type `oint telegram SendTextMessage` Sleep 200ms Enter + +Sleep 11s diff --git a/service/vhs/telegram_keyboardmessage.tape b/service/vhs/telegram_keyboardmessage.tape index 62d6dca658..84981b7718 100644 --- a/service/vhs/telegram_keyboardmessage.tape +++ b/service/vhs/telegram_keyboardmessage.tape @@ -2,7 +2,7 @@ Set Theme { "name": "OPI", "black": "#090300", "red": "#db2d20", "green": "#002B28", "yellow": "#004943", "blue": "#01a0e4", "magenta": "#a16a94", "cyan": "#b5e4f4", "white": "#000000", "brightBlack": "#5c5855", "brightRed": "#e8bbd0", "brightGreen": "#002B28", "brightYellow": "#004943", "brightBlue": "#807d7c", "brightMagenta": "#d6d5d4", "brightCyan": "#cdab53", "brightWhite": "#000000", "background": "#FFFFFF", "foreground": "#4a4543", "cursor": "#4a4543", "selection": "#a5a2a2" } -Output "D:\REPOS\OpenIntegrations\docs\ru\md\Start\img\3.gif" +Output "D:\REPOS\OpenIntegrations\docs\en\md\Start\img\3.gif" # Require echo @@ -12,12 +12,12 @@ Set Width 868 Set Height 619 Hide -Type "set token=" Enter +Type "set token=6129457865:AAFyzNYOAFbuhAL5GXqbVidwOjZYFvLFWMU" Enter Type "cls" Enter Show -Type `oint telegram СформироватьКлавиатуруПоМассивуКнопок --buttons "['Кнопка1','Кнопка2','Кнопка3']" --out keyboard.json ` Sleep 200ms Enter +Type `oint telegram FormKeyboardFromButtonArray --buttons "['Button1','Button2','Button3']" --out keyboard.json ` Sleep 200ms Enter Sleep 3s -Type `oint telegram ОтправитьТекстовоеСообщение --token %token% --chat 461699897 --text "Привет из Oint!" --keyboard ./keyboard.json` Sleep 200ms Enter +Type `oint telegram SendTextMessage --token %token% --chat 461699897 --text "Hola from Oint!" --keyboard ./keyboard.json` Sleep 200ms Enter Sleep 12s