mirror of
https://github.com/anten-ka/kaskad-pro.git
synced 2026-05-19 11:36:16 +00:00
Fix: convert \n to real newlines in all Telegram bot messages
Made-with: Cursor
This commit is contained in:
13
install.sh
13
install.sh
@@ -532,12 +532,11 @@ monitor_alert() {
|
|||||||
if [ -n "${BOT_TOKEN:-}" ] && [ -n "${BOT_CHAT_ID:-}" ]; then
|
if [ -n "${BOT_TOKEN:-}" ] && [ -n "${BOT_CHAT_ID:-}" ]; then
|
||||||
local text
|
local text
|
||||||
if [ "$ping_ms" = "TIMEOUT" ]; then
|
if [ "$ping_ms" = "TIMEOUT" ]; then
|
||||||
text="⚠️ <b>ALERT</b>: ${ip}%0APing: TIMEOUT (порог: ${threshold}ms)"
|
text="⚠️ <b>ALERT</b>: ${ip}\nPing: TIMEOUT (порог: ${threshold}ms)"
|
||||||
else
|
else
|
||||||
text="⚠️ <b>ALERT</b>: ${ip}%0APing: ${ping_ms}ms (порог: ${threshold}ms)"
|
text="⚠️ <b>ALERT</b>: ${ip}\nPing: ${ping_ms}ms (порог: ${threshold}ms)"
|
||||||
fi
|
fi
|
||||||
curl -s -X POST "https://api.telegram.org/bot${BOT_TOKEN}/sendMessage" \
|
tg_send "$BOT_CHAT_ID" "$text" "" > /dev/null 2>&1
|
||||||
-d "chat_id=${BOT_CHAT_ID}&text=${text}&parse_mode=HTML" > /dev/null 2>&1
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -703,7 +702,8 @@ tg_api() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tg_send() {
|
tg_send() {
|
||||||
local chat_id="$1" text="$2" keyboard="${3:-}"
|
local chat_id="$1" text keyboard="${3:-}"
|
||||||
|
text=$(printf '%b' "$2")
|
||||||
local payload
|
local payload
|
||||||
if [ -n "$keyboard" ]; then
|
if [ -n "$keyboard" ]; then
|
||||||
payload=$(jq -n --arg c "$chat_id" --arg t "$text" --argjson k "$keyboard" \
|
payload=$(jq -n --arg c "$chat_id" --arg t "$text" --argjson k "$keyboard" \
|
||||||
@@ -716,7 +716,8 @@ tg_send() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tg_edit() {
|
tg_edit() {
|
||||||
local chat_id="$1" msg_id="$2" text="$3" keyboard="${4:-}"
|
local chat_id="$1" msg_id="$2" text keyboard="${4:-}"
|
||||||
|
text=$(printf '%b' "$3")
|
||||||
local payload
|
local payload
|
||||||
if [ -n "$keyboard" ]; then
|
if [ -n "$keyboard" ]; then
|
||||||
payload=$(jq -n --arg c "$chat_id" --argjson m "$msg_id" --arg t "$text" --argjson k "$keyboard" \
|
payload=$(jq -n --arg c "$chat_id" --argjson m "$msg_id" --arg t "$text" --argjson k "$keyboard" \
|
||||||
|
|||||||
Reference in New Issue
Block a user