From 190eefee83a0e94521758c110760ba9a1a6bd807 Mon Sep 17 00:00:00 2001 From: Kirill Chikalin Date: Mon, 2 Jun 2025 07:14:36 +0300 Subject: [PATCH] add logs, parse before script --- action.yml | 8 ++++---- sendMessage | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/action.yml b/action.yml index feab4a3..64cf316 100644 --- a/action.yml +++ b/action.yml @@ -81,11 +81,11 @@ runs: if [[ "$STATUS" != '' ]]; then STATUS="$STATUS " fi - echo $STATUS CAPTION="$STATUS${{ inputs.caption }}" - echo $CAPTION - echo "$CAPTION${{ inputs.message }}" - sendMessage "${{ inputs.bot_token }}" ${{ inputs.chat_id }} "$CAPTION${{ inputs.message }}" "${{ inputs.button_title }}" "$button_url" + echo "Caption: $CAPTION" + PARSED_TEXT=$(printf "%b" "$CAPTION${{ inputs.message }}") + echo "PARSED_TEXT: $PARSED_TEXT" + sendMessage "${{ inputs.bot_token }}" ${{ inputs.chat_id }} "$PARSED_TEXT" "${{ inputs.button_title }}" "$button_url" shell: bash - name: Delete message diff --git a/sendMessage b/sendMessage index ec7c58a..498a8d9 100755 --- a/sendMessage +++ b/sendMessage @@ -6,9 +6,6 @@ TEXT="$3" DOWNLOAD_TITLE="$4" # Необязательный DOWNLOAD_URL="$5" # Необязательный -# Обработка текста с \n -PARSED_TEXT=$(printf "%b" "$TEXT") - # Базовый JSON без reply_markup JSON=$(jq -nc \ --arg chat_id "$CHAT_ID" \ @@ -34,7 +31,7 @@ if [[ -n "$DOWNLOAD_URL" ]]; then }') fi -echo $JSON +echo "$JSON: $JSON" # Отправка запроса response=$(curl -s -X POST "https://api.telegram.org/bot${BOT_TOKEN}/sendMessage" \