bid: change to matching by URL

And fix URL scraping of the n-gate RSS.

plugins/newsbid/webshit/webshit.go

@@ -123,7 +123,7 @@ func (w *Webshit) Check() ([]WeeklyResult, error) {
 
 	storyMap := map[string]Story{}
 	for _, s := range stories {
-		storyMap[s.Title] = s
+		storyMap[s.URL] = s
 	}
 
 	wr := w.checkBids(bids, storyMap)
@@ -162,7 +162,7 @@ func (w *Webshit) checkBids(bids []Bid, storyMap map[string]Story) []WeeklyResul
 		}
 		rec := wr[b.User]
 
-		if s, ok := storyMap[b.Title]; ok {
+		if s, ok := storyMap[b.URL]; ok {
 			log.Debug().Interface("story", s).Msg("won bid")
 			rec.Won += b.Bid
 			rec.Score += b.Bid
@@ -225,9 +225,13 @@ func (w *Webshit) GetWeekly() ([]Story, *time.Time, error) {
 	doc.Find(".storylink").Each(func(i int, s *goquery.Selection) {
 		story := Story{
 			Title: s.Find("a").Text(),
-			URL:   s.Find("a").AttrOr("src", ""),
+			URL:   s.SiblingsFiltered(".small").First().Find("a").AttrOr("href", ""),
 		}
 		items = append(items, story)
+		log.Debug().
+			Str("URL", story.URL).
+			Str("Title", story.Title).
+			Msg("Parsed webshit story")
 	})
 
 	return items, published, nil

plugins/newsbid/webshit/webshit_test.go

@@ -15,7 +15,7 @@ func init() {
 	log.Logger = log.Logger.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 }
 
-func make(t *testing.T) *Webshit {
+func makeWS(t *testing.T) *Webshit {
 	db := sqlx.MustOpen("sqlite3", "file::memory:?mode=memory&cache=shared")
 	w := New(db)
 	assert.Equal(t, w.db, db)
@@ -23,7 +23,7 @@ func make(t *testing.T) *Webshit {
 }
 
 func TestWebshit_GetWeekly(t *testing.T) {
-	w := make(t)
+	w := makeWS(t)
 	weekly, pub, err := w.GetWeekly()
 	t.Logf("Pub: %v", pub)
 	assert.NotNil(t, pub)
@@ -32,14 +32,14 @@ func TestWebshit_GetWeekly(t *testing.T) {
 }
 
 func TestWebshit_GetHeadlines(t *testing.T) {
-	w := make(t)
+	w := makeWS(t)
 	headlines, err := w.GetHeadlines()
 	assert.Nil(t, err)
 	assert.NotEmpty(t, headlines)
 }
 
 func TestWebshit_getStoryByURL(t *testing.T) {
-	w := make(t)
+	w := makeWS(t)
 	expected := "Developer Tropes: “Google Does It”"
 	s, err := w.getStoryByURL("https://news.ycombinator.com/item?id=20432887")
 	assert.Nil(t, err)
@@ -47,26 +47,26 @@ func TestWebshit_getStoryByURL(t *testing.T) {
 }
 
 func TestWebshit_getStoryByURL_BadURL(t *testing.T) {
-	w := make(t)
+	w := makeWS(t)
 	_, err := w.getStoryByURL("https://google.com")
 	assert.Error(t, err)
 }
 
 func TestWebshit_GetBalance(t *testing.T) {
-	w := make(t)
+	w := makeWS(t)
 	expected := 100
 	actual := w.GetBalance("foo")
 	assert.Equal(t, expected, actual)
 }
 
 func TestWebshit_checkBids(t *testing.T) {
-	w := make(t)
+	w := makeWS(t)
 	bids := []Bid{
 		Bid{User: "foo", Title: "bar", URL: "baz", Bid: 10},
 		Bid{User: "foo", Title: "bar2", URL: "baz2", Bid: 10},
 	}
 	storyMap := map[string]Story{
-		"bar": Story{Title: "bar", URL: "baz"},
+		"baz": Story{Title: "bar", URL: "baz"},
 	}
 	result := w.checkBids(bids, storyMap)
 	assert.Len(t, result, 1)