deleted read article (and not liked) that are retrieved since more than 15 days.

3 files changed, 16 insertions, 20 deletions

diff --git a/newspipe/models/article.py b/newspipe/models/article.py
index a8c247c0..1da56c64 100644
--- a/newspipe/models/article.py
+++ b/newspipe/models/article.py
@@ -64,17 +64,15 @@ class Article(db.Model, RightMixin):
     tags = association_proxy("tag_objs", "text")
 
     __table_args__ = (
-            ForeignKeyConstraint([user_id], ['user.id'], ondelete='CASCADE'),
-            ForeignKeyConstraint([feed_id], ['feed.id'], ondelete='CASCADE'),
-            ForeignKeyConstraint([category_id], ['category.id'],
-                                 ondelete='CASCADE'),
-            Index('ix_article_eid_cid_uid', user_id, category_id, entry_id),
-            Index('ix_article_retrdate', retrieved_date),
-
-            Index('user_id'),
-            Index('user_id', 'category_id'),
-            Index('user_id', 'feed_id'),
-            Index('ix_article_uid_fid_eid', user_id, feed_id, entry_id)
+        ForeignKeyConstraint([user_id], ["user.id"], ondelete="CASCADE"),
+        ForeignKeyConstraint([feed_id], ["feed.id"], ondelete="CASCADE"),
+        ForeignKeyConstraint([category_id], ["category.id"], ondelete="CASCADE"),
+        Index("ix_article_eid_cid_uid", user_id, category_id, entry_id),
+        Index("ix_article_retrdate", retrieved_date),
+        Index("user_id"),
+        Index("user_id", "category_id"),
+        Index("user_id", "feed_id"),
+        Index("ix_article_uid_fid_eid", user_id, feed_id, entry_id),
     )
 
     # api whitelists
diff --git a/newspipe/models/feed.py b/newspipe/models/feed.py
index 12622285..7e8d92ae 100644
--- a/newspipe/models/feed.py
+++ b/newspipe/models/feed.py
@@ -73,12 +73,11 @@ class Feed(db.Model, RightMixin):
     )
 
     __table_args__ = (
-            ForeignKeyConstraint([user_id], ['user.id'], ondelete='CASCADE'),
-            ForeignKeyConstraint([category_id], ['category.id'],
-                                 ondelete='CASCADE'),
-            ForeignKeyConstraint([icon_url], ['icon.url']),
-            Index('ix_feed_uid', user_id),
-            Index('ix_feed_uid_cid', user_id, category_id),
+        ForeignKeyConstraint([user_id], ["user.id"], ondelete="CASCADE"),
+        ForeignKeyConstraint([category_id], ["category.id"], ondelete="CASCADE"),
+        ForeignKeyConstraint([icon_url], ["icon.url"]),
+        Index("ix_feed_uid", user_id),
+        Index("ix_feed_uid_cid", user_id, category_id),
     )
 
     # idx_feed_uid_cid = Index("user_id", "category_id")
diff --git a/newspipe/models/tag.py b/newspipe/models/tag.py
index 0a0fe58c..02a6d29f 100644
--- a/newspipe/models/tag.py
+++ b/newspipe/models/tag.py
@@ -23,9 +23,8 @@ class ArticleTag(db.Model):
         self.text = text
 
     __table_args__ = (
-            ForeignKeyConstraint([article_id], ['article.id'],
-                                 ondelete='CASCADE'),
-            Index('ix_articletag_aid', article_id),
+        ForeignKeyConstraint([article_id], ["article.id"], ondelete="CASCADE"),
+        Index("ix_articletag_aid", article_id),
     )