@@ -11,2 +11,2 @@
-token = os.getenv('TELEGRAM_TOKEN')
-db_path = os.getenv('DATABASE_PATH', './bot.db')
+token = os.getenv('RSSBOT_TG_TOKEN')
+db_dsn = os.getenv('RSSBOT_DSN',)

@@ -18,2 +16,2 @@
-        self.conn.row_factory = sqlite3.Row
-        self.cur = self.conn.cursor()
+        self.log.debug('Database.__init__(DSN=\'%s\')', dsn)
+        self.conn = psycopg2.connect(dsn)

@@ -26,2 +24,3 @@
+        self.cur.execute('INSERT INTO users (telegram_id) VALUES (%s)', [telegram_id])
         self.conn.commit()
-        return self.cur.lastrowid
+        return self.find_user(telegram_id)

@@ -42,2 +40,3 @@
+        self.cur.execute('INSERT INTO feeds (url) VALUES (%s)', [url])
         self.conn.commit()
-        return self.cur.lastrowid
+        return self.find_feed_by_url(url)

@@ -122,3 +121,3 @@
         return list(map(lambda x: x['telegram_id'], subscribers))
 
-    def find_feeds(self) -> list[sqlite3.Row]:
+    def find_feeds(self) -> list[psycopg2.extras.DictRow]:

@@ -179,3 +177,3 @@
             'CREATE TABLE IF NOT EXISTS feeds_last_items ('
             '   feed_id INTEGER,'
-            '   url TEXT NOT NULL UNIQUE,'
+            '   url TEXT NOT NULL,'

@@ -157,3 +158,3 @@
         if self.sent_counter >= self.BATCH_LIMIT:
             self.log.debug('Requests limit exceeded, sleeping for a second')
-            time.sleep(1)
+            time.sleep(2)

@@ -128,3 +128,3 @@
         return self.cur.fetchall()
 
-    def find_user_feeds(self, user_id: int) -> list[sqlite3.Row]:
+    def find_user_feeds(self, user_id: int) -> list[DictRow]:

@@ -186,1 +182,4 @@
         )
+
+    @staticmethod
+    def __convert_to_list_of_dicts(rows: list[DictRow]) -> list[dict]: