Skip to content

Add optional topic_id field for Telegram message sending #1583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrf1n wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Add optional topic_id field for Telegram message sending #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/public/assets/locales/bg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Токен на бот",
"chat_id": "Идентификатор на чата",
"topic_id": "ID на темата (незадължително)",
"error_message": "Съобщение за грешка",
"error_message_placeholder": "Грешка: %error%",
"send_failed": "Изпращане на съобщения за грешки",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Bot-token",
"chat_id": "Chat-ID",
"topic_id": "Emne-ID (valgfrit)",
"error_message": "Fejlmeddelelse",
"error_message_placeholder": "Fejl: %error%",
"send_failed": "Send fejlmeddelelser",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@
"fields": {
"token": "Bot Token",
"chat_id": "Chat ID",
"topic_id": "Themen-ID (optional)",
"error_message": "Fehlernachricht",
"error_message_placeholder": "Fehler: %error%",
"send_failed": "Fehlernachrichten senden",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@
"fields": {
"token": "Bot Token",
"chat_id": "Chat ID",
"topic_id": "Topic ID (optional)",
"error_message": "Error message",
"error_message_placeholder": "[%year%-%month%-%day% %hour%:%minute%] Error: %error%",
"send_failed": "Send error messages",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Bot Token",
"chat_id": "Chat ID",
"topic_id": "ID de tema (opcional)",
"error_message": "Mensaje de error",
"error_message_placeholder": "Error: %error%",
"send_failed": "Enviar mensajes de error",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Token du bot",
"chat_id": "ID de conversation",
"topic_id": "ID du sujet (facultatif)",
"error_message": "Message d'erreur",
"error_message_placeholder": "Erreur : %error%",
"send_failed": "Envoyer des messages d'erreur",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Token Bot",
"chat_id": "ID Chat",
"topic_id": "ID Topik (opsional)",
"error_message": "Pesan kesalahan",
"error_message_placeholder": "Kesalahan: %error%",
"send_failed": "Kirim pesan kesalahan",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Bot Token",
"chat_id": "ID chat",
"topic_id": "ID argomento (opzionale)",
"error_message": "Messaggio di errore",
"error_message_placeholder": "Errore: %error%",
"send_failed": "Inviare messaggi di errore",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Bot Token",
"chat_id": "Chat-ID",
"topic_id": "Onderwerp-ID (optioneel)",
"error_message": "Foutmelding",
"error_message_placeholder": "Fout: %error%",
"send_failed": "Foutberichten verzenden",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Token bota",
"chat_id": "ID czatu",
"topic_id": "ID wątku (opcjonalne)",
"error_message": "Komunikat o błędzie",
"error_message_placeholder": "Błąd: %error%",
"send_failed": "Wysyłaj komunikaty o błędach",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Token de bot",
"chat_id": "ID do bate-papo",
"topic_id": "ID do tópico (opcional)",
"error_message": "Mensagem de erro",
"error_message_placeholder": "Erro: %error%",
"send_failed": "Enviar mensagens de erro",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Токен бота",
"chat_id": "Идентификатор чата",
"topic_id": "ID темы (необязательно)",
"error_message": "Сообщение об ошибке",
"error_message_placeholder": "Ошибка: %error%",
"send_failed": "Отправка сообщений об ошибках",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/tr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "Bot Token",
"chat_id": "Sohbet Kimliği",
"topic_id": "Konu Kimliği (opsiyonel)",
"error_message": "Hata mesajı",
"error_message_placeholder": "Hata: %error%",
"send_failed": "Hata mesajlarını gönder",
Expand Down
1 change: 1 addition & 0 deletions client/public/assets/locales/zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
"fields": {
"token": "机器人令牌",
"chat_id": "聊天ID",
"topic_id": "话题ID（可选）",
"error_message": "测试失败通知内容",
"error_message_placeholder": "错误: %error%",
"send_failed": "发送测试失败通知",
Expand Down
9 changes: 5 additions & 4 deletions server/integrations/telegram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,27 @@ const defaults = {
failed: "❌ *A speedtest has failed*\n`Reason`: %error%"
};

const send = (token, chat_id, text, activity) =>
const send = (token, chat_id, text, activity, topic_id) =>
postJson(`https://api.telegram.org/bot${token}/sendMessage`,
{text, chat_id, parse_mode: "markdown"}, {activity});
{text, chat_id, parse_mode: "markdown", ...(topic_id ? {message_thread_id: topic_id} : {})}, {activity});

export default (registerEvent) => {
registerEvent('testFinished', async ({data: c}, data, activity) => {
if (c.send_finished) await send(c.token, c.chat_id,
replaceVariables(c.finished_message || defaults.finished, data), activity);
replaceVariables(c.finished_message || defaults.finished, data), activity, c.topic_id);
});

registerEvent('testFailed', async ({data: c}, error, activity) => {
if (c.send_failed) await send(c.token, c.chat_id,
replaceVariables(c.failed_message || defaults.failed, {error}), activity);
replaceVariables(c.failed_message || defaults.failed, {error}), activity, c.topic_id);
});

return {
icon: "fa-brands fa-telegram",
fields: [
{name: "token", type: "text", required: true, regex: /(\d+):[a-zA-Z0-9_-]+/},
{name: "chat_id", type: "text", required: true, regex: /\d+/},
{name: "topic_id", type: "text", required: false, regex: /^\d+$/},
{name: "send_finished", type: "boolean", required: false},
{name: "finished_message", type: "textarea", required: false},
{name: "send_failed", type: "boolean", required: false},
Expand Down