Skip to content

Commit af46022

Browse files
ablomerablomer
committed
Added individual feed notification configuration
1 parent cce0362 commit af46022

File tree

8 files changed

+287
-40
lines changed

8 files changed

+287
-40
lines changed

‎README.md

+11
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ A modern web application for monitoring RSS feeds and receiving notifications wh
77
- 🔍 Monitor multiple RSS feeds simultaneously
88
- 🔑 Define custom keywords for each feed
99
- 🔔 Real-time notifications via [ntfy.sh](https://ntfy.sh)
10+
- Customize notifications per feed
11+
- Use post content or custom titles and descriptions
12+
- Set notification priority
13+
- Include post links and matched keywords
1014
- ⏰ Configurable check intervals
1115
- 📱 Responsive web interface
1216

@@ -63,6 +67,13 @@ All configuration is managed through the web interface:
6367
### Feed Management
6468
- Add, edit, or remove RSS feeds through the "Feeds" tab
6569
- Set keywords for each feed to monitor
70+
- Configure notification settings for each feed:
71+
- Choose between post title or custom title
72+
- Choose between post description or custom description
73+
- Set notification priority (urgent, high, default, low, min)
74+
- Option to append post link to description
75+
- Option to include matched keywords as tags
76+
- Option to add "Open" action with post link
6677
- View feed status and history
6778

6879
### Settings

‎client/src/components/FeedForm.tsx

+65-6
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,78 @@
11
import { TextInput, Button, Group, Stack, ActionIcon, MultiSelect } from '@mantine/core';
22
import { useForm } from '@mantine/form';
3-
import { IconTrash } from '@tabler/icons-react';
4-
import { FeedConfig } from '../server/types';
5-
import { useEffect } from 'react';
3+
import { IconTrash, IconBellRinging } from '@tabler/icons-react';
4+
import { FeedConfig, NotificationSettings } from 'shared/types';
5+
import { useEffect, useState } from 'react';
6+
import { NotificationSettingsModal } from './NotificationSettingsModal';
67

78
interface FeedFormProps {
89
initialFeeds: FeedConfig[];
910
onSubmit: (feeds: FeedConfig[]) => void;
1011
}
1112

13+
const defaultNotificationSettings: NotificationSettings = {
14+
usePostTitle: true,
15+
usePostDescription: true,
16+
appendLink: false,
17+
priority: 'low',
18+
includeKeywordTags: true,
19+
includeOpenAction: true,
20+
};
21+
1222
export function FeedForm({ initialFeeds, onSubmit }: FeedFormProps) {
23+
const [editingNotificationIndex, setEditingNotificationIndex] = useState<number | null>(null);
24+
1325
const form = useForm({
1426
initialValues: {
15-
feeds: initialFeeds.length > 0 ? initialFeeds : [{ url: '', keywords: [] }],
27+
feeds: initialFeeds.length > 0 ? initialFeeds.map(feed => ({
28+
...feed,
29+
notificationSettings: feed.notificationSettings || defaultNotificationSettings,
30+
})) : [{
31+
url: '',
32+
keywords: [],
33+
notificationSettings: defaultNotificationSettings,
34+
}],
1635
},
1736
});
1837

1938
useEffect(() => {
2039
form.setValues({
21-
feeds: initialFeeds.length > 0 ? initialFeeds : [{ url: '', keywords: [] }],
40+
feeds: initialFeeds.length > 0 ? initialFeeds.map(feed => ({
41+
...feed,
42+
notificationSettings: feed.notificationSettings || defaultNotificationSettings,
43+
})) : [{
44+
url: '',
45+
keywords: [],
46+
notificationSettings: defaultNotificationSettings,
47+
}],
2248
});
2349
}, [initialFeeds]);
2450

2551
const addFeed = () => {
26-
form.insertListItem('feeds', { url: '', keywords: [] });
52+
form.insertListItem('feeds', {
53+
url: '',
54+
keywords: [],
55+
notificationSettings: defaultNotificationSettings,
56+
});
2757
};
2858

2959
const removeFeed = (index: number) => {
3060
form.removeListItem('feeds', index);
3161
};
3262

63+
const handleNotificationSettingsSave = (settings: NotificationSettings) => {
64+
if (editingNotificationIndex !== null) {
65+
const updatedFeeds = form.values.feeds.map((feed, index) =>
66+
index === editingNotificationIndex
67+
? { ...feed, notificationSettings: settings }
68+
: feed
69+
);
70+
form.setFieldValue('feeds', updatedFeeds);
71+
setEditingNotificationIndex(null);
72+
onSubmit(updatedFeeds);
73+
}
74+
};
75+
3376
return (
3477
<Stack h="100%" style={{ flex: 1 }}>
3578
<form onSubmit={form.onSubmit((values) => onSubmit(values.feeds))}>
@@ -74,6 +117,15 @@ export function FeedForm({ initialFeeds, onSubmit }: FeedFormProps) {
74117
}
75118
}}
76119
/>
120+
<ActionIcon
121+
color="blue"
122+
mt={28}
123+
onClick={() => setEditingNotificationIndex(index)}
124+
variant="subtle"
125+
title="Notification Settings"
126+
>
127+
<IconBellRinging size={16} />
128+
</ActionIcon>
77129
<ActionIcon
78130
color="red"
79131
mt={28}
@@ -94,6 +146,13 @@ export function FeedForm({ initialFeeds, onSubmit }: FeedFormProps) {
94146
</Group>
95147
</Stack>
96148
</form>
149+
150+
<NotificationSettingsModal
151+
opened={editingNotificationIndex !== null}
152+
onClose={() => setEditingNotificationIndex(null)}
153+
settings={editingNotificationIndex !== null ? form.values.feeds[editingNotificationIndex].notificationSettings : defaultNotificationSettings}
154+
onSave={handleNotificationSettingsSave}
155+
/>
97156
</Stack>
98157
);
99158
}

‎client/src/components/NotificationSettingsModal.tsx

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
import { Modal, TextInput, Switch, Select, Stack, Button, Group, Paper, Text } from '@mantine/core';
2+
import { NotificationSettings, NtfyPriority } from 'shared/types';
3+
import { useState, useEffect } from 'react';
4+
5+
interface NotificationSettingsModalProps {
6+
opened: boolean;
7+
onClose: () => void;
8+
settings: NotificationSettings;
9+
onSave: (settings: NotificationSettings) => void;
10+
}
11+
12+
export function NotificationSettingsModal({ opened, onClose, settings, onSave }: NotificationSettingsModalProps) {
13+
const [localSettings, setLocalSettings] = useState<NotificationSettings>(settings);
14+
15+
useEffect(() => {
16+
setLocalSettings(settings);
17+
}, [settings]);
18+
19+
const handleSave = () => {
20+
onSave(localSettings);
21+
onClose();
22+
};
23+
24+
const updateSettings = (newSettings: Partial<NotificationSettings>) => {
25+
setLocalSettings(current => ({
26+
...current,
27+
...newSettings,
28+
}));
29+
};
30+
31+
return (
32+
<Modal
33+
opened={opened}
34+
onClose={onClose}
35+
title="Notification Settings"
36+
size="lg"
37+
>
38+
<Stack>
39+
{/* Content Section */}
40+
<Paper withBorder p="md">
41+
<Stack>
42+
<Text fw={500} size="sm">Title</Text>
43+
<Stack gap="xs">
44+
<TextInput
45+
placeholder="Enter custom title"
46+
value={localSettings.customTitle || ''}
47+
onChange={(event) => updateSettings({ customTitle: event.currentTarget.value })}
48+
disabled={localSettings.usePostTitle}
49+
/>
50+
<Switch
51+
label="Use post title"
52+
checked={localSettings.usePostTitle}
53+
onChange={(event) => updateSettings({ usePostTitle: event.currentTarget.checked })}
54+
/>
55+
</Stack>
56+
57+
<Text fw={500} size="sm" mt="md">Description</Text>
58+
<Stack gap="xs">
59+
<TextInput
60+
placeholder="Enter custom description"
61+
value={localSettings.customDescription || ''}
62+
onChange={(event) => updateSettings({ customDescription: event.currentTarget.value })}
63+
disabled={localSettings.usePostDescription}
64+
/>
65+
<Switch
66+
label="Use post description"
67+
checked={localSettings.usePostDescription}
68+
onChange={(event) => updateSettings({ usePostDescription: event.currentTarget.checked })}
69+
/>
70+
</Stack>
71+
</Stack>
72+
</Paper>
73+
74+
{/* Options Section */}
75+
<Paper withBorder p="md">
76+
<Stack>
77+
<Text fw={500} size="sm">Priority</Text>
78+
<Select
79+
data={[
80+
{ value: 'urgent', label: 'Urgent' },
81+
{ value: 'high', label: 'High' },
82+
{ value: 'default', label: 'Default' },
83+
{ value: 'low', label: 'Low' },
84+
{ value: 'min', label: 'Min' },
85+
]}
86+
value={localSettings.priority}
87+
onChange={(value) => updateSettings({ priority: value as NtfyPriority })}
88+
/>
89+
90+
<Text fw={500} size="sm" mt="md">Additional Options</Text>
91+
<Stack gap="xs">
92+
<Switch
93+
label="Append post link to description"
94+
checked={localSettings.appendLink}
95+
onChange={(event) => updateSettings({ appendLink: event.currentTarget.checked })}
96+
/>
97+
<Switch
98+
label="Include matched keywords as tags"
99+
checked={localSettings.includeKeywordTags}
100+
onChange={(event) => updateSettings({ includeKeywordTags: event.currentTarget.checked })}
101+
/>
102+
<Switch
103+
label="Add 'Open' action with post link"
104+
checked={localSettings.includeOpenAction}
105+
onChange={(event) => updateSettings({ includeOpenAction: event.currentTarget.checked })}
106+
/>
107+
</Stack>
108+
</Stack>
109+
</Paper>
110+
111+
<Group justify="flex-end" mt="md">
112+
<Button variant="light" onClick={onClose}>Cancel</Button>
113+
<Button onClick={handleSave}>Save Changes</Button>
114+
</Group>
115+
</Stack>
116+
</Modal>
117+
);
118+
}

‎client/tsconfig.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
"resolveJsonModule": true,
1515
"isolatedModules": true,
1616
"noEmit": true,
17-
"jsx": "react-jsx"
17+
"jsx": "react-jsx",
18+
"baseUrl": "..",
19+
"paths": {
20+
"shared/*": ["shared/*"]
21+
}
1822
},
19-
"include": ["src/**/*"]
23+
"include": ["src/**/*", "../shared/**/*"]
2024
}

‎server/src/feedMonitor.ts

+49-13
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ export class FeedMonitor {
5858
}
5959

6060
private async checkFeed(url: string, keywords: string[]): Promise<void> {
61+
const config = this.configManager.getConfig();
62+
const feedConfig = config.feeds.find(f => f.url === url);
63+
if (!feedConfig) return;
64+
6165
this.status[url] = {
6266
lastCheck: new Date().toISOString(),
6367
isChecking: true
@@ -102,7 +106,7 @@ export class FeedMonitor {
102106
matchedKeywords
103107
};
104108

105-
await this.sendNotification(item, matchedKeywords);
109+
await this.sendNotification(item, matchedKeywords, feedConfig);
106110

107111
// Update history entry to reflect sent notification
108112
historyEntry.notificationSent = true;
@@ -148,24 +152,42 @@ export class FeedMonitor {
148152
}
149153
}
150154

151-
private async sendNotification(item: FeedItem, matchedKeywords: string[]) {
155+
private async sendNotification(item: FeedItem, matchedKeywords: string[], feedConfig: FeedConfig) {
152156
const config = this.configManager.getConfig();
153157
const ntfyUrl = `${config.ntfyServerAddress}/${config.ntfyTopic}`;
154-
const sanitizedTitle = item.title.replace(/[^\x20-\x7E]/g, '');
158+
const settings = feedConfig.notificationSettings;
159+
160+
// Determine title
161+
const title = settings.usePostTitle ? item.title : (settings.customTitle || item.title);
162+
const sanitizedTitle = title.replace(/[^\x20-\x7E]/g, '');
163+
164+
// Determine description
165+
let description = settings.usePostDescription ? item.description : (settings.customDescription || item.description);
166+
if (settings.appendLink && item.link) {
167+
description = `${description}\n\nLink: ${item.link}`;
168+
}
155169

156170
try {
157-
// Sanitize the title by removing any characters
158-
// that aren't in the ASCII printable range (0x20 to 0x7E)
159171
console.log(`🔔 Sending notification: "${sanitizedTitle}" to ${ntfyUrl}`);
172+
const headers: Record<string, string> = {
173+
'Title': sanitizedTitle,
174+
'Priority': settings.priority,
175+
};
176+
177+
// Add tags if enabled
178+
if (settings.includeKeywordTags && matchedKeywords.length > 0) {
179+
headers['Tags'] = matchedKeywords.join(',');
180+
}
181+
182+
// Add Open action if enabled
183+
if (settings.includeOpenAction && item.link) {
184+
headers['Actions'] = `view, Open, ${item.link}`;
185+
}
186+
160187
await fetch(ntfyUrl, {
161188
method: 'POST',
162-
body: item.description,
163-
headers: {
164-
'Title': sanitizedTitle,
165-
'Priority': 'low',
166-
'Tags': matchedKeywords.join(','),
167-
'Actions': `view, Open, ${item.link}`
168-
}
189+
body: description,
190+
headers,
169191
});
170192
} catch (error) {
171193
console.error(`❌ Failed to send "${sanitizedTitle}"\n → Error: ${error instanceof Error ? error.message : String(error)}`);
@@ -235,6 +257,20 @@ export class FeedMonitor {
235257
link: config.ntfyServerAddress,
236258
pubDate: new Date().toISOString()
237259
};
238-
await this.sendNotification(testItem, ["keyword1", "keyword2"]);
260+
261+
const testFeedConfig: FeedConfig = {
262+
url: "test",
263+
keywords: ["test"],
264+
notificationSettings: {
265+
usePostTitle: true,
266+
usePostDescription: true,
267+
appendLink: true,
268+
priority: 'default',
269+
includeKeywordTags: true,
270+
includeOpenAction: true,
271+
}
272+
};
273+
274+
await this.sendNotification(testItem, ["test"], testFeedConfig);
239275
}
240276
}

0 commit comments

Comments
 (0)