Skip to content
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

Added a more telegram notifications options #2595

Merged
merged 7 commits into from
Feb 24, 2023
Merged

Added a more telegram notifications options #2595

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b91fe9d
Added a more telegram options
shynekomaid Jan 12, 2023
521356e
LINT fixes
shynekomaid Jan 12, 2023
27e0b1e
Remove required attribute for optional field
shynekomaid Jan 12, 2023
e427c70
Translate fixes
shynekomaid Jan 12, 2023
e9475ed
Merge remote-tracking branch 'origin/master' into telegram_test
louislam Feb 24, 2023
2fa233a
Fix prometheus null issues
louislam Feb 24, 2023
af82ea7
Merge manually
louislam Feb 24, 2023
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
17 changes: 13 additions & 4 deletions server/notification-providers/telegram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,20 @@ class Telegram extends NotificationProvider {
let okMsg = "Sent Successfully.";

try {
const paramsObj =
{
chat_id: notification.telegramChatID,
text: msg,
disable_notification: notification.telegramSilentNotification ?? false,
protect_content: notification.telegramProtectContent ?? false,

};
// if telegramChatThread specified, then add it to paramsObj
if (notification.telegramChatThread && notification.telegramChatThread.length > 0) {
paramsObj.message_thread_id = notification.telegramChatThread;
}
await axios.get(`https://api.telegram.org/bot${notification.telegramBotToken}/sendMessage`, {
params: {
chat_id: notification.telegramChatID,
text: msg,
},
params: paramsObj
});
return okMsg;

Expand Down
34 changes: 34 additions & 0 deletions src/components/notifications/Telegram.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,40 @@
</p>
</div>
</div>

<div class="mb-3">
<label for="telegram-chat-thread" class="form-label">{{ $t("Thread ID") }}</label>

<div class="input-group mb-3">
<input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control" required>
</div>

<div class="form-text">
{{ $t("Thread ID Description") }}
</div>
</div>

<div class="mb-3">
<div class="form-check form-switch">
<input v-model="$parent.notification.telegramSilentNotification" class="form-check-input" type="checkbox">
<label class="form-check-label">{{ $t("Silent Notification") }}</label>
</div>

<div class="form-text">
{{ $t("Silent Notification Description") }}
</div>
</div>

<div class="mb-3">
<div class="form-check form-switch">
<input v-model="$parent.notification.telegramProtectContent" class="form-check-input" type="checkbox">
<label class="form-check-label">{{ $t("Protect Forwarding") }}</label>
</div>

<div class="form-text">
{{ $t("Protect Forwarding Description") }}
</div>
</div>
</template>

<script>
Expand Down
6 changes: 6 additions & 0 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ export default {
supportTelegramChatID: "Support Direct Chat / Group / Channel's Chat ID",
wayToGetTelegramChatID: "You can get your chat ID by sending a message to the bot and going to this URL to view the chat_id:",
"YOUR BOT TOKEN HERE": "YOUR BOT TOKEN HERE",
"Silent Notification": "Silent Notification",
"Silent Notification Description": "If enabled, the notification in Telegram will be without sound.",
"Protect Forwarding": "Protect Forwarding",
"Protect Forwarding Description": "If enabled, the notification in Telegram will be protected from forwarding and saving.",
shynekomaid marked this conversation as resolved.
Show resolved Hide resolved
"Thread ID": "Thread ID (optional)",
"Thread ID Description": "Since November 5 2022, bots can send messages to a specific thread. You can get the thread ID by clicking on the thread name in the chat.",
chatIDNotFound: "Chat ID is not found; please send a message to this bot first",
webhook: "Webhook",
"Post URL": "Post URL",
Expand Down