Merge pull request #327 from masutaka/fix-deprecates

Fix deprecate warnings

Author: masutaka

README.md

@@ -99,8 +99,6 @@ $ github-nippou
 
 The following projects use github-nippou as a library:
 
-* https://github.com/ryoppippi/gh-nippou
-    * gh CLI extension for github-nippou
 * https://github.com/MH4GF/github-nippou-web
     * A web app version of github-nippou
 * https://github.com/NoritakaIkeda/GitJournal

README_ja.md

@@ -99,8 +99,6 @@ $ github-nippou
 
 以下のプロジェクトが github-nippou をライブラリとして利用しています:
 
-* https://github.com/ryoppippi/gh-nippou
-    * github-nippou の gh CLI 拡張
 * https://github.com/MH4GF/github-nippou-web
     * github-nippou の Web アプリ版
 * https://github.com/NoritakaIkeda/GitJournal

lib/events.go

@@ -59,11 +59,7 @@ func continueToRetrieve(response *github.Response, events []*github.Event, since
 
 	lastEvent := *events[len(events)-1]
 
-	if lastEvent.CreatedAt.Before(sinceTime.Add(-time.Nanosecond)) {
-		return false
-	}
-
-	return true
+	return !lastEvent.CreatedAt.Before(sinceTime.Add(-time.Nanosecond))
 }
 
 func selectEventsInRange(events []*github.Event, sinceTime, untilTime time.Time) []*github.Event {
@@ -89,7 +85,12 @@ func (e *Events) filter(events []*github.Event) []*github.Event {
 	for _, event := range events {
 		if e.debug {
 			format := NewFormat(e.ctx, e.client, Settings{}, false)
-			fmt.Printf("[Debug] %s: %v\n", *event.Type, format.Line(event, 999))
+			line, err := format.Line(event, 999)
+			if err != nil {
+				fmt.Printf("[Debug] %s: parse error %v\n", *event.Type, err)
+			} else {
+				fmt.Printf("[Debug] %s: %v\n", *event.Type, line)
+			}
 		}
 
 		switch *event.Type {

lib/format.go

@@ -68,8 +68,11 @@ func NewLineByDiscussion(repoName string, discussion github.Discussion) Line {
 }
 
 // Line returns Issue/PR info retrieving from GitHub
-func (f *Format) Line(event *github.Event, i int) Line {
-	payload := event.Payload()
+func (f *Format) Line(event *github.Event, i int) (Line, error) {
+	payload, err := event.ParsePayload()
+	if err != nil {
+		return Line{}, err
+	}
 	var line Line
 
 	switch *event.Type {
@@ -139,7 +142,7 @@ func (f *Format) Line(event *github.Event, i int) Line {
 		fmt.Printf("[Debug] %2d %s: %v\n", i, *event.Type, line)
 	}
 
-	return line
+	return line, nil
 }
 
 func getIssue(ctx context.Context, client *github.Client, repoFullName string, number int) *github.Issue {

lib/format_test.go

@@ -10,23 +10,23 @@ import (
 
 func TestFormatAll(t *testing.T) {
 	issue := github.Issue{
-		State:   github.String("closed"),
-		Title:   github.String("イベントを取得できないことがある"),
-		User:    &github.User{Login: github.String("masutaka")},
-		HTMLURL: github.String("https://github.com/masutaka/github-nippou/issues/1"),
+		State:   github.Ptr("closed"),
+		Title:   github.Ptr("イベントを取得できないことがある"),
+		User:    &github.User{Login: github.Ptr("masutaka")},
+		HTMLURL: github.Ptr("https://github.com/masutaka/github-nippou/issues/1"),
 	}
 	pr := github.PullRequest{
-		State:   github.String("closed"),
-		Title:   github.String("Bundle Update on 2015-10-04"),
-		User:    &github.User{Login: github.String("deppbot")},
-		HTMLURL: github.String("https://github.com/masutaka/github-nippou/pull/31"),
-		Merged:  github.Bool(true),
+		State:   github.Ptr("closed"),
+		Title:   github.Ptr("Bundle Update on 2015-10-04"),
+		User:    &github.User{Login: github.Ptr("deppbot")},
+		HTMLURL: github.Ptr("https://github.com/masutaka/github-nippou/pull/31"),
+		Merged:  github.Ptr(true),
 	}
 	discussion := github.Discussion{
-		State:   github.String("closed"),
-		Title:   github.String("ロードマップ募集"),
-		User:    &github.User{Login: github.String("masutaka")},
-		HTMLURL: github.String("https://github.com/masutaka/github-nippou/discussions/2"),
+		State:   github.Ptr("closed"),
+		Title:   github.Ptr("ロードマップ募集"),
+		User:    &github.User{Login: github.Ptr("masutaka")},
+		HTMLURL: github.Ptr("https://github.com/masutaka/github-nippou/discussions/2"),
 	}
 	lines := lib.Lines{
 		lib.NewLineByIssue("masutaka/github-nippou", issue),

lib/list.go

@@ -86,21 +86,31 @@ func (l *List) Collect() (string, error) {
 	var lines Lines
 	var wg sync.WaitGroup
 	var mu sync.Mutex
+	var firstErr error
 
 	for i, event := range events {
 		wg.Add(1)
 		go func(event *github.Event, i int) {
 			defer wg.Done()
 			sem <- 1
-			line := format.Line(event, i)
+			line, lineErr := format.Line(event, i)
 			<-sem
 
 			mu.Lock()
 			defer mu.Unlock()
+			if lineErr != nil {
+				if firstErr == nil {
+					firstErr = lineErr
+				}
+				return
+			}
 			lines = append(lines, line)
 		}(event, i)
 	}
 	wg.Wait()
+	if firstErr != nil {
+		return "", firstErr
+	}
 
 	allLines, err := format.All(lines)
 	if err != nil {

lib/settings.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/exec"
 	"strconv"
@@ -144,12 +144,12 @@ func createGist(ctx context.Context, client *github.Client) (*github.Gist, *gith
 
 	gistFiles := make(map[github.GistFilename]github.GistFile, 1)
 	gistFiles["settings.yml"] = github.GistFile{
-		Content: github.String(content),
+		Content: github.Ptr(content),
 	}
 
 	gist := &github.Gist{
-		Description: github.String("github-nippou settings"),
-		Public:      github.Bool(true),
+		Description: github.Ptr("github-nippou settings"),
+		Public:      github.Ptr(true),
 		Files:       gistFiles,
 	}
 
@@ -173,7 +173,7 @@ func getDefaultSettingsYml() (string, error) {
 
 	defer file.Close()
 
-	yml, err := ioutil.ReadAll(file)
+	yml, err := io.ReadAll(file)
 	if err != nil {
 		return "", err
 	}