diff --git a/web/service/tgbot.go b/web/service/tgbot.go index 5b6c489e..9f11c19d 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -809,7 +809,7 @@ func (t *Tgbot) SendMsgToTgbot(chatId int64, msg string, replyMarkup ...telego.R // paging message if it is big if len(msg) > limit { - messages := strings.Split(msg, "\r\n \r\n") + messages := strings.Split(msg, "\r\n\r\n") lastIndex := -1 for _, message := range messages { @@ -817,10 +817,10 @@ func (t *Tgbot) SendMsgToTgbot(chatId int64, msg string, replyMarkup ...telego.R allMessages = append(allMessages, message) lastIndex++ } else { - allMessages[lastIndex] += "\r\n \r\n" + message + allMessages[lastIndex] += "\r\n\r\n" + message } } - if strings.TrimSpace(allMessages[lastIndex]) == "" { + if strings.TrimSpace(allMessages[len(allMessages)-1]) == "" { allMessages = allMessages[:len(allMessages)-1] } } else { @@ -905,7 +905,7 @@ func (t *Tgbot) getServerUsage() string { if err != nil { logger.Error("net.Interfaces failed, err: ", err.Error()) info += t.I18nBot("tgbot.messages.ip", "IP=="+t.I18nBot("tgbot.unknown")) - info += " \r\n" + info += "\r\n" } else { for i := 0; i < len(netInterfaces); i++ { if (netInterfaces[i].Flags & net.FlagUp) != 0 { @@ -1430,9 +1430,9 @@ func (t *Tgbot) notifyExhausted() { if len(exhaustedClients) > 0 { output += t.I18nBot("tgbot.messages.disabled", "Disabled=="+strconv.Itoa(len(disabledClients))) if len(disabledClients) > 0 { - output += t.I18nBot("tgbot.clients") + ":" + output += t.I18nBot("tgbot.clients") + ":\r\n" for _, traffic := range disabledClients { - output += " " + traffic.Email + output += " " + traffic.Email } output += "\r\n" } diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 77e4fb79..501671d0 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -460,8 +460,8 @@ "status" = "✅ Bot is OK!" "usage" = "❗ Please provide a text to search!" "getID" = "🆔 Your ID: {{ .ID }}" -"helpAdminCommands" = "Search for a client email:\r\n/usage [Email]\r\n \r\nSearch for inbounds (with client stats):\r\n/inbound [Remark]" -"helpClientCommands" = "To search for statistics, just use the following command:\r\n \r\n/usage [Email]" +"helpAdminCommands" = "Search for a client email:\r\n/usage [Email]\r\n\r\nSearch for inbounds (with client stats):\r\n/inbound [Remark]" +"helpClientCommands" = "To search for statistics, just use the following command:\r\n\r\n/usage [Email]" [tgbot.messages] "cpuThreshold" = "🔴 CPU Load {{ .Percent }}% is more than threshold {{ .Threshold }}%" @@ -476,7 +476,7 @@ "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n" "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n" "ip" = "🌐 IP: {{ .IP }}\r\n" -"ips" = "🔢 IPs: \r\n{{ .IPs }}\r\n" +"ips" = "🔢 IPs:\r\n{{ .IPs }}\r\n" "serverUpTime" = "⏳ Server Uptime: {{ .UpTime }} {{ .Unit }}\r\n" "serverLoad" = "📈 Server Load: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n" "serverMemory" = "📋 Server RAM: {{ .Current }}/{{ .Total }}\r\n" @@ -502,9 +502,9 @@ "exhaustedCount" = "🚨 Exhausted {{ .Type }} count:\r\n" "onlinesCount" = "🌐 Online clients: {{ .Count }}\r\n" "disabled" = "🛑 Disabled: {{ .Disabled }}\r\n" -"depleteSoon" = "🔜 Deplete Soon: {{ .Deplete }}\r\n \r\n" +"depleteSoon" = "🔜 Deplete Soon: {{ .Deplete }}\r\n\r\n" "backupTime" = "🗄 Backup Time: {{ .Time }}\r\n" -"refreshedOn" = "\r\n📋🔄 Refreshed On: {{ .Time }}\r\n \r\n" +"refreshedOn" = "\r\n📋🔄 Refreshed On: {{ .Time }}\r\n\r\n" "yes" = "✅ Yes" "no" = "❌ No" diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml index 767eef04..8645fbef 100644 --- a/web/translation/translate.es_ES.toml +++ b/web/translation/translate.es_ES.toml @@ -460,8 +460,8 @@ "status" = "✅ ¡El bot está bien!" "usage" = "❗ ¡Por favor proporciona un texto para buscar!" "getID" = "🆔 Tu ID: {{ .ID }}" -"helpAdminCommands" = "Buscar un correo electrónico de cliente:\r\n/usage [Email]\r\n \r\nBuscar entradas (con estadísticas de cliente):\r\n/inbound [Nota]" -"helpClientCommands" = "Para buscar estadísticas, simplemente usa el siguiente comando:\r\n \r\n/usage [UUID|Contraseña]" +"helpAdminCommands" = "Buscar un correo electrónico de cliente:\r\n/usage [Email]\r\n\r\nBuscar entradas (con estadísticas de cliente):\r\n/inbound [Nota]" +"helpClientCommands" = "Para buscar estadísticas, simplemente usa el siguiente comando:\r\n\r\n/usage [UUID|Contraseña]" [tgbot.messages] "cpuThreshold" = "🔴 El uso de CPU {{ .Percent }}% es mayor que el umbral {{ .Threshold }}%" @@ -476,7 +476,7 @@ "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n" "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n" "ip" = "🌐 IP: {{ .IP }}\r\n" -"ips" = "🔢 IPs: \r\n{{ .IPs }}\r\n" +"ips" = "🔢 IPs:\r\n{{ .IPs }}\r\n" "serverUpTime" = "⏳ Tiempo de actividad del servidor: {{ .UpTime }} {{ .Unit }}\r\n" "serverLoad" = "📈 Carga del servidor: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n" "serverMemory" = "📋 Memoria del servidor: {{ .Current }}/{{ .Total }}\r\n" @@ -498,13 +498,13 @@ "download" = "🔽 Bajada: ↓{{ .Download }}\r\n" "total" = "📊 Total: ↑↓{{ .UpDown }} / {{ .Total }}\r\n" "TGUser" = "👤 Usuario de Telegram: {{ .TelegramID }}\r\n" -"exhaustedMsg" = "🚨 Agotado {{ .Type }}: \r\n" -"exhaustedCount" = "🚨 Cantidad de Agotados {{ .Type }}: \r\n" +"exhaustedMsg" = "🚨 Agotado {{ .Type }}:\r\n" +"exhaustedCount" = "🚨 Cantidad de Agotados {{ .Type }}:\r\n" "onlinesCount" = "🌐 Clientes en línea: {{ .Count }}\r\n" "disabled" = "🛑 Desactivado: {{ .Disabled }}\r\n" -"depleteSoon" = "🔜 Se agotará pronto: {{ .Deplete }}\r\n \r\n" +"depleteSoon" = "🔜 Se agotará pronto: {{ .Deplete }}\r\n\r\n" "backupTime" = "🗄 Hora de la Copia de Seguridad: {{ .Time }}\r\n" -"refreshedOn" = "\r\n📋🔄 Actualizado en: {{ .Time }}\r\n \r\n" +"refreshedOn" = "\r\n📋🔄 Actualizado en: {{ .Time }}\r\n\r\n" "yes" = "✅ Sí" "no" = "❌ No" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index 11ff658d..a4b66234 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -460,8 +460,8 @@ "status" = "✅ ربات در حالت عادی است!" "usage" = "❗ لطفاً یک متن برای جستجو وارد کنید!" "getID" = "🆔 شناسه شما: {{ .ID }}" -"helpAdminCommands" = "برای جستجوی ایمیل مشتری:\r\n/usage [ایمیل]\r\n \r\nبرای جستجوی ورودی‌ها (با آمار مشتری):\r\n/inbound [توضیح]" -"helpClientCommands" = "برای جستجوی آمار، فقط از دستور زیر استفاده کنید:\r\n \r\n/usage [Email]" +"helpAdminCommands" = "برای جستجوی ایمیل مشتری:\r\n/usage [ایمیل]\r\n\r\nبرای جستجوی ورودی‌ها (با آمار مشتری):\r\n/inbound [توضیح]" +"helpClientCommands" = "برای جستجوی آمار، فقط از دستور زیر استفاده کنید:\r\n\r\n/usage [Email]" [tgbot.messages] "cpuThreshold" = "🔴 میزان استفاده از CPU {{ .Percent }}% بیشتر از آستانه {{ .Threshold }}% است." @@ -476,7 +476,7 @@ "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n" "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n" "ip" = "🌐 آدرس IP: {{ .IP }}\r\n" -"ips" = "🔢 آدرس‌های IP: \r\n{{ .IPs }}\r\n" +"ips" = "🔢 آدرس‌های IP:\r\n{{ .IPs }}\r\n" "serverUpTime" = "⏳ زمان کارکرد سرور: {{ .UpTime }} {{ .Unit }}\r\n" "serverLoad" = "📈 بار سرور: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n" "serverMemory" = "📋 حافظه سرور: {{ .Current }}/{{ .Total }}\r\n" @@ -502,9 +502,9 @@ "exhaustedCount" = "🚨 تعداد {{ .Type }} به اتمام رسیده:\r\n" "onlinesCount" = "🌐 مشتریان آنلاین: {{ .Count }}\r\n" "disabled" = "🛑 غیرفعال: {{ .Disabled }}\r\n" -"depleteSoon" = "🔜 به زودی به پایان خواهد رسید: {{ .Deplete }}\r\n \r\n" +"depleteSoon" = "🔜 به زودی به پایان خواهد رسید: {{ .Deplete }}\r\n\r\n" "backupTime" = "🗄 زمان پشتیبان‌گیری: {{ .Time }}\r\n" -"refreshedOn" = "\r\n📋🔄 تازه‌سازی شده در: {{ .Time }}\r\n \r\n" +"refreshedOn" = "\r\n📋🔄 تازه‌سازی شده در: {{ .Time }}\r\n\r\n" "yes" = "✅ بله" "no" = "❌ نه" diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index 721e415e..31f54835 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -460,8 +460,8 @@ "status" = "✅ Бот работает нормально!" "usage" = "❗ Пожалуйста, укажите текст для поиска!" "getID" = "🆔 Ваш ID: {{ .ID }}" -"helpAdminCommands" = "Поиск по электронной почте клиента:\r\n/usage [Email]\r\n \r\nПоиск входящих соединений (со статистикой клиента):\r\n/inbound [Remark]" -"helpClientCommands" = "Для получения статистики используйте следующую команду:\r\n \r\n/usage [Email]" +"helpAdminCommands" = "Поиск по электронной почте клиента:\r\n/usage [Email]\r\n\r\nПоиск входящих соединений (со статистикой клиента):\r\n/inbound [Remark]" +"helpClientCommands" = "Для получения статистики используйте следующую команду:\r\n\r\n/usage [Email]" [tgbot.messages] "cpuThreshold" = "🔴 Загрузка процессора составляет {{ .Percent }}%, что превышает пороговое значение {{ .Threshold }}%" @@ -476,7 +476,7 @@ "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n" "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n" "ip" = "🌐 IP: {{ .IP }}\r\n" -"ips" = "🔢 IP-адреса: \r\n{{ .IPs }}\r\n" +"ips" = "🔢 IP-адреса:\r\n{{ .IPs }}\r\n" "serverUpTime" = "⏳ Время работы сервера: {{ .UpTime }} {{ .Unit }}\r\n" "serverLoad" = "📈 Загрузка сервера: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n" "serverMemory" = "📋 Память сервера: {{ .Current }}/{{ .Total }}\r\n" @@ -502,9 +502,9 @@ "exhaustedCount" = "🚨 Количество исчерпанных {{ .Type }}:\r\n" "onlinesCount" = "🌐 Клиентов онлайн: {{ .Count }}\r\n" "disabled" = "🛑 Отключено: {{ .Disabled }}\r\n" -"depleteSoon" = "🔜 Скоро исчерпание: {{ .Deplete }}\r\n \r\n" +"depleteSoon" = "🔜 Скоро исчерпание: {{ .Deplete }}\r\n\r\n" "backupTime" = "🗄 Время резервного копирования: {{ .Time }}\r\n" -"refreshedOn" = "\r\n📋🔄 Обновлено: {{ .Time }}\r\n \r\n" +"refreshedOn" = "\r\n📋🔄 Обновлено: {{ .Time }}\r\n\r\n" "yes" = "✅ Да" "no" = "❌ Нет" diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml index 4d3b62f2..3c3da274 100644 --- a/web/translation/translate.vi_VN.toml +++ b/web/translation/translate.vi_VN.toml @@ -460,8 +460,8 @@ "status" = "✅ Bot hoạt động bình thường!" "usage" = "❗ Vui lòng cung cấp văn bản để tìm kiếm!" "getID" = "🆔 ID của bạn: {{ .ID }}" -"helpAdminCommands" = "Tìm kiếm email của khách hàng:\r\n/usage [Email]\r\n \r\nTìm kiếm inbounds (với thống kê của khách hàng):\r\n/inbound [Ghi chú]" -"helpClientCommands" = "Để tìm kiếm thống kê, hãy sử dụng lệnh sau:\r\n \r\n/usage [Email]" +"helpAdminCommands" = "Tìm kiếm email của khách hàng:\r\n/usage [Email]\r\n\r\nTìm kiếm inbounds (với thống kê của khách hàng):\r\n/inbound [Ghi chú]" +"helpClientCommands" = "Để tìm kiếm thống kê, hãy sử dụng lệnh sau:\r\n\r\n/usage [Email]" [tgbot.messages] "cpuThreshold" = "🔴 Sử dụng CPU {{ .Percent }}% vượt quá ngưỡng {{ .Threshold }}%" @@ -476,7 +476,7 @@ "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n" "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n" "ip" = "🌐 IP: {{ .IP }}\r\n" -"ips" = "🔢 Các IP: \r\n{{ .IPs }}\r\n" +"ips" = "🔢 Các IP:\r\n{{ .IPs }}\r\n" "serverUpTime" = "⏳ Thời gian hoạt động của máy chủ: {{ .UpTime }} {{ .Unit }}\r\n" "serverLoad" = "📈 Tải máy chủ: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n" "serverMemory" = "📋 Bộ nhớ máy chủ: {{ .Current }}/{{ .Total }}\r\n" @@ -502,9 +502,9 @@ "exhaustedCount" = "🚨 Số lần cạn kiệt {{ .Type }}:\r\n" "onlinesCount" = "🌐 Khách hàng trực tuyến: {{ .Count }}\r\n" "disabled" = "🛑 Vô hiệu hóa: {{ .Disabled }}\r\n" -"depleteSoon" = "🔜 Sắp cạn kiệt: {{ .Deplete }}\r\n \r\n" +"depleteSoon" = "🔜 Sắp cạn kiệt: {{ .Deplete }}\r\n\r\n" "backupTime" = "🗄 Thời gian sao lưu: {{ .Time }}\r\n" -"refreshedOn" = "\r\n📋🔄 Đã cập nhật lần cuối vào: {{ .Time }}\r\n \r\n" +"refreshedOn" = "\r\n📋🔄 Đã cập nhật lần cuối vào: {{ .Time }}\r\n\r\n" "yes" = "✅ Có" "no" = "❌ Không" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index ac9c1537..cde5aa3a 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -460,8 +460,8 @@ "status" = "✅ 机器人正常运行!" "usage" = "❗ 请输入要搜索的文本!" "getID" = "🆔 您的ID为:{{ .ID }}" -"helpAdminCommands" = "搜索客户端邮箱:\r\n/usage [Email]\r\n \r\n搜索入站连接(包含客户端统计信息):\r\n/inbound [Remark]" -"helpClientCommands" = "要搜索统计信息,请使用以下命令:\r\n \r\n/usage [Email]" +"helpAdminCommands" = "搜索客户端邮箱:\r\n/usage [Email]\r\n\r\n搜索入站连接(包含客户端统计信息):\r\n/inbound [Remark]" +"helpClientCommands" = "要搜索统计信息,请使用以下命令:\r\n\r\n/usage [Email]" [tgbot.messages] "cpuThreshold" = "🔴 CPU 使用率为 {{ .Percent }}%,超过阈值 {{ .Threshold }}%" @@ -502,9 +502,9 @@ "exhaustedCount" = "🚨 耗尽的{{ .Type }}数量:\r\n" "onlinesCount" = "🌐 在线客户:{{ .Count }}\r\n" "disabled" = "🛑 禁用:{{ .Disabled }}\r\n" -"depleteSoon" = "🔜 即将耗尽:{{ .Deplete }}\r\n \r\n" +"depleteSoon" = "🔜 即将耗尽:{{ .Deplete }}\r\n\r\n" "backupTime" = "🗄 备份时间:{{ .Time }}\r\n" -"refreshedOn" = "\r\n📋🔄 刷新时间:{{ .Time }}\r\n \r\n" +"refreshedOn" = "\r\n📋🔄 刷新时间:{{ .Time }}\r\n\r\n" "yes" = "✅ 是的" "no" = "❌ 没有"