Connect to multiple channels (#30)

* support multi channels

* updates

* update demo

* update demo

* update demo

* update readme

* updates

* update readme

* update readme

* update readme

* update readme

Co-authored-by: atye <aaron.tye@gmail.com>

Author: atye

README.md

@@ -1,6 +1,8 @@
 # ttchat
 
-Connect to a Twitch channel's chat from your terminal
+Connect to Twitch channels' chat from your terminal.
+
+![](demo.gif)
 
 # Installing
 
@@ -20,8 +22,8 @@ You should see the binary at `./bin/ttchat`.
  A configuration file at `$HOME/.ttchat/config.yaml` containing some account information is required for authentication.
 
 ```
-clientID: "your_twitch_client_id"
-username: "your_twitch_login_username"
+clientID: "yourTwitchClientId"
+username: "yourTwitchUsername"
 redirectPort: "9999"
 lineSpacing: 1
 ```
@@ -45,14 +47,17 @@ redirectPort: "8080"
 `ttchat` would listen on `http://localhost:8080` for Twitch's authentication result. So, your Twitch application must have `http://localhost:8080` for a redirect URL.
 
 # Running
-See `ttchat -h` for options and arguments
 
-`ttchat --channel ludwig`
+`ttchat --channel sodapoppin`
+
+`ttchat --channel sodapoppin --channel hasanabi`
+
+Obtaining an OAuth access token requires your authorization via web browser. See https://dev.twitch.tv/docs/authentication/getting-tokens-oauth for more details. To provide your own token, use the `--token` flag. The token must have the `chat:edit` and `chat:read` scopes.
 
-Obtaining an access token requires you to login via your default browswer. To provide your own token, use the `--token` flag.
-See https://dev.twitch.tv/docs/authentication/getting-tokens-oauth for more details on obtaining your own access token.
+`ttchat --channel sodapoppin --token $TOKEN`
 
-`ttchat --channel ludwing --token $ACCESS_TOKEN`
+# Usage
 
-## Notes
-The token must have the `chat:edit` and `chat:read` scopes
+| Syntax      | Description |
+| ----------- | ----------- |
+| Tab/ShiftTab      | Next/previous channel       |

demo.gif

@@ -71,7 +71,7 @@ func TestGetOAuthToken(t *testing.T) {
 			},
 		}
 
-		tkn, err := GetOAuthToken(conf, verifier{}, u)
+		tkn, err := GetAccessToken(conf, verifier{}, u)
 		if err != nil {
 			t.Fatal(err)
 		}

internal/auth/authentication._test.go

@@ -32,7 +32,7 @@ var (
 	errNoAccessToken         = errors.New("access_token not found")
 )
 
-func GetOAuthToken(conf *oauth2.Config, verifier TokenVerifyier, util Utils) (string, error) {
+func GetAccessToken(conf *oauth2.Config, verifier TokenVerifyier, util Utils) (string, error) {
 	state, err := util.NewUUID()
 	if err != nil {
 		return "", err
@@ -79,6 +79,30 @@ func GetOAuthToken(conf *oauth2.Config, verifier TokenVerifyier, util Utils) (st
 	}
 }
 
+func ValidateAccessToken(accessToken string) error {
+	r, err := http.NewRequest("GET", "https://id.twitch.tv/oauth2/validate", nil)
+	if err != nil {
+		return err
+	}
+
+	r.Header.Set("Authorization", fmt.Sprintf("OAuth %s", accessToken))
+	resp, err := http.DefaultClient.Do(r)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusUnauthorized {
+		return fmt.Errorf("unauthorized")
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("invaild access token: status code: %d", resp.StatusCode)
+	}
+
+	return nil
+}
+
 func buildUserLoginURL(conf *oauth2.Config, state string, nonce string) (string, error) {
 	authURL, err := url.Parse(conf.AuthCodeURL(state))
 	if err != nil {

internal/auth/authentication.go

@@ -1,14 +1,13 @@
-package cmd
+package entrypoint
 
 import (
 	"context"
-	"errors"
 	"fmt"
+	"io"
+	"log"
 	"math/rand"
-	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/atye/ttchat/internal/auth"
@@ -39,13 +38,6 @@ const (
 	DefaultRedirectPort = "9999"
 )
 
-var (
-	ErrNoChannel          = errors.New("no channel provided")
-	ErrNoClientID         = errors.New("no clientID in configuration file")
-	ErrNoUsername         = errors.New("no username in configuration file")
-	ErrInvalidAccessToken = errors.New("invalid access token")
-)
-
 func NewRootCmd() *cobra.Command {
 	rootCmd := &cobra.Command{
 		Use:   "ttchat",
@@ -55,22 +47,24 @@ ttchat is a terminal application that connects to a twitch channel's
 chat using a small configuration file. See repo for more details.
 
 ttchat -h
-ttchat --channel ludwig
-ttchat -c ludwing --token $ACCESS_TOKEN
+ttchat --channel GothamChess --channel chessbrah
+ttchat --channel GothamChess --token $TOKEN
 `,
 		Run: func(cmd *cobra.Command, args []string) {
 			rand.Seed(time.Now().UTC().UnixNano())
 
-			channel, err := cmd.Flags().GetString("channel")
+			logger := log.New(io.Discard, "", log.LstdFlags)
+
+			channels, err := cmd.Flags().GetStringSlice("channel")
 			if err != nil {
 				errExit(err)
 			}
 
-			if channel == "" {
-				errExit(ErrNoChannel)
+			if len(channels) == 0 {
+				errExit(fmt.Errorf("no channels provided"))
 			}
 
-			token, err := cmd.Flags().GetString("token")
+			accessToken, err := cmd.Flags().GetString("token")
 			if err != nil {
 				errExit(err)
 			}
@@ -85,23 +79,24 @@ ttchat -c ludwing --token $ACCESS_TOKEN
 				errExit(err)
 			}
 
-			provider, err := oidc.NewProvider(context.Background(), "https://id.twitch.tv/oauth2")
-			if err != nil {
-				errExit(err)
+			if accessToken == "" {
+				provider, err := oidc.NewProvider(context.Background(), "https://id.twitch.tv/oauth2")
+				if err != nil {
+					errExit(err)
+				}
+				oidcVerifier := openid.CoreOSVerifier{Verifier: provider.Verifier(&oidc.Config{ClientID: conf.ClientID})}
+
+				accessToken, err = getAccessToken(logger, conf, oidcVerifier)
+				if err != nil {
+					errExit(err)
+				}
+
+				err = auth.ValidateAccessToken(accessToken)
+				if err != nil {
+					errExit(err)
+				}
 			}
-			oidcVerifier := openid.CoreOSVerifier{Verifier: provider.Verifier(&oidc.Config{ClientID: conf.ClientID})}
 
-			accessToken, err := getAccessToken(token, conf, oidcVerifier)
-			if err != nil {
-				errExit(err)
-			}
-
-			err = validateAccessToken(accessToken)
-			if err != nil {
-				errExit(err)
-			}
-
-			// Get user display name
 			tc, err := helix.NewClient(&helix.Options{
 				ClientID:        conf.ClientID,
 				UserAccessToken: accessToken,
@@ -114,25 +109,26 @@ ttchat -c ludwing --token $ACCESS_TOKEN
 			if err != nil {
 				errExit(err)
 			}
-			//
 
-			// Create IRC client and start
-			ircClient := client.NewGempirClient(conf.Username, channel, accessToken)
-			c := irc.NewIRCService(displayName, channel, ircClient)
+			var channelModels []*terminal.Channel
+			for _, c := range channels {
+				conn := irc.NewTwitch(client.NewGempirClient(conf.Username, c, accessToken), logger, displayName, c)
+				channelModels = append(channelModels, terminal.NewChannel(conn, c, conf.LineSpacing))
+			}
 
-			if tea.NewProgram(terminal.NewModel(c, conf.LineSpacing), tea.WithAltScreen()).Start() != nil {
+			if tea.NewProgram(terminal.NewModel(logger, channelModels...), tea.WithAltScreen()).Start() != nil {
 				errExit(err)
 			}
 		},
 	}
 
-	rootCmd.Flags().StringP("channel", "c", "", "channel to connect to")
+	rootCmd.Flags().StringSliceP("channel", "c", []string{}, "channels to connect to")
 	err := rootCmd.MarkFlagRequired("channel")
 	if err != nil {
 		errExit(err)
 	}
 
-	rootCmd.Flags().StringP("token", "t", "", `oauth token of the from "oauth:token" or "token"`)
+	rootCmd.Flags().StringP("token", "t", "", `provide your own oauth access token to bypass browser login (must have chat:read and chat:edit scopes)`)
 	return rootCmd
 }
 
@@ -149,11 +145,11 @@ func getConfig(hd string) (Config, error) {
 	}
 
 	if conf.ClientID == "" {
-		return Config{}, ErrNoClientID
+		return Config{}, fmt.Errorf("no clientID provided")
 	}
 
 	if conf.Username == "" {
-		return Config{}, ErrNoUsername
+		return Config{}, fmt.Errorf("no username provided")
 	}
 
 	if conf.RedirectPort == "" {
@@ -163,21 +159,7 @@ func getConfig(hd string) (Config, error) {
 	return conf, nil
 }
 
-func getAccessToken(tokenFlagValue string, conf Config, verifier auth.TokenVerifyier) (string, error) {
-	if tokenFlagValue != "" {
-		s := strings.Split(tokenFlagValue, ":")
-		switch len(s) {
-		// oauth:token
-		case 2:
-			return s[1], nil
-		// token
-		case 1:
-			return s[0], nil
-		default:
-			return "", fmt.Errorf("failed to parse token")
-		}
-	}
-
+func getAccessToken(logger *log.Logger, conf Config, verifier auth.TokenVerifyier) (string, error) {
 	oauthConf := &oauth2.Config{
 		ClientID: conf.ClientID,
 		Scopes:   []string{"openid", "chat:read", "chat:edit"},
@@ -201,37 +183,13 @@ func getAccessToken(tokenFlagValue string, conf Config, verifier auth.TokenVerif
 		NewUUID: f,
 	}
 
-	t, err := auth.GetOAuthToken(oauthConf, verifier, u)
+	t, err := auth.GetAccessToken(oauthConf, verifier, u)
 	if err != nil {
 		return "", err
 	}
 	return t, nil
 }
 
-func validateAccessToken(accessToken string) error {
-	r, err := http.NewRequest("GET", "https://id.twitch.tv/oauth2/validate", nil)
-	if err != nil {
-		return err
-	}
-
-	r.Header.Set("Authorization", fmt.Sprintf("OAuth %s", accessToken))
-	resp, err := http.DefaultClient.Do(r)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode == http.StatusUnauthorized {
-		return ErrInvalidAccessToken
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("invaild access token: status code: %d", resp.StatusCode)
-	}
-
-	return nil
-}
-
 type twitchAPI interface {
 	GetUsers(params *helix.UsersParams) (*helix.UsersResponse, error)
 }

internal/cmd/entrypoint.go internal/entrypoint/entrypoint.gointernal/cmd/entrypoint.go renamed to internal/entrypoint/entrypoint.go

@@ -24,16 +24,18 @@ func NewGempirClient(username string, channel string, accessToken string) Gempir
 	return Gempir{irc: c}
 }
 
-func (g Gempir) OnPrivateMessage(f func(types.PrivateMessage)) {
+func (g Gempir) OnPrivateMessage(f func(types.PrivateMessage)) error {
 	g.irc.OnPrivateMessage(func(message twitch.PrivateMessage) {
 		f(types.PrivateMessage{
 			Name:  message.User.DisplayName,
 			Text:  message.Message,
 			Color: message.User.Color,
 		})
 	})
+	return nil
 }
 
-func (g Gempir) Say(channel string, msg string) {
+func (g Gempir) Publish(channel string, msg string) error {
 	g.irc.Say(channel, msg)
+	return nil
 }