Fix FeedTask collecting reddit rules & update deploy job

gitlab-ci/deploy.yml

@@ -13,7 +13,7 @@ deploy:
     - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts
     - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key
     - mkdir /root/.vaults
-    - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader && chmod 0600 /root/.vaults/newsreader
+    - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader
   script:
     - >
       ansible-playbook deployment/playbook.yml

src/newsreader/news/collection/tasks.py

@@ -8,6 +8,7 @@ from celery.utils.log import get_task_logger
 
 from newsreader.accounts.models import User
 from newsreader.celery import app
+from newsreader.news.collection.choices import RuleTypeChoices
 from newsreader.news.collection.feed import FeedCollector
 from newsreader.news.collection.utils import post
 from newsreader.utils.celery import MemCacheLock
@@ -33,7 +34,7 @@ class FeedTask(app.Task):
             if acquired:
                 logger.info(f"Running task for user {user_pk}")
 
-                rules = user.rules.enabled()
+                rules = user.rules.enabled().filter(type=RuleTypeChoices.feed)
 
                 collector = FeedCollector()
                 collector.collect(rules=rules)