0.3.4

- Use warnings for BuilderDuplicateExceptions
- Show user known urls in rules list view

src/newsreader/news/collection/models.py

@@ -75,6 +75,19 @@ class CollectionRule(TimeStampedModel):
 
         return reverse("news:collection:feed-update", kwargs={"pk": self.pk})
 
+    @property
+    def source_url(self):
+        if self.type == RuleTypeChoices.subreddit:
+            from newsreader.news.collection.reddit import REDDIT_API_URL, REDDIT_URL
+
+            return self.url.replace(REDDIT_API_URL, REDDIT_URL)
+        elif self.type == RuleTypeChoices.twitter_timeline:
+            from newsreader.news.collection.twitter import TWITTER_URL
+
+            return f"{TWITTER_URL}/{self.screen_name}"
+
+        return self.url
+
     @property
     def failed(self):
         return not self.succeeded and self.last_run

src/newsreader/news/collection/reddit.py

@@ -131,6 +131,9 @@ class RedditBuilder(PostBuilder):
         for entry in entries:
             try:
                 post = self.build_post(entry)
+            except BuilderDuplicateException:
+                logger.warning("Skipping duplicate post")
+                continue
             except BuilderException:
                 logger.exception("Failed building post")
                 continue

src/newsreader/news/collection/templates/news/collection/views/rules.html

@@ -53,8 +53,8 @@
                     <a class="link" href="{% url 'news:core:category-update' pk=rule.category.pk %}">{{ rule.category.name }}</a>
                   {% endif %}
                 </td>
-                <td class="table__item rules-table__item" title="{{ rule.url }}">
+                <td class="table__item rules-table__item" title="{{ rule.source_url }}">
-                  <a class="link" href="{{ rule.url }}" target="_blank" rel="noopener noreferrer">{{ rule.url }}</a>
+                  <a class="link" href="{{ rule.source_url }}" target="_blank" rel="noopener noreferrer">{{ rule.source_url }}</a>
                 </td>
                 <td class="table__item rules-table__item">
                   {% if rule.failed %}

src/newsreader/news/collection/twitter.py

@@ -56,6 +56,9 @@ class TwitterBuilder(PostBuilder):
         for post in self.payload:
             try:
                 post = self.build_post(post)
+            except BuilderDuplicateException:
+                logger.warning("Skipping duplicate post")
+                continue
             except BuilderException:
                 logger.exception("Failed building post")
                 continue