Added question body to the response, bumped to v0.0.4

Author: shadowy-pycoder

README.md

@@ -122,6 +122,13 @@ echo "export GOSO_QUESTIONS=5" >> $HOME/.profile
 source $HOME/.profile
 ```
 
+By default, `goso` will not show question body, but you can enable it like this:
+```shell
+echo "export GOSO_SHOW_QUESTIONS=1" >> $HOME/.profile
+```
+> [!WARNING]
+> Enabling the question body requires additional call to Stack Overflow API.
+
 ## Example
 
 ```shell

cmd/goso/cli.go

@@ -82,6 +82,20 @@ func root(args []string) error {
 			return fmt.Errorf("-a should be within [min=1, max=10], please check if `GOSO_ANSWERS` is set correctly")
 		}
 	}
+	sq, set := os.LookupEnv("GOSO_SHOW_QUESTIONS")
+	if set {
+		showQuestion, err := strconv.Atoi(sq)
+		if err != nil {
+			return fmt.Errorf("show question should be within [min=0, max=1], please check if `GOSO_SHOW_QUESTIONS` is set correctly")
+		}
+		if showQuestion == 0 {
+			conf.ShowQuestion = false
+		} else if showQuestion == 1 {
+			conf.ShowQuestion = true
+		} else {
+			return fmt.Errorf("show question should be within [min=0, max=1], please check if `GOSO_SHOW_QUESTIONS` is set correctly")
+		}
+	}
 	flags := flag.NewFlagSet(app, flag.ExitOnError)
 	flags.StringVar(&conf.Lexer, "l", lex, "The name of Chroma lexer. See https://github.com/alecthomas/chroma/tree/master/lexers/embedded")
 	flags.StringVar(&conf.Style, "s", style, "The name of Chroma style. See https://xyproto.github.io/splash/docs/")

goso.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/alecthomas/chroma/v2"
 	"github.com/alecthomas/chroma/v2/formatters"
 	"github.com/alecthomas/chroma/v2/lexers"
 	"github.com/alecthomas/chroma/v2/styles"
@@ -236,6 +237,37 @@ type StackOverflowResult struct {
 	QuotaRemaining int  `json:"quota_remaining"`
 }
 
+type StackOverflowQuestion struct {
+	Items []struct {
+		Tags  []string `json:"tags"`
+		Owner struct {
+			AccountID    int    `json:"account_id"`
+			Reputation   int    `json:"reputation"`
+			UserID       int    `json:"user_id"`
+			UserType     string `json:"user_type"`
+			ProfileImage string `json:"profile_image"`
+			DisplayName  string `json:"display_name"`
+			Link         string `json:"link"`
+		} `json:"owner"`
+		IsAnswered       bool   `json:"is_answered"`
+		ViewCount        int    `json:"view_count"`
+		ProtectedDate    int    `json:"protected_date"`
+		AnswerCount      int    `json:"answer_count"`
+		Score            int    `json:"score"`
+		LastActivityDate int    `json:"last_activity_date"`
+		CreationDate     int    `json:"creation_date"`
+		LastEditDate     int    `json:"last_edit_date,omitempty"`
+		QuestionID       int    `json:"question_id"`
+		ContentLicense   string `json:"content_license"`
+		Link             string `json:"link"`
+		Title            string `json:"title"`
+		Body             string `json:"body"`
+	} `json:"items"`
+	HasMore        bool `json:"has_more"`
+	QuotaMax       int  `json:"quota_max"`
+	QuotaRemaining int  `json:"quota_remaining"`
+}
+
 type OpenSerpResult struct {
 	Rank        int    `json:"rank"`
 	URL         string `json:"url"`
@@ -251,6 +283,7 @@ type Config struct {
 	Style        string
 	Lexer        string
 	QuestionNum  int
+	ShowQuestion bool
 	AnswerNum    int
 	OpenSerpHost string
 	OpenSerpPort int
@@ -297,6 +330,7 @@ type Result struct {
 	QuestionId  int
 	UpvoteCount int
 	Date        time.Time
+	Body        string
 	Answers     []*Answer
 }
 
@@ -419,6 +453,7 @@ func FetchStackOverflow(conf *Config, results map[int]*Result) error {
 	}
 	url := fmt.Sprintf("https://api.stackexchange.com/2.3/questions/%s/answers?order=desc&sort=votes&site=stackoverflow&filter=withbody",
 		netUrl.QueryEscape(strings.Join(questions, ";")))
+	//https://api.stackexchange.com/2.2/questions/6827752;48553152/?order=desc&sort=activity&site=stackoverflow&filter=withbody
 	req, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return err
@@ -436,11 +471,37 @@ func FetchStackOverflow(conf *Config, results map[int]*Result) error {
 	if err != nil {
 		return err
 	}
+	soQuestions := make(map[int]string)
+	if conf.ShowQuestion {
+		url = fmt.Sprintf("https://api.stackexchange.com/2.3/questions/%s/?order=desc&sort=activity&site=stackoverflow&filter=withbody",
+			netUrl.QueryEscape(strings.Join(questions, ";")))
+		req, err := http.NewRequest(http.MethodGet, url, nil)
+		if err != nil {
+			return err
+		}
+		res, err := conf.Client.Do(req)
+		if err != nil {
+			return err
+		}
+		defer res.Body.Close()
+		if res.StatusCode > 299 {
+			return fmt.Errorf("failed connecting to Stack Overflow API: %s", res.Status)
+		}
+		var soQuestionsResp StackOverflowQuestion
+		err = json.NewDecoder(res.Body).Decode(&soQuestionsResp)
+		if err != nil {
+			return err
+		}
+		for _, q := range soQuestionsResp.Items {
+			soQuestions[q.QuestionID] = q.Body
+		}
+	}
 	for _, item := range soResp.Items {
 		result, ok := results[item.QuestionID]
 		if !ok {
 			continue
 		}
+		result.Body = soQuestions[item.QuestionID]
 		result.Answers = append(result.Answers,
 			&Answer{
 				Title:      result.Title,
@@ -455,6 +516,35 @@ func FetchStackOverflow(conf *Config, results map[int]*Result) error {
 	return nil
 }
 
+func highlightText(text string, sb *strings.Builder, formatter chroma.Formatter, lexer chroma.Lexer, style *chroma.Style) error {
+	t := prepareText(text)
+	codeStartIdx = strings.Index(t, codeStartTag)
+	if codeStartIdx == -1 {
+		sb.WriteString(fmtText(t))
+	}
+	for codeStartIdx != -1 {
+		codeEndIdx = strings.Index(t, codeEndTag)
+		if codeEndIdx == -1 {
+			break
+		}
+		sb.WriteString(fmtText(t[:codeStartIdx]))
+		iterator, err := lexer.Tokenise(nil, html.UnescapeString(t[codeStartIdx+len(codeStartTag):codeEndIdx]))
+		if err != nil {
+			return err
+		}
+		err = formatter.Format(sb, style, iterator)
+		if err != nil {
+			return err
+		}
+		t = t[codeEndIdx+len(codeEndTag):]
+		codeStartIdx = strings.Index(t, codeStartTag)
+		if codeStartIdx == -1 {
+			sb.WriteString(fmtText(t))
+		}
+	}
+	return nil
+}
+
 func GetAnswers(conf *Config,
 	fetchResults func(*Config, map[int]*Result) error,
 	fetchAnswers func(*Config, map[int]*Result) error,
@@ -506,37 +596,25 @@ func GetAnswers(conf *Config,
 			return cmp.Compare(a.Score, b.Score)
 		})
 		answers.WriteString(res.String())
+		if conf.ShowQuestion {
+			var question strings.Builder
+			err = highlightText(res.Body, &question, formatter, lexer, style)
+			if err != nil {
+				return "", err
+			}
+			answers.WriteString("\n\n")
+			answers.WriteString(question.String())
+		}
 		var aIdx int
 		for _, ans := range slices.Backward(res.Answers) {
 			if aIdx >= conf.AnswerNum {
 				break
 			}
 			aIdx++
 			answers.WriteString(ans.String())
-			t := prepareText(ans.Body)
-			codeStartIdx = strings.Index(t, codeStartTag)
-			if codeStartIdx == -1 {
-				answers.WriteString(fmtText(t))
-			}
-			for codeStartIdx != -1 {
-				codeEndIdx = strings.Index(t, codeEndTag)
-				if codeEndIdx == -1 {
-					break
-				}
-				answers.WriteString(fmtText(t[:codeStartIdx]))
-				iterator, err := lexer.Tokenise(nil, html.UnescapeString(t[codeStartIdx+len(codeStartTag):codeEndIdx]))
-				if err != nil {
-					return "", err
-				}
-				err = formatter.Format(&answers, style, iterator)
-				if err != nil {
-					return "", err
-				}
-				t = t[codeEndIdx+len(codeEndTag):]
-				codeStartIdx = strings.Index(t, codeStartTag)
-				if codeStartIdx == -1 {
-					answers.WriteString(fmtText(t))
-				}
+			err = highlightText(ans.Body, &answers, formatter, lexer, style)
+			if err != nil {
+				return "", err
 			}
 		}
 	}

goso_test.go

@@ -76,11 +76,28 @@ func fetchStackOverflow(conf *Config, results map[int]*Result) error {
 	if err != nil {
 		return err
 	}
+	soQuestions := make(map[int]string)
+	if conf.ShowQuestion {
+		f, close, err := openFile("questions")
+		if err != nil {
+			return err
+		}
+		defer close()
+		var soQuestionsResp StackOverflowQuestion
+		err = json.NewDecoder(f).Decode(&soQuestionsResp)
+		if err != nil {
+			return err
+		}
+		for _, q := range soQuestionsResp.Items {
+			soQuestions[q.QuestionID] = q.Body
+		}
+	}
 	for _, item := range soResp.Items {
 		result, ok := results[item.QuestionID]
 		if !ok {
 			continue
 		}
+		result.Body = soQuestions[item.QuestionID]
 		result.Answers = append(result.Answers,
 			&Answer{
 				Title:      result.Title,
@@ -98,10 +115,11 @@ func fetchStackOverflow(conf *Config, results map[int]*Result) error {
 func BenchmarkGetAnswers(b *testing.B) {
 	b.ResetTimer()
 	conf := &Config{
-		Style:       "onedark",
-		Lexer:       "c",
-		QuestionNum: 10,
-		AnswerNum:   10,
+		Style:        "onedark",
+		Lexer:        "c",
+		QuestionNum:  10,
+		ShowQuestion: true,
+		AnswerNum:    10,
 	}
 	for i := 0; i < b.N; i++ {
 		_, err := GetAnswers(conf, fetchGoogle, fetchStackOverflow)
@@ -113,10 +131,11 @@ func BenchmarkGetAnswers(b *testing.B) {
 
 func TestOutput(t *testing.T) {
 	conf := &Config{
-		Style:       "onedark",
-		Lexer:       "c",
-		QuestionNum: 10,
-		AnswerNum:   10,
+		Style:        "onedark",
+		Lexer:        "c",
+		QuestionNum:  10,
+		ShowQuestion: true,
+		AnswerNum:    10,
 	}
 	answers, err := GetAnswers(conf, fetchGoogle, fetchStackOverflow)
 	if err != nil {