add show image flag

Author: nasum

cmd/root.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/viper"
 )
 
+// RootCmd is root command
 var RootCmd = &cobra.Command{
 	Use:           "tt",
 	Short:         "Twitter Client",

cmd/timeline.go

@@ -9,11 +9,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
+// TimelineParams command params
 type TimelineParams struct {
-	Count   int
-	SinceID int64
-	MaxID   int64
-	Reply   bool
+	Count     int
+	SinceID   int64
+	MaxID     int64
+	Reply     bool
+	ShowImage bool
 }
 
 func timelineCmd(config lib.Config) *cobra.Command {
@@ -33,9 +35,8 @@ func timelineCmd(config lib.Config) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if timelineParams.Reply == true {
 				return mentionTimeline(*client, *timelineParams, displayConsole)
-			} else {
-				return homeTimeline(*client, *timelineParams, displayConsole)
 			}
+			return homeTimeline(*client, *timelineParams, displayConsole)
 		},
 	}
 
@@ -44,6 +45,7 @@ func timelineCmd(config lib.Config) *cobra.Command {
 	flags.Int64VarP(&timelineParams.SinceID, "since-id", "S", 0, "Set since tweet id")
 	flags.Int64VarP(&timelineParams.MaxID, "max-id", "M", 0, "Set max tweet id")
 	flags.BoolVarP(&timelineParams.Reply, "mention", "m", false, "show mention timeline")
+	flags.BoolVarP(&timelineParams.ShowImage, "show-images", "s", false, "show images")
 
 	return cmd
 }
@@ -61,8 +63,8 @@ func homeTimeline(client twitter.Client, timelineParams TimelineParams, displayC
 	}
 
 	for _, tweet := range tweets {
-		err := displayConsole.ShowTweet(tweet)
-		
+		err := displayConsole.ShowTweet(tweet, timelineParams.ShowImage)
+
 		if err != nil {
 			return fmt.Errorf("cannot display tweet: %v", err)
 		}
@@ -85,7 +87,7 @@ func mentionTimeline(client twitter.Client, timelineParams TimelineParams, displ
 	}
 
 	for _, tweet := range tweets {
-		err = displayConsole.ShowTweet(tweet)
+		err = displayConsole.ShowTweet(tweet, timelineParams.ShowImage)
 
 		if err != nil {
 			return fmt.Errorf("cannot display tweet: %v", err)

cmd/tweet.go

@@ -29,7 +29,7 @@ func tweetCmd(config lib.Config) *cobra.Command {
 				return err
 			}
 
-			err = displayConsole.ShowTweet(*tweet)
+			err = displayConsole.ShowTweet(*tweet, true)
 			if err != nil {
 				return err
 			}
@@ -43,7 +43,3 @@ func tweetCmd(config lib.Config) *cobra.Command {
 
 	return cmd
 }
-
-func tweet(client twitter.Client, text string, reply_to string) error {
-	return nil
-}

lib/config.go

@@ -1,8 +1,9 @@
 package lib
 
+// Config is twitter authentication
 type Config struct {
-	ConsumerKey string
+	ConsumerKey    string
 	ConsumerSecret string
-	AccessToken string
-	AccessSecret string
-}
+	AccessToken    string
+	AccessSecret   string
+}

lib/display_console.go

@@ -55,7 +55,7 @@ func (d *DisplayConsole) Name(name string) string {
 }
 
 // ShowTweet is display tweet text
-func (d *DisplayConsole) ShowTweet(tweet twitter.Tweet) error {
+func (d *DisplayConsole) ShowTweet(tweet twitter.Tweet, showImage bool) error {
 	createdAt, err := tweet.CreatedAtTime()
 
 	if err != nil {
@@ -72,6 +72,10 @@ func (d *DisplayConsole) ShowTweet(tweet twitter.Tweet) error {
 		tweet.Text,
 	)
 
+	if showImage == false {
+		return nil
+	}
+
 	media := &Media{}
 
 	medias := tweet.Entities.Media

lib/media.go

@@ -21,7 +21,7 @@ type Media struct{}
 func (m *Media) ShowImage(url string) error {
 	res, err := http.Get(url)
 	if err != nil {
-		fmt.Errorf("cannot get image: %v: %v", err, res.Status)
+		return fmt.Errorf("cannot get image: %v: %v", err, res.Status)
 	}
 	defer res.Body.Close()