shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(notif): escape application title in Telegram notifications (#1012)

Browse Source
This commit is contained in:
TheCatLady
2021-02-24 23:14:32 -05:00
committed by GitHub
parent 09b5019e95
commit 5560abf459
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/lib/notifications/agents/telegram.ts
View File

@@ -53,6 +53,7 @@ class TelegramAgent
const title = this.escapeText(payload.subject); const title = this.escapeText(payload.subject);
const plot = this.escapeText(payload.message); const plot = this.escapeText(payload.message);
const user = this.escapeText(payload.notifyUser.displayName); const user = this.escapeText(payload.notifyUser.displayName);
const applicationTitle = this.escapeText(settings.main.applicationTitle);
/* eslint-disable no-useless-escape */ /* eslint-disable no-useless-escape */
switch (type) { switch (type) {
@@ -109,7 +110,7 @@ class TelegramAgent
if (settings.main.applicationUrl && payload.media) { if (settings.main.applicationUrl && payload.media) {
const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`; const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
message += `\n\n\[Open in ${settings.main.applicationTitle}\]\(${actionUrl}\)`; message += `\n\n\[Open in ${applicationTitle}\]\(${actionUrl}\)`;
} }
/* eslint-enable */ /* eslint-enable */

8
src/components/Settings/Notifications/NotificationsTelegram.tsx
View File

@@ -17,7 +17,7 @@ const messages = defineMessages({
botAPI: 'Bot Authentication Token', botAPI: 'Bot Authentication Token',
chatId: 'Chat ID', chatId: 'Chat ID',
validationBotAPIRequired: 'You must provide a bot authentication token', validationBotAPIRequired: 'You must provide a bot authentication token',
validationChatIdRequired: 'You must provide a valid chat ID', validationChatIdRequired: 'You must provide a chat ID',
telegramsettingssaved: 'Telegram notification settings saved successfully!', telegramsettingssaved: 'Telegram notification settings saved successfully!',
telegramsettingsfailed: 'Telegram notification settings failed to save.', telegramsettingsfailed: 'Telegram notification settings failed to save.',
testsent: 'Test notification sent!', testsent: 'Test notification sent!',
@@ -43,9 +43,9 @@ const NotificationsTelegram: React.FC = () => {
botAPI: Yup.string().required( botAPI: Yup.string().required(
intl.formatMessage(messages.validationBotAPIRequired) intl.formatMessage(messages.validationBotAPIRequired)
), ),
chatId: Yup.string() chatId: Yup.string().required(
.required(intl.formatMessage(messages.validationChatIdRequired)) intl.formatMessage(messages.validationChatIdRequired)
.matches(/^\d+$/, intl.formatMessage(messages.validationChatIdRequired)), ),
}); });
if (!data && !error) { if (!data && !error) {

2
src/i18n/locale/en.json
View File

@@ -326,7 +326,7 @@
"components.Settings.Notifications.test": "Test", "components.Settings.Notifications.test": "Test",
"components.Settings.Notifications.testsent": "Test notification sent!", "components.Settings.Notifications.testsent": "Test notification sent!",
"components.Settings.Notifications.validationBotAPIRequired": "You must provide a bot authentication token", "components.Settings.Notifications.validationBotAPIRequired": "You must provide a bot authentication token",
"components.Settings.Notifications.validationChatIdRequired": "You must provide a valid chat ID", "components.Settings.Notifications.validationChatIdRequired": "You must provide a chat ID",
"components.Settings.Notifications.validationEmail": "You must provide a valid email address", "components.Settings.Notifications.validationEmail": "You must provide a valid email address",
"components.Settings.Notifications.validationSmtpHostRequired": "You must provide an SMTP host", "components.Settings.Notifications.validationSmtpHostRequired": "You must provide an SMTP host",
"components.Settings.Notifications.validationSmtpPortRequired": "You must provide an SMTP port", "components.Settings.Notifications.validationSmtpPortRequired": "You must provide an SMTP port",