@@ -3,6 +3,7 @@
 
 # Python
 /.venv
+/__pycache__

@@ -97,6 +98,11 @@ class Database:
             return 0
         return int(row[0])
 
+    def find_feed_subscribers(self, feed_id: int) -> list:

@@ -6,3 +6,4 @@
         self.url = url
         self.title = title
         self.description = description
+        self.date = date

@@ -11,3 +11,4 @@
+class Feed:
     def __init__(self, url: str, items: list[FeedItem]) -> None:
         self.url = url
         self.items = items

@@ -0,0 +5,4 @@
+
+class UpdateManager:
+    def __init__(self, database: Database, notifier: Notifier, rss_reader: RssReader) -> None:
+        self.database = database

@@ -0,0 +13,4 @@
+        feeds = self.database.find_feeds()
+
+        for feed_id, feed_url in feeds:
+            new_items = self.rss_reader.get_feed(feed_url).items

@@ -0,0 +22,4 @@
+                continue
+
+            chat_ids = self.database.find_feed_subscribers(feed_id)
+            chat_ids = list(map(lambda x: x[0], chat_ids))

@@ -0,0 +31,4 @@
+            return new_items
+        
+        diff = []
+        urls = list(map(lambda x: x[1], old_items))

@@ -0,0 +38,4 @@
+                diff.append(item)
+
+        return diff
+

@@ -7,2 +4,2 @@
-        self.title = title
-        self.description = description
+class FeedItem:
+    def __init__(self, item: feedparser.util.FeedParserDict) -> None:

@@ -29,2 +14,3 @@
+        self.items = self.__get_items(feed.entries)
 
-    def __get_items(self, items: list) -> list:
+    def __get_items(self, items: list[feedparser.util.FeedParserDict]) -> list[FeedItem]:

@@ -0,0 +14,4 @@
+
+        for feed_id, feed_url in feeds:
+            new_items = self.rss_reader.get_feed(feed_url).items
+            old_items_url = self.database.find_feed_items_url(feed_id)

@@ -9,0 +9,4 @@
+        if 'published' in item:
+            self.date = item.published_parsed()
+        else:
+            self.date = ''

@@ -60,3 +60,2 @@
         feed_list = ''
-        for feed in feeds:
-            feed_list += '* ' + str(feed[0]) + ': ' + feed[1] + '\n'
+        for count, feed in enumerate(feeds, start=1):

@@ -61,2 +61,2 @@
-        for feed in feeds:
-            feed_list += '* ' + str(feed[0]) + ': ' + feed[1] + '\n'
+        for count, feed in enumerate(feeds, start=1):
+            feed_list += '* ' + str(count) + ': ' + feed['url'] + '\n'

@@ -101,2 +100,4 @@
+    def send_updates(self, chat_ids: list[int], updates: list[FeedItem], feed_title: str):
         """Send notification about new items to the user"""
         for chat_id in chat_ids:
+            self.bot.send_message(

@@ -121,2 +125,3 @@
             f"<strong><a href=\"{item.url}\">{item.title}</a></strong>\n\n"
-            f"{item.description}"
+            f"{item.description}\n"
+            f"{item.date}"

@@ -144,7 +157,6 @@ class Database:
             '   url TEXT NOT NULL UNIQUE,'
             '   title TEXT,'
             '   description TEXT,'
-            '   date NUMERIC,'

@@ -61,2 +61,2 @@
-        for feed in feeds:
-            feed_list += '* ' + str(feed[0]) + ': ' + feed[1] + '\n'
+        for index, feed in enumerate(feeds, start=1):
+            feed_list += '* ' + str(index) + ': ' + f"<a href={feed['url']}>{feed['title']}</a" + '\n'

@@ -91,3 +91,3 @@
     """Sends notifications to users about new RSS feed items."""
 
-    BATCH_LIMIT: int = 30
+    BATCH_LIMIT: int = 29