Skip to content

Commit 06e149f

Browse files
committed
chore(news)_: hardcode the Status test RSS feeds and use the right one
Fixes #6563 Hardcodes the two RSS feed URLs and uses the right one depending on the platform
1 parent 8d7c32f commit 06e149f

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

internal/newsfeed/news_feed_manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
gocommon "github.com/status-im/status-go/common"
1111
)
1212

13-
// TODO replace with the real Status feed URL
14-
const STATUS_FEED_URL = "https://hnrss.org/frontpage"
13+
const STATUS_DESKTOP_FEED_URL = "https://status-website-git-add-rss-status-im-web.vercel.app/desktop-news/rss?_vercel_share=IySrfv1xyphlMgEp3rAfrCnzT19yjzG9&x-vercel-protection-bypass=I4euHZRiK3TEnAE5Kw73tQxhmxjBThSS"
14+
const STATUS_MOBILE_FEED_URL = "https://status-website-git-add-rss-status-im-web.vercel.app/mobile-news/rss?_vercel_share=IySrfv1xyphlMgEp3rAfrCnzT19yjzG9&x-vercel-protection-bypass=I4euHZRiK3TEnAE5Kw73tQxhmxjBThSS"
1515

1616
type FeedParser interface {
1717
ParseURL(url string) (*gofeed.Feed, error)

protocol/messenger.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,14 @@ func (m *Messenger) Start() (*MessengerResponse, error) {
903903
if err != nil {
904904
return nil, err
905905
}
906+
var feedUrl string
907+
if gocommon.IsMobilePlatform() {
908+
feedUrl = newsfeed.STATUS_MOBILE_FEED_URL
909+
} else {
910+
feedUrl = newsfeed.STATUS_DESKTOP_FEED_URL
911+
}
906912
m.newsFeedManager = newsfeed.NewNewsFeedManager(
907-
newsfeed.WithURL(newsfeed.STATUS_FEED_URL),
913+
newsfeed.WithURL(feedUrl),
908914
newsfeed.WithParser(gofeed.NewParser()),
909915
newsfeed.WithHandler(m),
910916
newsfeed.WithLogger(m.logger),

protocol/messenger_news_feed_test.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/mmcdole/gofeed"
99
"github.com/stretchr/testify/suite"
1010

11-
"github.com/status-im/status-go/internal/newsfeed"
11+
"github.com/status-im/status-go/eth-node/crypto"
1212
)
1313

1414
type MessengerNewsFeedSuite struct {
@@ -19,15 +19,13 @@ type MessengerNewsFeedSuite struct {
1919
func (s *MessengerNewsFeedSuite) SetupTest() {
2020
s.MessengerBaseTestSuite.SetupTest()
2121

22-
s.m = s.newMessenger()
23-
s.m.newsFeedManager = newsfeed.NewNewsFeedManager(
24-
newsfeed.WithURL(newsfeed.STATUS_FEED_URL),
25-
newsfeed.WithParser(gofeed.NewParser()),
26-
newsfeed.WithHandler(s.m),
27-
newsfeed.WithLogger(s.m.logger),
28-
newsfeed.WithPollingInterval(30*time.Minute),
29-
newsfeed.WithFetchFrom(time.Now().Add(-1*time.Hour)),
30-
)
22+
privateKey, err := crypto.GenerateKey()
23+
s.Require().NoError(err)
24+
25+
messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, []Option{WithNewsFeed()})
26+
s.Require().NoError(err)
27+
28+
s.m = messenger
3129
}
3230

3331
func TestMessengerNewsFeedSuite(t *testing.T) {

0 commit comments

Comments
 (0)