Merge pull request twitchdev#290 from twitchdev/october-updates

October updates

internal/api/resources.go

@@ -171,33 +171,40 @@ var endpointMethodSupports = map[string]map[string]bool{
 		"PATCH":  true,
 		"DELETE": false,
 	},
-	"/subscriptions": {
+	"/channels/followed": {
 		"GET":    true,
 		"POST":   false,
 		"PUT":    false,
 		"PATCH":  false,
 		"DELETE": false,
 	},
-	"/tags/streams": {
+	"/channels/followers": {
 		"GET":    true,
 		"POST":   false,
 		"PUT":    false,
 		"PATCH":  false,
 		"DELETE": false,
 	},
-	"/streams/tags": {
+	"/subscriptions": {
 		"GET":    true,
 		"POST":   false,
-		"PUT":    true,
+		"PUT":    false,
 		"PATCH":  false,
 		"DELETE": false,
 	},
-	"/users/follows": {
+	"/tags/streams": {
 		"GET":    true,
-		"POST":   true,
+		"POST":   false,
 		"PUT":    false,
 		"PATCH":  false,
-		"DELETE": true,
+		"DELETE": false,
+	},
+	"/streams/tags": {
+		"GET":    true,
+		"POST":   false,
+		"PUT":    true,
+		"PATCH":  false,
+		"DELETE": false,
 	},
 	"/users/extensions/list": {
 		"GET":    true,

internal/database/database_test.go

@@ -273,7 +273,7 @@ func TestUsers(t *testing.T) {
 	err = q.AddFollow(urp)
 	a.Nil(err)
 
-	dbr, err = q.GetFollows(urp)
+	dbr, err = q.GetFollows(urp, false)
 	a.Nil(err)
 	follows := dbr.Data.([]Follow)
 	a.GreaterOrEqual(len(follows), 1)

internal/database/user.go

@@ -38,13 +38,13 @@ type User struct {
 }
 
 type Follow struct {
-	BroadcasterID    string `db:"to_id" json:"to_id"`
-	BroadcasterLogin string `db:"to_login" json:"to_login"`
-	BroadcasterName  string `db:"to_name" json:"to_name"`
-	ViewerID         string `db:"from_id" json:"from_id"`
-	ViewerLogin      string `db:"from_login" json:"from_login"`
-	ViewerName       string `db:"from_name" json:"from_name"`
-	FollowedAt       string `db:"created_at" json:"followed_at"`
+	BroadcasterID    string `db:"to_id"`
+	BroadcasterLogin string `db:"to_login"`
+	BroadcasterName  string `db:"to_name"`
+	ViewerID         string `db:"from_id"`
+	ViewerLogin      string `db:"from_login"`
+	ViewerName       string `db:"from_name"`
+	FollowedAt       string `db:"created_at"`
 }
 
 type UserRequestParams struct {
@@ -185,7 +185,10 @@ func (q *Query) AddFollow(p UserRequestParams) error {
 	return err
 }
 
-func (q *Query) GetFollows(p UserRequestParams) (*DBResponse, error) {
+// "Total" returned depends on totalsFromUser bool.
+// "true" will return the number of people the user from p.UserID currently follows.
+// "false" will return the number of people the user from p.BroadcasterID currently follows.
+func (q *Query) GetFollows(p UserRequestParams, totalsFromUser bool) (*DBResponse, error) {
 	db := q.DB
 	var r []Follow
 	var f Follow
@@ -203,8 +206,16 @@ func (q *Query) GetFollows(p UserRequestParams) (*DBResponse, error) {
 		}
 		r = append(r, f)
 	}
+
+	totalsP := UserRequestParams{}
+	if totalsFromUser {
+		totalsP.UserID = p.UserID
+	} else {
+		totalsP.BroadcasterID = p.BroadcasterID
+	}
+
 	var total int
-	rows, err = q.DB.NamedQuery(generateSQL("select count(*) from follows", p, SEP_AND), p)
+	rows, err = q.DB.NamedQuery(generateSQL("select count(*) from follows", totalsP, SEP_AND), totalsP)
 	for rows.Next() {
 		err := rows.Scan(&total)
 		if err != nil {

internal/database/videos.go

@@ -50,6 +50,7 @@ type Clip struct {
 	CreatedAt       string  `db:"created_at" json:"created_at"`
 	Duration        float64 `db:"duration" json:"duration"`
 	VodOffset       int     `db:"vod_offset" json:"vod_offset"`
+	IsFeatured      bool    `json:"is_featured"`
 	// calculated fields
 	URL          string `json:"url"`
 	ThumbnailURL string `json:"thumbnail_url"`

internal/events/types/follow_v2/follow_event.go → internal/events/types/follow/follow_event.go

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-package follow_v2
+package follow
 
 import (
 	"encoding/json"

internal/events/types/follow_v1/follow_event_test.go → internal/events/types/follow/follow_event_test.go

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-package follow_v1
+package follow
 
 import (
 	"encoding/json"

internal/events/types/types.go

@@ -20,8 +20,7 @@ import (
 	"github.com/twitchdev/twitch-cli/internal/events/types/cheer"
 	"github.com/twitchdev/twitch-cli/internal/events/types/drop"
 	"github.com/twitchdev/twitch-cli/internal/events/types/extension_transaction"
-	"github.com/twitchdev/twitch-cli/internal/events/types/follow_v1"
-	"github.com/twitchdev/twitch-cli/internal/events/types/follow_v2"
+	"github.com/twitchdev/twitch-cli/internal/events/types/follow"
 	"github.com/twitchdev/twitch-cli/internal/events/types/gift"
 	"github.com/twitchdev/twitch-cli/internal/events/types/goal"
 	"github.com/twitchdev/twitch-cli/internal/events/types/hype_train"
@@ -51,8 +50,7 @@ func AllEvents() []events.MockEvent {
 		cheer.Event{},
 		drop.Event{},
 		extension_transaction.Event{},
-		follow_v1.Event{},
-		follow_v2.Event{},
+		follow.Event{},
 		gift.Event{},
 		goal.Event{},
 		hype_train.Event{},
@@ -153,3 +151,11 @@ func GetByTriggerAndTransportAndVersion(trigger string, transport string, versio
 	// Default error
 	return nil, errors.New("Invalid event")
 }
+
+// These events were removed from production
+// This does not include any "beta" events, just old production versions
+func RemovedEvents() map[string]string {
+	return map[string]string{
+		"channel.follow": "1",
+	}
+}