diff --git a/client/strings/en-us.json b/client/strings/en-us.json index 25c8268b..f6288912 100644 --- a/client/strings/en-us.json +++ b/client/strings/en-us.json @@ -918,8 +918,8 @@ "NotificationOnBackupCompletedDescription": "Triggered when a backup is completed", "NotificationOnBackupFailedDescription": "Triggered when a backup fails", "NotificationOnEpisodeDownloadedDescription": "Triggered when a podcast episode is auto-downloaded", - "NotificationOnRSSFeedDisabledDescription": "Triggered when an RSS feed is disabled due to too many failed attempts", - "NotificationOnRSSFeedFailedDescription": "Triggered when an RSS feed request/update fails, but is not disabled", + "NotificationOnRSSFeedDisabledDescription": "Triggered when automatic episode downloads are disabled due to too many failed attempts", + "NotificationOnRSSFeedFailedDescription": "Triggered when the RSS feed request fails for an automatic episode download", "NotificationOnTestDescription": "Event for testing the notification system", "PlaceholderNewCollection": "New collection name", "PlaceholderNewFolderPath": "New folder path", diff --git a/server/managers/NotificationManager.js b/server/managers/NotificationManager.js index 4f7072be..567da38e 100644 --- a/server/managers/NotificationManager.js +++ b/server/managers/NotificationManager.js @@ -72,11 +72,11 @@ class NotificationManager { } /** - * Handles RSS feed updates - * @param feedUrl - * @param numFailed - * @param title - * @returns {Promise} + * Handles scheduled episode download RSS feed request failed + * + * @param {string} feedUrl + * @param {number} numFailed + * @param {string} title */ async onRSSFeedFailed(feedUrl, numFailed, title) { if (!Database.notificationSettings.isUseable) return @@ -86,7 +86,7 @@ class NotificationManager { return } - Logger.debug(`[NotificationManager] onRSSFeedFailed: RSS feed update failed for ${feedUrl}`) + Logger.debug(`[NotificationManager] onRSSFeedFailed: RSS feed request failed for ${feedUrl}`) const eventData = { feedUrl: feedUrl, numFailed: numFailed || 0, @@ -96,11 +96,11 @@ class NotificationManager { } /** - * Handles RSS feed being disabled due to too many failed updates - * @param feedUrl - * @param numFailed - * @param title - * @returns {Promise} + * Handles scheduled episode downloads disabled due to too many failed attempts + * + * @param {string} feedUrl + * @param {number} numFailed + * @param {string} title */ async onRSSFeedDisabled(feedUrl, numFailed, title) { if (!Database.notificationSettings.isUseable) return @@ -110,7 +110,7 @@ class NotificationManager { return } - Logger.debug(`[NotificationManager] onRSSFeedDisabled: RSS feed disabled due to ${numFailed} failed updates for ${feedUrl}`) + Logger.debug(`[NotificationManager] onRSSFeedDisabled: Podcast scheduled episode download disabled due to ${numFailed} failed requests for ${feedUrl}`) const eventData = { feedUrl: feedUrl, numFailed: numFailed || 0, diff --git a/server/utils/notifications.js b/server/utils/notifications.js index 304b4ffe..700d3c38 100644 --- a/server/utils/notifications.js +++ b/server/utils/notifications.js @@ -63,12 +63,12 @@ module.exports.notificationData = { { name: 'onRSSFeedFailed', requiresLibrary: true, - description: 'Triggered when an RSS feed request/update fails, but is not disabled', + description: 'Triggered when the RSS feed request fails for an automatic episode download', descriptionKey: 'NotificationOnRSSFeedFailedDescription', variables: ['feedUrl', 'numFailed', 'title'], defaults: { - title: 'RSS Feed Update Failed', - body: 'Failed to update RSS feed for {{title}}.\nFeed URL: {{feedUrl}}\nNumber of failed attempts: {{numFailed}}' + title: 'RSS Feed Request Failed', + body: 'Failed to request RSS feed for {{title}}.\nFeed URL: {{feedUrl}}\nNumber of failed attempts: {{numFailed}}' }, testData: { title: 'Test RSS Feed', @@ -79,12 +79,12 @@ module.exports.notificationData = { { name: 'onRSSFeedDisabled', requiresLibrary: true, - description: 'Triggered when an RSS feed is disabled due to too many failed attempts', + description: 'Triggered when automatic episode downloads are disabled due to too many failed attempts', descriptionKey: 'NotificationOnRSSFeedDisabledDescription', variables: ['feedUrl', 'numFailed', 'title'], defaults: { - title: 'RSS Feed Disabled', - body: 'RSS feed for {{title}} has been disabled due to too many failed updates.\nFeed URL: {{feedUrl}}\nNumber of failed attempts: {{numFailed}}' + title: 'Podcast Episode Download Schedule Disabled', + body: 'Automatic episode downloads for {{title}} have been disabled due to too many failed RSS feed requests.\nFeed URL: {{feedUrl}}\nNumber of failed attempts: {{numFailed}}' }, testData: { title: 'Test RSS Feed',