Monday catchup commit

Author: lleadbet

.goreleaser.yml

@@ -5,7 +5,8 @@ before:
     - go mod download
 builds:
   - id: twitch-darwin
-    ldflags: -X main.buildVersion={{ .Version }}
+    ldflags: 
+      - -s -w -X main.buildVersion={{ .Version }} 
     binary: twitch
     env:
       - CGO_ENABLED=1  
@@ -16,7 +17,8 @@ builds:
     goarch:
       - amd64
   - id: twitch-linux
-    ldflags: -X main.buildVersion={{ .Version }}
+    ldflags:
+      - -s -w -X main.buildVersion={{ .Version }}
     binary: twitch
     env:
       - CGO_ENABLED=1
@@ -25,7 +27,8 @@ builds:
     goarch:
       - amd64
   - id: twitch-windows-x64
-    ldflags: -X main.buildVersion={{ .Version }}
+    ldflags: 
+    - -s -w -X main.buildVersion={{ .Version }} 
     binary: twitch
     main: ./main.go
     env:
@@ -37,7 +40,8 @@ builds:
     goarch:
       - amd64
   - id: twitch-windows-i386
-    ldflags: -X main.buildVersion={{ .Version }}
+    ldflags:
+      - -s -w -X main.buildVersion={{ .Version }} 
     binary: twitch
     main: ./main.go
     env:

Makefile

@@ -17,10 +17,10 @@ test-release:
 		twitch-cli:latest --rm-dist --skip-publish --snapshot
 
 build:
-	go build --ldflags "-X main.buildVersion=source"
+	go build --ldflags "-s -w -X main.buildVersion=source"
 
 build_all:
-	xgo -out build/twitch --targets "darwin/amd64,windows/amd64,linux/amd64" --ldflags "-X main.buildVersion=source" ./
+	xgo -out build/twitch --targets "darwin/amd64,windows/amd64,linux/amd64" --ldflags "-s -w -X main.buildVersion=source" ./
 
 clean: 
 	rm -rf ~/.twitch-cli/eventCache.db

cmd/api.go

@@ -98,7 +98,7 @@ func init() {
 
 	mockCmd.AddCommand(startCmd, generateCmd)
 
-	startCmd.Flags().IntVarP(&port, "port", "p", 3000, "Defines the port that the mock API will run on.")
+	startCmd.Flags().IntVarP(&port, "port", "p", 8080, "Defines the port that the mock API will run on.")
 
 	generateCmd.Flags().IntVarP(&count, "count", "c", 10, "Defines the number of fake users to generate.")
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2
 	github.com/fatih/color v1.10.0
 	github.com/hokaccha/go-prettyjson v0.0.0-20201222001619-a42f9ac2ec8e // indirect
-	github.com/jmoiron/sqlx v1.3.3 // indirect
+	github.com/jmoiron/sqlx v1.3.3
 	github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 // indirect
 	github.com/manifoldco/promptui v0.8.0
 	github.com/mattn/go-sqlite3 v1.14.7

internal/api/api.go

@@ -100,15 +100,16 @@ func NewRequest(method string, path string, queryParameters []string, body []byt
 			data = apiResponse
 			break
 		}
+		d := data.Data.([]interface{})
+		data.Data = append(d, apiResponse.Data)
 
-		data.Data = append(data.Data, apiResponse.Data...)
-
-		if autopaginate == false {
-			data.Pagination.Cursor = apiResponse.Pagination.Cursor
+		if apiResponse.Pagination == nil || *&apiResponse.Pagination.Cursor == "" {
 			break
 		}
 
-		if apiResponse.Pagination.Cursor == "" {
+		// log.Printf("%v", apiResponse)
+		if autopaginate == false {
+			data.Pagination.Cursor = apiResponse.Pagination.Cursor
 			break
 		}
 
@@ -120,7 +121,7 @@ func NewRequest(method string, path string, queryParameters []string, body []byt
 	}
 
 	// handle json marshalling better; returns empty slice vs. null
-	if len(data.Data) == 0 && data.Error == "" {
+	if len(data.Data.([]interface{})) == 0 && data.Error == "" {
 		data.Data = make([]interface{}, 0)
 	}
 

internal/database/_schema.sql

@@ -4,12 +4,20 @@ create table events (
   to_user text not null, transport text not null, 
   timestamp text not null
 );
+create table categories(
+  id text not null primary key, category_name text not null
+);
 create table users(
   id text not null primary key, user_login text not null, 
   display_name text not null, email text not null, 
   user_type text, broadcaster_type text, 
   user_description text, created_at text not null, 
-  modified_at text
+  category_id text, 
+  modified_at text,
+  stream_language text not null default 'en', 
+  title text not null default '', 
+  delay int not null default 0,
+  foreign key (category_id) references categories(id)
 );
 create table follows (
   broadcaster_id text not null, 
@@ -64,54 +72,57 @@ create table moderator_actions (
   foreign key (broadcaster_id) references users(id), 
   foreign key (user_id) references users(id)
 );
+create table editors (
+  broadcaster_id text not null, 
+  user_id text not null, 
+  created_at text not null, 
+  primary key (broadcaster_id, user_id), 
+  foreign key (broadcaster_id) references users(id), 
+  foreign key (user_id) references users(id)
+);
 create table channel_points_rewards(
   id text not null primary key, 
   broadcaster_id text not null, 
   reward_image text, 
   background_color text, 
   is_enabled boolean not null default false, 
-  cost number not null default 0, 
+  cost int not null default 0, 
   title text not null, 
   reward_prompt text, 
   is_user_input_required boolean default false, 
   stream_max_enabled boolean default false, 
-  stream_max_count number default 0, 
+  stream_max_count int default 0, 
   stream_user_max_enabled boolean default false, 
-  stream_user_max_count number default 0, 
+  stream_user_max_count int default 0, 
   global_cooldown_enabled boolean default false, 
-  global_cooldown_seconds number default 0, 
+  global_cooldown_seconds int default 0, 
   is_paused boolean default false, 
   is_in_stock boolean default true, 
   should_redemptions_skip_queue boolean default false, 
-  redemptions_redeemed_current_stream number, 
+  redemptions_redeemed_current_stream int, 
   cooldown_expires_at text, 
   foreign key (broadcaster_id) references users(id)
 );
 create table channel_points_redemptions(
   id text not null primary key, 
   reward_id text not null, 
   broadcaster_id text not null, 
+  user_id text not null,
   user_input text, 
   redemption_status text not null, 
   redeemed_at text, 
   foreign key (reward_id) references channel_points_rewards(id), 
-  foreign key (broadcaster_id) references users(id)
-);
-create table categories(
-  id text not null primary key, category_name text not null
+  foreign key (broadcaster_id) references users(id),
+  foreign key (user_id) references users(id)
 );
 create table streams(
   id text not null primary key, 
   broadcaster_id id text not null, 
-  category_id text, 
   stream_type text not null default 'live', 
-  title text not null, 
-  viewer_count number not null, 
+  viewer_count int not null, 
   started_at text not null, 
-  stream_language text not null default 'en', 
   is_mature boolean not null default false, 
-  foreign key (broadcaster_id) references users(id), 
-  foreign key (category_id) references categories(id)
+  foreign key (broadcaster_id) references users(id)
 );
 create table tags(
   id text not null primary key, is_auto boolean not null default false, 
@@ -145,7 +156,7 @@ create table videos(
   created_at text not null, 
   published_at text, 
   viewable text not null, 
-  view_count number not null default 0, 
+  view_count int not null default 0, 
   duration text not null, 
   video_language text not null default 'en', 
   foreign key (stream_id) references streams(id), 
@@ -163,8 +174,8 @@ create table stream_markers(
 );
 create table video_muted_segments (
   video_id text not null, 
-  video_offset number not null, 
-  duration number not null, 
+  video_offset int not null, 
+  duration int not null, 
   primary key (video_id, video_offset), 
   foreign key (video_id) references videos(id)
 );
@@ -195,7 +206,7 @@ create table clients (
   name text not null
 );
 create table authorizations (
-  id integer not null primary key, 
+  id integer not null primary key AUTOINCREMENT, 
   client_id text not null, 
   user_id text, 
   token text not null unique, 
@@ -252,3 +263,16 @@ create table prediction_predictions (
   foreign key(user_id) references users(id), 
   foreign key(prediction_id) references predictions(id)
 );
+create table clips (
+  id text not null primary key, 
+  broadcaster_id text not null,
+  creator_id text not null,
+  video_id text not null,
+  game_id text not null,
+  title text not null,
+  view_count int default 0, 
+  created_at text not null,
+  duration real not null,
+  foreign key (broadcaster_id) references users(id),
+  foreign key (creator_id) references users(id)
+);

internal/database/api.go

@@ -2,9 +2,28 @@
 // SPDX-License-Identifier: Apache-2.0
 package database
 
+import (
+	"log"
+	"strings"
+)
+
 type DBResposne struct {
 	Cursor string      `json:"cursor"`
 	Total  int         `json:"total"`
 	Limit  int         `json:"-"`
 	Data   interface{} `json:"data"`
 }
+
+func (c CLIDatabase) IsFirstRun() bool {
+	var userCount = 0
+
+	err := c.DB.Get(&userCount, "select count(*) from users")
+	if err != nil {
+		if strings.Contains(err.Error(), "no rows in result set") {
+			return true
+		}
+		log.Print(err)
+	}
+
+	return userCount == 0
+}

internal/database/authentication.go

@@ -7,6 +7,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"log"
 	"time"
 
 	"github.com/twitchdev/twitch-cli/internal/util"
@@ -20,12 +21,12 @@ type AuthenticationClient struct {
 }
 
 type Authorization struct {
-	ID        string         `db:"id"`
-	ClientID  string         `db:"client_id"`
-	UserID    sql.NullString `db:"user_id"`
-	Token     string         `db:"token"`
-	ExpiresAt string         `db:"expires_at"`
-	Scopes    sql.NullString `db:"scopes"`
+	ID        int    `db:"id" dbi:"false"`
+	ClientID  string `db:"client_id"`
+	UserID    string `db:"user_id"`
+	Token     string `db:"token"`
+	ExpiresAt string `db:"expires_at"`
+	Scopes    string `db:"scopes"`
 }
 
 func (q *Query) GetAuthorizationByToken(token string) (Authorization, error) {
@@ -73,15 +74,52 @@ func (q *Query) CreateAuthorization(a Authorization) (Authorization, error) {
 	for {
 		// loop to create unique tokens; likely won't happen, but is worth handling regardless
 		tx := db.MustBegin()
-		tx.NamedExec(`insert into authorizations (client_id, user_id, token, expires_at) values (:client_id, :user_id, :token, :expires_at)`, a)
-		err := tx.Commit()
+		stmt := generateInsertSQL("authorizations", "", a, false)
+		_, err := tx.NamedExec(stmt, a)
+		if err != nil {
+			log.Print(err)
+			return a, nil
+		}
+
+		err = tx.Commit()
 		if err == nil {
 			return a, nil
 		}
 		a.Token = generateString(15)
 	}
 }
 
+func (q *Query) GetAuthenticationClient(ac AuthenticationClient) (*DBResposne, error) {
+	var r []AuthenticationClient
+	rows, err := q.DB.NamedQuery(generateSQL("select * from clients", ac, SEP_AND)+q.SQL, ac)
+	if err != nil {
+		return nil, err
+	}
+
+	for rows.Next() {
+		var ac AuthenticationClient
+		err := rows.StructScan(&ac)
+		if err != nil {
+			return nil, err
+		}
+		r = append(r, ac)
+	}
+
+	dbr := DBResposne{
+		Data:  r,
+		Limit: q.Limit,
+		Total: len(r),
+	}
+
+	if len(r) != q.Limit {
+		q.PaginationCursor = ""
+	}
+
+	dbr.Cursor = q.PaginationCursor
+
+	return &dbr, err
+}
+
 func generateString(length int) string {
 	b := make([]byte, length)
 	rand.Read(b)