fix #90: github: contribution: lookup call throw panic; update go-github to v49

Author: kamilsk

Taskfile

@@ -10,6 +10,12 @@ set -euo pipefail
 declare -A config
 config['dryrun']=false
 
+function github() {
+  _ mod upgrade -t "${1}" --mod-name=github.com/google/go-github/v"$(($1 - 1))"
+  _ go mod tidy
+  _ make format
+}
+
 _() {
   if ${config['dryrun']}; then
     echo "${@}"

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/golang/mock v1.6.0
-	github.com/google/go-github/v48 v48.2.0
+	github.com/google/go-github/v49 v49.0.0
 	github.com/spf13/afero v1.9.3
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5

go.sum

@@ -5,7 +5,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/google/go-github/v48/github"
+	"github.com/google/go-github/v49/github"
 	"github.com/spf13/cobra"
 	"go.octolab.org/async"
 	"go.octolab.org/safe"

internal/command/hub/root.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"regexp"
 	"sort"
 	"strconv"
 	"sync"
@@ -102,20 +103,35 @@ func contributionRange(doc *goquery.Document) (int, int) {
 	}
 }
 
+var contributionCount = regexp.MustCompile(`^\d+`)
+
 func contributionHeatMap(doc *goquery.Document) contribution.HeatMap {
 	chm := make(contribution.HeatMap)
 	doc.Find("svg.js-calendar-graph-svg rect.ContributionCalendar-day").
 		Each(func(_ int, node *goquery.Selection) {
-			count := node.AttrOr("data-count", "")
+			// data-count="0"
+			// data-count="2"
+			count, has := node.Attr("data-count")
+			if !has {
+				// No contributions on January 2, 2006
+				// 2 contributions on January 2, 2006
+				count = contributionCount.FindString(node.Text())
+				if count == "" {
+					count = "0"
+				}
+			}
 			c, err := strconv.Atoi(count)
 			if err != nil {
-				panic(fmt.Errorf("invalid count value: %s", count))
+				html, _ := node.Html()
+				panic(fmt.Errorf("invalid count value in `%s`: %w", html, err))
 			}
 
+			// data-date="2006-01-02"
 			date := node.AttrOr("data-date", "")
 			d, err := time.Parse(xtime.RFC3339Day, date)
 			if err != nil {
-				panic(fmt.Errorf("invalid date value: %s", date))
+				html, _ := node.Html()
+				panic(fmt.Errorf("invalid date value in `%s`: %w", html, err))
 			}
 
 			chm.SetCount(d, c)

internal/service/github/contribution.go

@@ -1,6 +1,8 @@
 package github
 
 import (
+	"context"
+	"flag"
 	"os"
 	"testing"
 	"time"
@@ -12,8 +14,23 @@ import (
 	"go.octolab.org/unsafe"
 )
 
+var update = flag.Bool("update", false, "update testdata")
+
 func TestContributionRange(t *testing.T) {
-	f, err := os.Open("testdata/github.kamilsk.1986.html")
+	const name = "testdata/github.kamilsk.1986.html"
+
+	if *update {
+		d, err := fetchContributions(context.TODO(), "kamilsk", 1986)
+		require.NoError(t, err)
+
+		h, err := d.Html()
+		require.NoError(t, err)
+
+		require.NoError(t, os.Truncate(name, 0))
+		require.NoError(t, os.WriteFile(name, []byte(h), 0666))
+	}
+
+	f, err := os.Open(name)
 	require.NoError(t, err)
 	defer safe.Close(f, unsafe.Ignore)
 
@@ -22,11 +39,24 @@ func TestContributionRange(t *testing.T) {
 
 	min, max := contributionRange(doc)
 	assert.Equal(t, 2011, min)
-	assert.Equal(t, 2022, max)
+	assert.Equal(t, 2023, max)
 }
 
 func TestContributionHeatMap(t *testing.T) {
-	f, err := os.Open("testdata/github.kamilsk.2013.html")
+	const name = "testdata/github.kamilsk.2013.html"
+
+	if *update {
+		d, err := fetchContributions(context.TODO(), "kamilsk", 2013)
+		require.NoError(t, err)
+
+		h, err := d.Html()
+		require.NoError(t, err)
+
+		require.NoError(t, os.Truncate(name, 0))
+		require.NoError(t, os.WriteFile(name, []byte(h), 0666))
+	}
+
+	f, err := os.Open(name)
 	require.NoError(t, err)
 	defer safe.Close(f, unsafe.Ignore)
 

internal/service/github/internal_test.go

@@ -5,7 +5,7 @@ import (
 	"embed"
 	"path/filepath"
 
-	"github.com/google/go-github/v48/github"
+	"github.com/google/go-github/v49/github"
 	"go.octolab.org/pointer"
 	"gopkg.in/yaml.v2"
 

internal/service/github/labels.go

@@ -3,7 +3,7 @@ package github
 import (
 	"net/http"
 
-	"github.com/google/go-github/v48/github"
+	"github.com/google/go-github/v49/github"
 )
 
 // New returns a new GitHub service.