feat(news)_: add NewsFeedLastFetchedTimestamp setting and hook it

Fixes #6496

Author: jrainville

appdatabase/migrations/sql/1744737285_add_settings_news_feed_last_fetched_timestamp.up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE settings ADD COLUMN news_feed_last_fetched_timestamp TIMESTAMP;
+UPDATE settings SET news_feed_last_fetched_timestamp = CURRENT_TIMESTAMP WHERE news_feed_last_fetched_timestamp IS NULL;

internal/newsfeed/news_feed_manager.go

@@ -96,8 +96,10 @@ func (n *NewsFeedManager) FetchRSS() ([]*gofeed.Item, error) {
 		}
 	}
 
-	// Update fetchFrom to now
-	n.fetchFrom = time.Now()
+	if len(filteredItems) > 0 {
+		// Update fetchFrom to now since we have new items
+		n.fetchFrom = time.Now()
+	}
 
 	return filteredItems, nil
 }

multiaccounts/settings/columns.go

@@ -227,6 +227,21 @@ var (
 		dBColumnName:   "networks",
 		valueHandler:   JSONBlobHandler,
 	}
+	NewsFeedEnabled = SettingField{
+		reactFieldName: "news-feed-enabled?",
+		dBColumnName:   "news_feed_enabled",
+		valueHandler:   BoolHandler,
+	}
+	NewsFeedLastFetchedTimestamp = SettingField{
+		reactFieldName: "news-feed-last-fetched-timestamp",
+		dBColumnName:   "news_feed_last_fetched_timestamp",
+		valueHandler:   TimeHandler,
+	}
+	NewsNotificationsEnabled = SettingField{
+		reactFieldName: "news-notifications-enabled?",
+		dBColumnName:   "news_notifications_enabled",
+		valueHandler:   BoolHandler,
+	}
 	NodeConfig = SettingField{
 		reactFieldName: "node-config",
 		dBColumnName:   "node_config",
@@ -324,11 +339,6 @@ var (
 		dBColumnName:   "remote_push_notifications_enabled",
 		valueHandler:   BoolHandler,
 	}
-	NewsNotificationsEnabled = SettingField{
-		reactFieldName: "news-notifications-enabled?",
-		dBColumnName:   "news_notifications_enabled",
-		valueHandler:   BoolHandler,
-	}
 	MessengerNotificationsEnabled = SettingField{
 		reactFieldName: "messenger-notifications-enabled?",
 		dBColumnName:   "messenger_notifications_enabled",
@@ -527,11 +537,6 @@ var (
 		dBColumnName:   "last_tokens_update",
 		valueHandler:   TimeHandler,
 	}
-	NewsFeedEnabled = SettingField{
-		reactFieldName: "news-feed-enabled?",
-		dBColumnName:   "news_feed_enabled",
-		valueHandler:   BoolHandler,
-	}
 	SettingFieldRegister = []SettingField{
 		AnonMetricsShouldSend,
 		Appearance,
@@ -574,6 +579,8 @@ var (
 		Name,
 		NetworksCurrentNetwork,
 		NetworksNetworks,
+		NewsFeedEnabled,
+		NewsFeedLastFetchedTimestamp,
 		NewsNotificationsEnabled,
 		MessengerNotificationsEnabled,
 		NodeConfig,
@@ -612,7 +619,6 @@ var (
 		WebviewAllowPermissionRequests,
 		AutoRefreshTokensEnabled,
 		LastTokensUpdate,
-		NewsFeedEnabled,
 	}
 )
 

multiaccounts/settings/database.go

@@ -147,10 +147,11 @@ INSERT INTO settings (
   wallet_collectible_preferences_group_by_community,
   test_networks_enabled,
   fleet,
-	auto_refresh_tokens_enabled
+  auto_refresh_tokens_enabled,
+  news_feed_last_fetched_timestamp
 ) VALUES (
 ?,?,?,?,?,?,?,?,?,?,?,?,?,?,
-?,?,?,?,?,?,?,?,?,'id',?,?,?,?,?,?,?,?,?,?,?)`,
+?,?,?,?,?,?,?,?,?,'id',?,?,?,?,?,?,?,?,?,?,?,?)`,
 		s.Address,
 		s.Currency,
 		s.CurrentNetwork,
@@ -185,6 +186,8 @@ INSERT INTO settings (
 		s.TestNetworksEnabled,
 		s.Fleet,
 		s.AutoRefreshTokensEnabled,
+		// Default the news feed last fetched timestamp to now
+		time.Now().Unix(),
 	)
 	if err != nil {
 		return err
@@ -372,8 +375,9 @@ func (db *Database) SetSettingLastSynced(setting SettingField, clock uint64) err
 
 func (db *Database) GetSettings() (Settings, error) {
 	var (
-		s                Settings
-		lastTokensUpdate sql.NullTime
+		s                            Settings
+		lastTokensUpdate             sql.NullTime
+		newsFeedLastFetchedTimestamp sql.NullTime
 	)
 	err := db.db.QueryRow(`
 	SELECT
@@ -392,7 +396,7 @@ func (db *Database) GetSettings() (Settings, error) {
 		test_networks_enabled, mutual_contact_enabled, profile_migration_needed, wallet_token_preferences_group_by_community, url_unfurling_mode,
 		mnemonic_was_not_shown, wallet_show_community_asset_when_sending_tokens, wallet_display_assets_below_balance,
 		wallet_display_assets_below_balance_threshold, wallet_collectible_preferences_group_by_collection, wallet_collectible_preferences_group_by_community,
-		peer_syncing_enabled, auto_refresh_tokens_enabled, last_tokens_update, news_feed_enabled
+		peer_syncing_enabled, auto_refresh_tokens_enabled, last_tokens_update, news_feed_enabled, news_feed_last_fetched_timestamp
 	FROM
 		settings
 	WHERE
@@ -480,6 +484,7 @@ func (db *Database) GetSettings() (Settings, error) {
 		&s.AutoRefreshTokensEnabled,
 		&lastTokensUpdate,
 		&s.NewsFeedEnabled,
+		&newsFeedLastFetchedTimestamp,
 	)
 
 	if err != nil {
@@ -490,6 +495,10 @@ func (db *Database) GetSettings() (Settings, error) {
 		s.LastTokensUpdate = lastTokensUpdate.Time
 	}
 
+	if newsFeedLastFetchedTimestamp.Valid {
+		s.NewsFeedLastFetchedTimestamp = newsFeedLastFetchedTimestamp.Time
+	}
+
 	return s, err
 }
 
@@ -881,3 +890,15 @@ func (db *Database) LastTokensUpdate() (result time.Time, err error) {
 	}
 	return
 }
+
+func (db *Database) NewsFeedLastFetchedTimestamp() (result time.Time, err error) {
+	var newsFeedLastFetchedTimestamp sql.NullTime
+	err = db.makeSelectRow(NewsFeedLastFetchedTimestamp).Scan(&newsFeedLastFetchedTimestamp)
+	if err == sql.ErrNoRows {
+		return result, nil
+	}
+	if newsFeedLastFetchedTimestamp.Valid {
+		result = newsFeedLastFetchedTimestamp.Time
+	}
+	return
+}

multiaccounts/settings/database_settings_manager.go

@@ -83,4 +83,5 @@ type DatabaseSettingsManager interface {
 	GetPeerSyncingEnabled() (result bool, err error)
 	AutoRefreshTokensEnabled() (result bool, err error)
 	LastTokensUpdate() (result time.Time, err error)
+	NewsFeedLastFetchedTimestamp() (result time.Time, err error)
 }

multiaccounts/settings/database_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -48,7 +49,8 @@ var (
 		DisplayAssetsBelowBalanceThreshold:  int64(100000000),
 		DisplayAssetsBelowBalance:           false,
 		ShowCommunityAssetWhenSendingTokens: true,
-		NewsFeedEnabled:                     true}
+		NewsFeedEnabled:                     true,
+	}
 )
 
 func setupTestDB(t *testing.T) (*Database, func()) {
@@ -130,6 +132,9 @@ func TestCreateSettings(t *testing.T) {
 
 	s, err := db.GetSettings()
 	require.NoError(t, err)
+	require.NotEqual(t, 0, s.NewsFeedLastFetchedTimestamp.UTC().Second())
+	// Reset the timestamp to 0 as it is set during CreateSettings as time.now and it's impossible to test reliably
+	s.NewsFeedLastFetchedTimestamp = time.Time{}
 	require.Equal(t, settings, s)
 }
 
@@ -251,3 +256,24 @@ func TestDatabase_NewsFeedEnabled(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, false, settings.NewsFeedEnabled)
 }
+
+func TestDatabase_NewsFeedLastFetchedTimestamp(t *testing.T) {
+	db, stop := setupTestDB(t)
+	defer stop()
+
+	require.NoError(t, db.CreateSettings(settings, config))
+
+	settings, err := db.GetSettings()
+	require.NoError(t, err)
+
+	// Using GreaterOrEqual because the timestamp is set during CreateSettings and there is a tiny chance that the second changes between
+	require.GreaterOrEqual(t, time.Now().UTC().Second(), settings.NewsFeedLastFetchedTimestamp.UTC().Second())
+
+	dateNow := time.Now()
+	err = db.SaveSetting(NewsFeedLastFetchedTimestamp.GetReactName(), dateNow)
+	require.NoError(t, err)
+
+	settings, err = db.GetSettings()
+	require.NoError(t, err)
+	require.Equal(t, dateNow.UTC().Second(), settings.NewsFeedLastFetchedTimestamp.UTC().Second())
+}

multiaccounts/settings/structs.go

@@ -157,9 +157,12 @@ type Settings struct {
 	Name                 string           `json:"name,omitempty"`
 	Networks             *json.RawMessage `json:"networks/networks"`
 	// NotificationsEnabled indicates whether local notifications should be enabled (android only)
-	NotificationsEnabled bool             `json:"notifications-enabled?,omitempty"`
-	PhotoPath            string           `json:"photo-path"`
-	PinnedMailserver     *json.RawMessage `json:"pinned-mailservers,omitempty"`
+	NotificationsEnabled         bool             `json:"notifications-enabled?,omitempty"`
+	NewsFeedEnabled              bool             `json:"news-feed-enabled?,omitempty"`
+	NewsFeedLastFetchedTimestamp time.Time        `json:"news-feed-last-fetched-timestamp,omitempty"`
+	NewsNotificationsEnabled     bool             `json:"news-notifications-enabled?,omitempty"`
+	PhotoPath                    string           `json:"photo-path"`
+	PinnedMailserver             *json.RawMessage `json:"pinned-mailservers,omitempty"`
 	// PreferredName represents the user's preferred Ethereum Name Service (ENS) name.
 	// If a user has multiple ENS names, they can select one as the PreferredName.
 	// When PreferredName is set, it takes precedence over the DisplayName for displaying the user's name.
@@ -181,7 +184,6 @@ type Settings struct {
 	RememberSyncingChoice          bool `json:"remember-syncing-choice?,omitempty"`
 	// RemotePushNotificationsEnabled indicates whether we should be using remote notifications (ios only for now)
 	RemotePushNotificationsEnabled bool             `json:"remote-push-notifications-enabled?,omitempty"`
-	NewsNotificationsEnabled       bool             `json:"news-notifications-enabled?,omitempty"`
 	MessengerNotificationsEnabled  bool             `json:"messenger-notifications-enabled?,omitempty"`
 	SigningPhrase                  string           `json:"signing-phrase"`
 	StickerPacksInstalled          *json.RawMessage `json:"stickers/packs-installed,omitempty"`
@@ -227,7 +229,6 @@ type Settings struct {
 	PeerSyncingEnabled                  bool                          `json:"peer-syncing-enabled?,omitempty"`
 	AutoRefreshTokensEnabled            bool                          `json:"auto-refresh-tokens-enabled,omitempty"`
 	LastTokensUpdate                    time.Time                     `json:"last-tokens-update,omitempty"`
-	NewsFeedEnabled                     bool                          `json:"news-feed-enabled?,omitempty"`
 }
 
 func (s Settings) MarshalJSON() ([]byte, error) {

protocol/messenger.go

@@ -908,15 +908,17 @@ func (m *Messenger) Start() (*MessengerResponse, error) {
 	}
 
 	if m.config.featureFlags.EnableNewsFeed {
-		// TODO get the last time we opened the app
-		twoHoursAgo := time.Now().Add(-2 * time.Hour)
+		lastFetched, err := m.settings.NewsFeedLastFetchedTimestamp()
+		if err != nil {
+			return nil, err
+		}
 		m.newsFeedManager = newsfeed.NewNewsFeedManager(
 			newsfeed.WithURL(newsfeed.STATUS_FEED_URL),
 			newsfeed.WithParser(gofeed.NewParser()),
 			newsfeed.WithHandler(m),
 			newsfeed.WithLogger(m.logger),
 			newsfeed.WithPollingInterval(30*time.Minute),
-			newsfeed.WithFetchFrom(twoHoursAgo),
+			newsfeed.WithFetchFrom(lastFetched),
 		)
 
 		// TODO only start if the setting is enabled

protocol/messenger_news_feed.go

@@ -1,11 +1,14 @@
 package protocol
 
 import (
+	"time"
+
 	"github.com/google/uuid"
 	"github.com/mmcdole/gofeed"
 	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/eth-node/types"
+	"github.com/status-im/status-go/multiaccounts/settings"
 	"github.com/status-im/status-go/signal"
 )
 
@@ -46,6 +49,13 @@ func (m *Messenger) HandleFeedItem(feedItem *gofeed.Item) (*MessengerResponse, e
 		return nil, err
 	}
 
+	// Update the lastFetch time to the current time
+	err = m.settings.SaveSetting(settings.NewsFeedLastFetchedTimestamp.GetReactName(), time.Now())
+	if err != nil {
+		m.logger.Error("HandleFeedItem: failed to save last fetch time", zap.Error(err))
+		return nil, err
+	}
+
 	return response, nil
 }
 

protocol/messenger_news_feed_test.go

@@ -43,6 +43,12 @@ func (s *MessengerNewsFeedSuite) TestHandleNewsFeedItem() {
 	err := s.m.HandleFeedItemAndSend(&item)
 	s.Require().NoError(err)
 
+	// Check that the lastFetched timestamp is updated
+	lastFetched, err := s.m.settings.NewsFeedLastFetchedTimestamp()
+	s.Require().NoError(err)
+	s.Require().GreaterOrEqual(time.Now().UTC().Second(), lastFetched.UTC().Second())
+
+	// Check that the notification is saved in the database
 	_, notifications, err := s.m.persistence.ActivityCenterNotifications("", 10, []ActivityCenterType{ActivityCenterNotificationTypeNews}, ActivityCenterQueryParamsReadAll, true)
 	s.Require().NoError(err)
 	s.Require().NotNil(notifications)