feat(reporting): add PR/curation filtered by time & emoji

Author: MikaelVallenet

reporting/github.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"time"
 
 	"github.com/google/go-github/v50/github"
 	"golang.org/x/oauth2"
@@ -40,3 +41,13 @@ func githubFetchPullRequests(client *github.Client, opts *github.PullRequestList
 
 	return pullRequests, nil
 }
+
+func filterPullRequestByTime(pullRequests []*github.PullRequest, since time.Time) []*github.PullRequest {
+	var filtered []*github.PullRequest
+	for _, pullRequest := range pullRequests {
+		if pullRequest.UpdatedAt.After(since) {
+			filtered = append(filtered, pullRequest)
+		}
+	}
+	return filtered
+}

reporting/output.go

@@ -45,7 +45,7 @@ func writeChangelog(issues []*github.Issue, outputFile *os.File) error {
 	if err != nil {
 		return err
 	}
-	result := fmt.Sprintf("# Changelog\n\nThere is **%d new closed issues** in gnolang/gno since %s\n\n%s", len(issues), opts.since, markdownTable)
+	result := fmt.Sprintf("# Changelog ⚙️\n\nThere is **%d new closed issues** in gnolang/gno since %s\n\n%s", len(issues), opts.since, markdownTable)
 
 	_, err = outputFile.WriteString(result)
 	if err != nil {
@@ -66,7 +66,7 @@ func writeBacklog(issues []*github.Issue, outputFile *os.File) error {
 	if err != nil {
 		return err
 	}
-	result := fmt.Sprintf("# Backlog\n\nThere is **%d new open issues** in gnolang/gno since %s\n\n%s", len(issues), opts.since, markdownTable)
+	result := fmt.Sprintf("# Backlog 💡\n\nThere is **%d new open issues** in gnolang/gno since %s\n\n%s", len(issues), opts.since, markdownTable)
 
 	_, err = outputFile.WriteString(result)
 	if err != nil {
@@ -75,19 +75,33 @@ func writeBacklog(issues []*github.Issue, outputFile *os.File) error {
 	return nil
 }
 
-func writeCuration(issues []*github.Issue, outputFile *os.File) error {
-	var issuesTable [][]string
+func writeCuration(issues []*github.Issue, pullRequests []*github.PullRequest, commits []*github.RepositoryCommit, outputFile *os.File) error {
+	// Format at Markdown format
+	var issuesRows [][]string
 	for _, issue := range issues {
-		issuesTable = append(issuesTable, []string{issue.GetTitle(), issue.GetURL(), issue.GetUser().GetLogin()})
+		issuesRows = append(issuesRows, []string{issue.GetTitle(), issue.GetURL(), issue.GetUser().GetLogin()})
+	}
+	issuesTable, err := markdown.NewTableFormatterBuilder().
+		Build("Title", "Link to issue", "Author").
+		Format(issuesRows)
+	if err != nil {
+		return err
 	}
+	result := fmt.Sprintf("# Curation 📚\n\n## New issues\nThere is **%d new issues** in gnolang/awesome-gno since %s\n\n%s", len(issues), opts.since, issuesTable)
 
-	markdownTable, err := markdown.NewTableFormatterBuilder().
-		Build("Title", "Link to Body", "Assignee").
-		Format(issuesTable)
+	var pullRequestRows [][]string
+	for _, pr := range pullRequests {
+		pullRequestRows = append(pullRequestRows, []string{pr.GetTitle(), pr.GetURL(), pr.GetUser().GetLogin()})
+	}
+	pullRequestsTable, err := markdown.NewTableFormatterBuilder().
+		Build("Title", "Link to PR", "Author").
+		Format(pullRequestRows)
 	if err != nil {
 		return err
 	}
-	result := fmt.Sprintf("# Curation\n\nThere is **%d new issues** in gnolang/awesome-gno since %s\n\n%s", len(issues), opts.since, markdownTable)
+	result += fmt.Sprintf("\n\n## New PR\nThere is **%d new PR** in gnolang/awesome-gno since %s\n\n%s", len(pullRequests), opts.since, pullRequestsTable)
+
+	result += fmt.Sprintf("\n\n## New commits\nThere is **%d new commits** in gnolang/awesome-gno since %s\n\n", len(commits), opts.since)
 
 	_, err = outputFile.WriteString(result)
 	if err != nil {
@@ -98,7 +112,7 @@ func writeCuration(issues []*github.Issue, outputFile *os.File) error {
 
 func writeTips(data string, outputFile *os.File) error {
 	// Format at Markdown format
-	var table [][]string
+	var rows [][]string
 	var tweets TweetSearch
 	authors := make(map[string]string)
 
@@ -107,17 +121,17 @@ func writeTips(data string, outputFile *os.File) error {
 		authors[user.Id] = user.Username
 	}
 	for _, tweet := range tweets.Data {
-		table = append(table, []string{authors[tweet.AuthorId], strings.Replace(tweet.Text, "\n", " ", -1), tweet.CreatedAt})
+		rows = append(rows, []string{authors[tweet.AuthorId], strings.Replace(tweet.Text, "\n", " ", -1), tweet.CreatedAt})
 	}
 
 	//Maybe build our own table formatter
-	markdownTable, err := markdown.NewTableFormatterBuilder().
+	table, err := markdown.NewTableFormatterBuilder().
 		Build("Author", "Text", "Created at").
-		Format(table)
+		Format(rows)
 	if err != nil {
 		return err
 	}
-	result := fmt.Sprintf("# Tips\n\nThere is **%d new tweet** about gnotips since %s\n\n%s", tweets.Meta.ResultCount, opts.since, markdownTable)
+	result := fmt.Sprintf("# Tips 🐦\n\n## New Tweets with #gnotips\nThere is **%d new tweet** about gnotips since %s\n\n%s", tweets.Meta.ResultCount, opts.since, table)
 
 	_, err = outputFile.WriteString(result)
 	if err != nil {

reporting/reporting.go

@@ -145,11 +145,20 @@ func fetchCuration(client *github.Client, since time.Time, outputFile *os.File)
 	if !opts.curation {
 		return nil
 	}
-	issues, err := githubFetchIssues(client, &github.IssueListByRepoOptions{State: "all", Since: since}, "gnolang", "awesome-gno")
+	issues, err := githubFetchIssues(client, &github.IssueListByRepoOptions{State: "open", Since: since}, "gnolang", "awesome-gno")
 	if err != nil {
 		return err
 	}
-	err = writeCuration(issues, outputFile)
+	pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "closed"}, "gnolang", "awesome-gno")
+	if err != nil {
+		return err
+	}
+	pullRequestsFiltered := filterPullRequestByTime(pullRequests, since)
+	commits, err := githubFetchCommits(client, &github.CommitsListOptions{Since: since}, "gnolang", "awesome-gno")
+	if err != nil {
+		return err
+	}
+	err = writeCuration(issues, pullRequestsFiltered, commits, outputFile)
 	if err != nil {
 		return err
 	}