fix: remove GODEBUG v2 and set UA

reddits bot detection is no longer happy with using GODEBUG to disabel http2, seems to be happy with enabled and setting proper UA related #77
guyfedwards · Jun 3, 2024 · 08a7ab5 · 08a7ab5
1 parent 57cbe22
commit 08a7ab5
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,4 @@ dist/
 .LSOverride
 ._*
 github_token
-nom
+./nom
diff --git a/cmd/nom/main.go b/cmd/nom/main.go
@@ -27,7 +27,7 @@ var (
 )
 
 func run(args []string, opts Options) error {
-	cfg, err := config.New(opts.ConfigPath, opts.Pager, opts.PreviewFeeds)
+	cfg, err := config.New(opts.ConfigPath, opts.Pager, opts.PreviewFeeds, version)
 	if err != nil {
 		return err
 	}
@@ -67,10 +67,6 @@ func run(args []string, opts Options) error {
 }
 
 func main() {
-	// disable http2 client as causing issues with reddit rss feed requests
-	// https://github.com/guyfedwards/nom/issues/7
-	os.Setenv("GODEBUG", "http2client=0")
-
 	var opts Options
 
 	parser := flags.NewParser(&opts, flags.Default)

diff --git a/internal/commands/commands.go b/internal/commands/commands.go
@@ -161,25 +161,25 @@ func (c Commands) TUI() error {
 		return fmt.Errorf("commands List: %w", err)
 	}
 
-    var errorItems []ErrorItem
-    // if no feeds in store, fetchAllFeeds, which will return previews
-    if len(c.config.PreviewFeeds) > 0 {
-        its, errorItems, err = c.fetchAllFeeds()
-        if err != nil {
-            return fmt.Errorf("[commands.go] TUI: %w", err)
-        }
-    // if no items, fetchAllFeeds and GetAllFeeds
-    } else if len(its) == 0 {
-        _, errorItems, err = c.fetchAllFeeds()
-        if err != nil {
-            return fmt.Errorf("[commands.go] TUI: %w", err)
-        }
-        // refetch for consistent data across calls
-        its, err = c.GetAllFeeds()
-        if err != nil {
-            return fmt.Errorf("[commands.go] TUI: %w", err)
-        }
-    }
+	var errorItems []ErrorItem
+	// if no feeds in store, fetchAllFeeds, which will return previews
+	if len(c.config.PreviewFeeds) > 0 {
+		its, errorItems, err = c.fetchAllFeeds()
+		if err != nil {
+			return fmt.Errorf("[commands.go] TUI: %w", err)
+		}
+		// if no items, fetchAllFeeds and GetAllFeeds
+	} else if len(its) == 0 {
+		_, errorItems, err = c.fetchAllFeeds()
+		if err != nil {
+			return fmt.Errorf("[commands.go] TUI: %w", err)
+		}
+		// refetch for consistent data across calls
+		its, err = c.GetAllFeeds()
+		if err != nil {
+			return fmt.Errorf("[commands.go] TUI: %w", err)
+		}
+	}
 
 	items := convertItems(its)
 
@@ -257,7 +257,7 @@ func (c Commands) fetchAllFeeds() ([]store.Item, []ErrorItem, error) {
 	for _, feed := range feeds {
 		wg.Add(1)
 
-		go fetchFeed(ch, &wg, feed)
+		go fetchFeed(ch, &wg, feed, c.config.Version)
 	}
 
 	go func() {
@@ -336,10 +336,10 @@ func (c Commands) GetAllFeeds() ([]store.Item, error) {
 	return items, nil
 }
 
-func fetchFeed(ch chan FetchResultError, wg *sync.WaitGroup, feed config.Feed) {
+func fetchFeed(ch chan FetchResultError, wg *sync.WaitGroup, feed config.Feed, version string) {
 	defer wg.Done()
 
-	r, err := rss.Fetch(feed)
+	r, err := rss.Fetch(feed, version)
 
 	if err != nil {
 		ch <- FetchResultError{res: rss.RSS{}, err: err, url: feed.URL}

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -49,6 +49,7 @@ type Config struct {
 	AutoRead       bool      `yaml:"autoread,omitempty"`
 	ShowFavourites bool
 	Openers        []Opener `yaml:"openers,omitempty"`
+	Version        string
 }
 
 func (c *Config) ToggleShowRead() {
@@ -59,7 +60,7 @@ func (c *Config) ToggleShowFavourites() {
 	c.ShowFavourites = !c.ShowFavourites
 }
 
-func New(configPath string, pager string, previewFeeds []string) (Config, error) {
+func New(configPath string, pager string, previewFeeds []string, version string) (Config, error) {
 	var configDir string
 
 	if configPath == "" {

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -21,41 +21,41 @@ func cleanup() {
 }
 
 func TestNewDefault(t *testing.T) {
-	c, _ := New("", "", []string{})
+	c, _ := New("", "", []string{}, "")
 	ucd, _ := os.UserConfigDir()
 
 	test.Equal(t, fmt.Sprintf("%s/nom/config.yml", ucd), c.configPath, "Wrong defaults set")
 	test.Equal(t, fmt.Sprintf("%s/nom", ucd), c.ConfigDir, "Wrong default ConfigDir set")
 }
 
 func TestConfigCustomPath(t *testing.T) {
-	c, _ := New("foo/bar.yml", "", []string{})
+	c, _ := New("foo/bar.yml", "", []string{}, "")
 
 	test.Equal(t, "foo/bar.yml", c.configPath, "Config path override not set")
 }
 
 func TestConfigDir(t *testing.T) {
-	c, _ := New("foo/bizzle/bar.yml", "", []string{})
+	c, _ := New("foo/bizzle/bar.yml", "", []string{}, "")
 
 	test.Equal(t, "foo/bizzle", c.ConfigDir, "ConfigDir not correctly parsed")
 }
 
 func TestNewOverride(t *testing.T) {
-	c, _ := New("foobar", "", []string{})
+	c, _ := New("foobar", "", []string{}, "")
 
 	test.Equal(t, "foobar", c.configPath, "Override not respected")
 }
 
 func TestPreviewFeedsOverrideFeedsFromConfigFile(t *testing.T) {
-	c, _ := New(configFixturePath, "", []string{})
+	c, _ := New(configFixturePath, "", []string{}, "")
 	c.Load()
 	feeds := c.GetFeeds()
 	test.Equal(t, 3, len(feeds), "Incorrect feeds number")
 	test.Equal(t, "cattle", feeds[0].URL, "First feed in a config must be cattle")
 	test.Equal(t, "bird", feeds[1].URL, "Second feed in a config must be bird")
 	test.Equal(t, "dog", feeds[2].URL, "Third feed in a config must be dog")
 
-	c, _ = New(configFixturePath, "", []string{"pumpkin", "radish"})
+	c, _ = New(configFixturePath, "", []string{"pumpkin", "radish"}, "")
 	c.Load()
 	feeds = c.GetFeeds()
 	test.Equal(t, 2, len(feeds), "Incorrect feeds number")
@@ -64,7 +64,7 @@ func TestPreviewFeedsOverrideFeedsFromConfigFile(t *testing.T) {
 }
 
 func TestConfigLoad(t *testing.T) {
-	c, _ := New(configFixturePath, "", []string{})
+	c, _ := New(configFixturePath, "", []string{}, "")
 	err := c.Load()
 	if err != nil {
 		t.Fatalf(err.Error())
@@ -76,7 +76,7 @@ func TestConfigLoad(t *testing.T) {
 }
 
 func TestConfigLoadPrecidence(t *testing.T) {
-	c, _ := New(configFixturePath, "testpager", []string{})
+	c, _ := New(configFixturePath, "testpager", []string{}, "")
 
 	err := c.Load()
 	if err != nil {
@@ -89,7 +89,7 @@ func TestConfigLoadPrecidence(t *testing.T) {
 }
 
 func TestConfigAddFeed(t *testing.T) {
-	c, _ := New(configFixtureWritePath, "", []string{})
+	c, _ := New(configFixtureWritePath, "", []string{}, "")
 
 	err := c.Load()
 	if err != nil {

diff --git a/internal/rss/rss.go b/internal/rss/rss.go
@@ -31,8 +31,9 @@ type RSS struct {
 	Channel Channel `xml:"channel"`
 }
 
-func Fetch(f config.Feed) (RSS, error) {
+func Fetch(f config.Feed, version string) (RSS, error) {
 	fp := gofeed.NewParser()
+	fp.UserAgent = fmt.Sprintf("nom/%s", version)
 
 	feed, err := fp.ParseURL(f.URL)
 	if err != nil {