From 96b8ea7db31032c336ec57557304c90daf556b1a Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sat, 26 Sep 2020 23:08:40 +0200 Subject: [PATCH] Use correct api urls for fetching timelines --- src/newsreader/news/collection/forms/twitter.py | 4 ++-- .../collection/tests/views/test_twitter_views.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/newsreader/news/collection/forms/twitter.py b/src/newsreader/news/collection/forms/twitter.py index 5603c7a..902652b 100644 --- a/src/newsreader/news/collection/forms/twitter.py +++ b/src/newsreader/news/collection/forms/twitter.py @@ -6,7 +6,7 @@ import pytz from newsreader.news.collection.choices import RuleTypeChoices from newsreader.news.collection.forms.base import CollectionRuleForm from newsreader.news.collection.models import CollectionRule -from newsreader.news.collection.twitter import TWITTER_URL +from newsreader.news.collection.twitter import TWITTER_API_URL class TwitterTimelineForm(CollectionRuleForm): @@ -22,7 +22,7 @@ class TwitterTimelineForm(CollectionRuleForm): instance.type = RuleTypeChoices.twitter_timeline instance.timezone = str(pytz.utc) - instance.url = f"{TWITTER_URL}/{instance.screen_name}" + instance.url = f"{TWITTER_API_URL}/statuses/user_timeline.json?screen_name={instance.screen_name}&tweet_mode=extended" if commit: instance.save() diff --git a/src/newsreader/news/collection/tests/views/test_twitter_views.py b/src/newsreader/news/collection/tests/views/test_twitter_views.py index 129ed79..d9afa26 100644 --- a/src/newsreader/news/collection/tests/views/test_twitter_views.py +++ b/src/newsreader/news/collection/tests/views/test_twitter_views.py @@ -9,7 +9,7 @@ from newsreader.news.collection.choices import RuleTypeChoices from newsreader.news.collection.models import CollectionRule from newsreader.news.collection.tests.factories import TwitterTimelineFactory from newsreader.news.collection.tests.views.base import CollectionRuleViewTestCase -from newsreader.news.collection.twitter import TWITTER_URL +from newsreader.news.collection.twitter import TWITTER_API_URL from newsreader.news.core.tests.factories import CategoryFactory @@ -33,7 +33,10 @@ class TwitterTimelineCreateViewTestCase(CollectionRuleViewTestCase, TestCase): rule = CollectionRule.objects.get(name="new rule") self.assertEquals(rule.type, RuleTypeChoices.twitter_timeline) - self.assertEquals(rule.url, f"{TWITTER_URL}/RobertsSpaceInd") + self.assertEquals( + rule.url, + f"{TWITTER_API_URL}/statuses/user_timeline.json?screen_name=RobertsSpaceInd&tweet_mode=extended", + ) self.assertEquals(rule.timezone, str(pytz.utc)) self.assertEquals(rule.favicon, None) self.assertEquals(rule.category.pk, self.category.pk) @@ -116,7 +119,10 @@ class TwitterTimelineUpdateViewTestCase(CollectionRuleViewTestCase, TestCase): self.rule.refresh_from_db() self.assertEquals(self.rule.type, RuleTypeChoices.twitter_timeline) - self.assertEquals(self.rule.url, f"{TWITTER_URL}/CyberpunkGame") + self.assertEquals( + self.rule.url, + f"{TWITTER_API_URL}/statuses/user_timeline.json?screen_name=CyberpunkGame&tweet_mode=extended", + ) self.assertEquals(self.rule.timezone, str(pytz.utc)) self.assertEquals(self.rule.favicon, None) self.assertEquals(self.rule.category.pk, self.category.pk)