diff --git a/action.yml b/action.yml index d4f1d84..312e365 100644 --- a/action.yml +++ b/action.yml @@ -25,35 +25,21 @@ inputs: description: "Message ID" required: false default: ${{ secrets.TELEGRAM_TOKEN }} - who-to-greet: # id of input - description: 'Who to greet' - required: true - default: 'World' outputs: message_id: description: "Message ID" - value: ${{ env.TELEGRAM_MESSAGE_ID }} - random-number: - description: "Random number" - value: ${{ steps.random-number-generator.outputs.random-number }} + value: ${{ env.OUTPUT_MESSAGE_ID }} runs: using: "composite" steps: - - name: Set Greeting - run: | - echo "Hello $INPUT_WHO_TO_GREET." - echo MESSAGE=$MESSAGE - echo inputs.message_id==${{ inputs.message_id }} - echo env.MESSAGE_ID=${{ env.MESSAGE_ID }} + - name: Setup + run: echo "OUTPUT_MESSAGE_ID=" >> $GITHUB_ENV shell: bash - env: - INPUT_WHO_TO_GREET: ${{ inputs.who-to-greet }} - MESSAGE: ${{ inputs.message_id }} - - name: Random Number Generator - id: random-number-generator - run: echo "random-number=$(echo $RANDOM)" >> $GITHUB_OUTPUT - shell: bash +# - name: Random Number Generator +# id: random-number-generator +# run: echo "random-number=$(echo $RANDOM)" >> $GITHUB_OUTPUT +# shell: bash - name: Set GitHub Path run: echo "$GITHUB_ACTION_PATH" >> $GITHUB_PATH @@ -62,9 +48,5 @@ runs: GITHUB_ACTION_PATH: ${{ github.action_path }} - name: Send message - run: sendMessage ${{ inputs.bot_token }} ${{ inputs.chat_id }} ${{ inputs.message }} - shell: bash - - - name: Run goodbye.sh - run: goodbye.sh + run: sendMessage "${{ inputs.bot_token }}" "${{ inputs.chat_id }}" "${{ inputs.message }}" shell: bash \ No newline at end of file diff --git a/sendMessage b/sendMessage index af54b28..fec71c2 100755 --- a/sendMessage +++ b/sendMessage @@ -1,16 +1,10 @@ #!/bin/bash -MESSAGE=$(echo -e "$3") - -token=$1 -echo chat_id=$2 -echo text=$MESSAGE - -response=$(curl -s -X POST "https://api.telegram.org/bot$token/sendMessage" \ +response=$(curl -s -X POST "https://api.telegram.org/bot$1/sendMessage" \ -d "chat_id=$2" \ -d "parse_mode=MarkdownV2" \ -d "link_preview_options={\"is_disabled\":true}" \ - -d "text=test: $MESSAGE") + -d "text=test: $3") # if command -v jq >/dev/null 2>&1; then message_id=$(echo "$response" | jq '.result.message_id') @@ -18,5 +12,4 @@ response=$(curl -s -X POST "https://api.telegram.org/bot$token/sendMessage" \ # message_id=$(echo "$response" | grep -o '"message_id":[0-9]*' | sed 's/"message_id"://') # fi -echo "Sent message ID: $message_id" -echo "TELEGRAM_MESSAGE_ID=$message_id" >> $GITHUB_ENV \ No newline at end of file +echo "OUTPUT_MESSAGE_ID=$message_id" >> $GITHUB_ENV \ No newline at end of file