add stream -json

cmd/mstdn/cmd_stream.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 	"os/signal"
@@ -12,6 +13,7 @@ import (
 )
 
 func cmdStream(c *cli.Context) error {
+	asJSON := c.Bool("json")
 	client := c.App.Metadata["client"].(*mastodon.Client)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -27,16 +29,20 @@ func cmdStream(c *cli.Context) error {
 		close(q)
 	}()
 	for e := range q {
-		switch t := e.(type) {
+		if asJSON {
-		case *mastodon.UpdateEvent:
+			json.NewEncoder(c.App.Writer).Encode(e)
-			color.Set(color.FgHiRed)
+		} else {
-			fmt.Fprintln(c.App.Writer, t.Status.Account.Username)
+			switch t := e.(type) {
-			color.Set(color.Reset)
+			case *mastodon.UpdateEvent:
-			fmt.Fprintln(c.App.Writer, textContent(t.Status.Content))
+				color.Set(color.FgHiRed)
-		case *mastodon.ErrorEvent:
+				fmt.Fprintln(c.App.Writer, t.Status.Account.Username)
-			color.Set(color.FgYellow)
+				color.Set(color.Reset)
-			fmt.Fprintln(c.App.Writer, t.Error())
+				fmt.Fprintln(c.App.Writer, textContent(t.Status.Content))
-			color.Set(color.Reset)
+			case *mastodon.ErrorEvent:
+				color.Set(color.FgYellow)
+				fmt.Fprintln(c.App.Writer, t.Error())
+				color.Set(color.Reset)
+			}
 		}
 	}
 	return nil

cmd/mstdn/main.go

@@ -178,8 +178,14 @@ func makeApp() *cli.App {
 			Action: cmdToot,
 		},
 		{
-			Name:   "stream",
+			Name:  "stream",
-			Usage:  "stream statuses",
+			Usage: "stream statuses",
+			Flags: []cli.Flag{
+				cli.BoolFlag{
+					Name:  "json",
+					Usage: "output JSON",
+				},
+			},
 			Action: cmdStream,
 		},
 		{

streaming.go

@@ -14,7 +14,9 @@ import (
 )
 
 // UpdateEvent is struct for passing status event to app.
-type UpdateEvent struct{ Status *Status }
+type UpdateEvent struct {
+	Status *Status `json:"status"`
+}
 
 func (e *UpdateEvent) event() {}