sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Use correct api urls for fetching timelines

Browse source
This commit is contained in:
Sonny Bakker 2020-09-26 23:08:40 +02:00
parent b53c40a3dd
commit 96b8ea7db3
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/newsreader/news/collection/forms/twitter.py
View file

@ -6,7 +6,7 @@ import pytz
from newsreader.news.collection.choices import RuleTypeChoices from newsreader.news.collection.choices import RuleTypeChoices
from newsreader.news.collection.forms.base import CollectionRuleForm from newsreader.news.collection.forms.base import CollectionRuleForm
from newsreader.news.collection.models import CollectionRule 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): class TwitterTimelineForm(CollectionRuleForm):
@ -22,7 +22,7 @@ class TwitterTimelineForm(CollectionRuleForm):
instance.type = RuleTypeChoices.twitter_timeline instance.type = RuleTypeChoices.twitter_timeline
instance.timezone = str(pytz.utc) 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: if commit:
instance.save() instance.save()

12
src/newsreader/news/collection/tests/views/test_twitter_views.py
View file

@ -9,7 +9,7 @@ from newsreader.news.collection.choices import RuleTypeChoices
from newsreader.news.collection.models import CollectionRule from newsreader.news.collection.models import CollectionRule
from newsreader.news.collection.tests.factories import TwitterTimelineFactory from newsreader.news.collection.tests.factories import TwitterTimelineFactory
from newsreader.news.collection.tests.views.base import CollectionRuleViewTestCase 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 from newsreader.news.core.tests.factories import CategoryFactory
@ -33,7 +33,10 @@ class TwitterTimelineCreateViewTestCase(CollectionRuleViewTestCase, TestCase):
rule = CollectionRule.objects.get(name="new rule") rule = CollectionRule.objects.get(name="new rule")
self.assertEquals(rule.type, RuleTypeChoices.twitter_timeline) 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.timezone, str(pytz.utc))
self.assertEquals(rule.favicon, None) self.assertEquals(rule.favicon, None)
self.assertEquals(rule.category.pk, self.category.pk) self.assertEquals(rule.category.pk, self.category.pk)
@ -116,7 +119,10 @@ class TwitterTimelineUpdateViewTestCase(CollectionRuleViewTestCase, TestCase):
self.rule.refresh_from_db() self.rule.refresh_from_db()
self.assertEquals(self.rule.type, RuleTypeChoices.twitter_timeline) 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.timezone, str(pytz.utc))
self.assertEquals(self.rule.favicon, None) self.assertEquals(self.rule.favicon, None)
self.assertEquals(self.rule.category.pk, self.category.pk) self.assertEquals(self.rule.category.pk, self.category.pk)