Added endpoints /charity/campaigns, /charity/donations, /chat/chatters, /chat/settings, /c*/announcements, /c*/color, /goals, /moderation/bans, /m*/chat, /m*/moderators, /m*/shield_mode, /m*/vips, /raids, /whispers

Author: Xemdo

internal/database/chat.go

@@ -0,0 +1,54 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package database
+
+type ChatSettings struct {
+	BroadcasterID                 string `db:"broadcaster_id" json:"broadcaster_id"`
+	SlowMode                      *bool  `db:"slow_mode" json:"slow_mode"`
+	SlowModeWaitTime              *int   `db:"slow_mode_wait_time" json:"slow_mode_wait_time"`
+	FollowerMode                  *bool  `db:"follower_mode" json:"follower_mode"`
+	FollowerModeDuration          *int   `db:"follower_mode_duration" json:"follower_mode_duration"`
+	SubscriberMode                *bool  `db:"subscriber_mode" json:"subscriber_mode"`
+	EmoteMode                     *bool  `db:"emote_mode" json:"emote_mode"`
+	UniqueChatMode                *bool  `db:"unique_chat_mode" json:"unique_chat_mode"`
+	NonModeratorChatDelay         *bool  `db:"non_moderator_chat_delay" json:"non_moderator_chat_delay"`
+	NonModeratorChatDelayDuration *int   `db:"non_moderator_chat_delay_duration" json:"non_moderator_chat_delay_duration"`
+
+	// Shield mode
+	ShieldModeIsActive       bool   `db:"shieldmode_is_active" json:"-"`
+	ShieldModeModeratorID    string `db:"shieldmode_moderator_id" json:"-"`
+	ShieldModeModeratorLogin string `db:"shieldmode_moderator_login" json:"-"`
+	ShieldModeModeratorName  string `db:"shieldmode_moderator_name" json:"-"`
+	ShieldModeLastActivated  string `db:"shieldmode_last_activated" json:"-"`
+}
+
+func (q *Query) GetChatSettingsByBroadcaster(broadcaster string) (*DBResponse, error) {
+	var r []ChatSettings
+
+	err := q.DB.Select(&r, "SELECT * FROM chat_settings WHERE broadcaster_id = $1", broadcaster)
+	if err != nil {
+		return nil, err
+	}
+
+	dbr := DBResponse{
+		Data:  r,
+		Limit: q.Limit,
+		Total: len(r),
+	}
+
+	// No cursor because there should only ever be one result
+
+	return &dbr, err
+}
+
+func (q *Query) InsertChatSettings(s ChatSettings) error {
+	stmt := generateInsertSQL("chat_settings", "broadcaster_id", s, true)
+	_, err := q.DB.NamedExec(stmt, s)
+	return err
+}
+
+func (q *Query) UpdateChatSettings(s ChatSettings) error {
+	sql := generateUpdateSQL("chat_settings", []string{"broadcaster_id"}, s)
+	_, err := q.DB.NamedExec(sql, s)
+	return err
+}

internal/database/database_test.go

@@ -23,6 +23,8 @@ const TEST_USER_ID = "1"
 const TEST_USER_LOGIN = "testing_user1"
 const TEST_USER_ID_2 = "2"
 const TEST_USER_LOGIN_2 = "second_user"
+const TEST_USER_ID_99 = "99"
+const TEST_USER_LOGIN_99 = "non_mod_user"
 const CATEGORY_ID = "1"
 const IGDB_ID = "123"
 
@@ -87,6 +89,23 @@ func TestMain(m *testing.M) {
 	}, false)
 	log.Print(err)
 
+	err = q.InsertUser(User{
+		ID:              TEST_USER_ID_99,
+		UserLogin:       TEST_USER_LOGIN_99,
+		DisplayName:     TEST_USER_LOGIN_99,
+		Email:           "",
+		BroadcasterType: "partner",
+		UserType:        "testing",
+		UserDescription: "hi mom",
+		CreatedAt:       util.GetTimestamp().Format(time.RFC3339),
+		ModifiedAt:      util.GetTimestamp().Format(time.RFC3339),
+		CategoryID:      sql.NullString{String: "", Valid: false},
+		Title:           "hello",
+		Language:        "en",
+		Delay:           0,
+	}, false)
+	log.Print(err)
+
 	os.Exit(m.Run())
 	db.DB.Close()
 }
@@ -215,7 +234,7 @@ func TestUsers(t *testing.T) {
 		Title:           "hello",
 		Language:        "en",
 		Delay:           0,
-	}, false)
+	}, true)
 	a.Nil(err)
 
 	err = q.InsertUser(User{
@@ -232,7 +251,7 @@ func TestUsers(t *testing.T) {
 		Title:           "hello",
 		Language:        "en",
 		Delay:           0,
-	}, false)
+	}, true)
 	a.Nil(err)
 
 	u, err := q.GetUser(User{ID: TEST_USER_ID})
@@ -408,7 +427,7 @@ func TestModeration(t *testing.T) {
 	moderators := dbr.Data.([]Moderator)
 	a.GreaterOrEqual(len(moderators), 1)
 
-	dbr, err = q.GetModeratorsForBroadcaster(TEST_USER_ID, "2")
+	dbr, err = q.GetModeratorsForBroadcaster(TEST_USER_ID)
 	a.Nil(err)
 	moderators = dbr.Data.([]Moderator)
 	a.GreaterOrEqual(len(moderators), 1)

internal/database/init.go

@@ -118,7 +118,7 @@ func (q *Query) AddModerator(p UserRequestParams) error {
 	return tx.Commit()
 }
 
-func (q *Query) GetModeratorsForBroadcaster(broadcasterID string, userID string) (*DBResponse, error) {
+func (q *Query) GetModeratorsForBroadcaster(broadcasterID string) (*DBResponse, error) {
 	var r []Moderator
 
 	err := q.DB.Select(&r, "SELECT u1.id as user_id, u1.user_login as user_login, u1.display_name as user_name FROM moderators as m JOIN users u1 ON m.user_id = u1.id where broadcaster_id = $1 ORDER BY m.created_at DESC", broadcasterID)
@@ -162,7 +162,7 @@ func (q *Query) RemoveModerator(broadcaster string, user string) error {
 }
 
 func (q *Query) InsertBan(p UserRequestParams) error {
-	stmt := generateInsertSQL("bans", "id", p, false)
+	stmt := generateInsertSQL("bans", "broadcaster_id", p, false)
 	p.CreatedAt = util.GetTimestamp().UTC().Format(time.RFC3339)
 
 	ma := BanEvent{
@@ -219,6 +219,13 @@ func (q *Query) GetBans(p UserRequestParams) (*DBResponse, error) {
 	return &dbr, nil
 }
 
+func (q *Query) DeleteBan(p UserRequestParams) error {
+	tx := q.DB.MustBegin()
+	tx.Exec("DELETE FROM bans WHERE broadcaster_id=$1 AND user_id=$2", p.BroadcasterID, p.UserID)
+	err := tx.Commit()
+	return err
+}
+
 func (q *Query) GetBanEvents(p UserRequestParams) (*DBResponse, error) {
 	r := []BanEvent{}
 	stmt := generateSQL("SELECT u1.id as user_id, u1.user_login as user_login, u1.display_name as user_name, u2.id as broadcaster_id, u2.user_login as broadcaster_login, u2.display_name as broadcaster_name, be.event_type, be.event_version, be.event_timestamp, be.id FROM ban_events as be JOIN users u1 ON be.user_id = u1.id JOIN users u2 ON be.broadcaster_id = u2.id", p, SEP_AND)

internal/database/moderation.go

@@ -21,6 +21,10 @@ type Query struct {
 
 // NewQuery handles the logic for generating the pagination token to pass alongside the DB queries for easier access
 func (c CLIDatabase) NewQuery(r *http.Request, max_limit int) *Query {
+	return c.NewQueryWithDefaultLimit(r, max_limit, 20)
+}
+
+func (c CLIDatabase) NewQueryWithDefaultLimit(r *http.Request, max_limit int, default_limit int) *Query {
 	p := Query{DB: c.DB}
 	if r == nil {
 		return &p
@@ -44,7 +48,7 @@ func (c CLIDatabase) NewQuery(r *http.Request, max_limit int) *Query {
 
 	first, _ := strconv.Atoi(f)
 	if first > max_limit || first <= 0 {
-		first = 20
+		first = default_limit
 	}
 	p.Limit = int(first)
 

internal/database/query.go

@@ -30,6 +30,7 @@ type User struct {
 	Title           string         `db:"title" json:"title"`
 	Language        string         `db:"stream_language" json:"stream_language"`
 	Delay           int            `db:"delay" json:"delay" dbi:"force"`
+	ChatColor       string         `db:"chat_color" json:"-"`
 }
 
 type Follow struct {
@@ -76,6 +77,12 @@ type SearchChannel struct {
 	ThumbNailURL string `json:"thumbnail_url"`
 }
 
+type VIP struct {
+	BroadcasterID string `db:"broadcaster_id"`
+	UserID        string `db:"user_id"`
+	CreatedAt     string `db:"created_at"`
+}
+
 func (q *Query) GetUser(u User) (User, error) {
 	var r User
 	sql := generateSQL("select * from users u1", u, SEP_AND)
@@ -161,7 +168,7 @@ func (q *Query) GetChannels(u User) (*DBResponse, error) {
 }
 
 func (q *Query) InsertUser(u User, upsert bool) error {
-	stmt := generateInsertSQL("users", "id", u, true)
+	stmt := generateInsertSQL("users", "id", u, upsert)
 	_, err := q.DB.NamedExec(stmt, u)
 	return err
 }
@@ -346,3 +353,40 @@ func (q *Query) SearchChannels(query string, live_only bool) (*DBResponse, error
 
 	return &dbr, err
 }
+
+func (q *Query) GetVIPsByBroadcaster(broadcaster string) (*DBResponse, error) {
+	var r []VIP
+
+	err := q.DB.Select(&r, "SELECT * FROM vips WHERE broadcaster_id=$1", broadcaster)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, nil
+	} else if err != nil {
+		return nil, err
+	}
+
+	dbr := DBResponse{
+		Data:  r,
+		Limit: q.Limit,
+		Total: len(r),
+	}
+
+	if len(r) != q.Limit {
+		q.PaginationCursor = ""
+	}
+
+	dbr.Cursor = q.PaginationCursor
+
+	return &dbr, err
+}
+
+func (q *Query) AddVIP(p UserRequestParams) error {
+	stmt := generateInsertSQL("vips", "user_id", p, false)
+	p.CreatedAt = util.GetTimestamp().UTC().Format(time.RFC3339)
+	_, err := q.DB.NamedExec(stmt, p)
+	return err
+}
+
+func (q *Query) DeleteVIP(broadcaster string, user string) error {
+	_, err := q.DB.Exec(`delete from vips where broadcaster_id=$1 and user_id=$2`, broadcaster, user)
+	return err
+}

internal/database/user.go

@@ -131,8 +131,20 @@ func (u UserAuthentication) HasOneOfRequiredScope(scopes []string) bool {
 }
 
 func (u *UserAuthentication) MatchesBroadcasterIDParam(r *http.Request) bool {
-	bid := r.URL.Query().Get("broadcaster_id")
-	if bid == "" || bid != u.UserID {
+	return u.MatchesSpecifiedIDParam(r, "broadcaster_id")
+}
+
+func (u *UserAuthentication) MatchesModeratorIDParam(r *http.Request) bool {
+	return u.MatchesSpecifiedIDParam(r, "moderator_id")
+}
+
+func (u *UserAuthentication) MatchesUserIDParam(r *http.Request) bool {
+	return u.MatchesSpecifiedIDParam(r, "user_id")
+}
+
+func (u *UserAuthentication) MatchesSpecifiedIDParam(r *http.Request, param string) bool {
+	id := r.URL.Query().Get(param)
+	if id == "" || id != u.UserID {
 		return false
 	}
 	return true

internal/mock_api/authentication/authentication.go

@@ -5,7 +5,6 @@ package channels
 import (
 	"bytes"
 	"encoding/json"
-	"log"
 	"net/http"
 	"os"
 	"testing"
@@ -92,6 +91,49 @@ func TestEditors(t *testing.T) {
 	a.Equal(200, resp.StatusCode)
 }
 
+func TestVIPs(t *testing.T) {
+	a := test_setup.SetupTestEnv(t)
+	ts := test_server.SetupTestServer(Vips{})
+
+	// get
+	req, _ := http.NewRequest(http.MethodGet, ts.URL+Vips{}.Path(), nil)
+	q := req.URL.Query()
+	req.URL.RawQuery = q.Encode()
+	resp, err := http.DefaultClient.Do(req)
+	a.Nil(err)
+	a.Equal(400, resp.StatusCode)
+
+	q.Set("broadcaster_id", "1")
+	q.Set("user_id", "3")
+	req.URL.RawQuery = q.Encode()
+	resp, err = http.DefaultClient.Do(req)
+	a.Nil(err)
+	a.Equal(200, resp.StatusCode)
+
+	// post
+	req, _ = http.NewRequest(http.MethodPost, ts.URL+Vips{}.Path(), nil)
+	q.Set("broadcaster_id", "1")
+	q.Set("user_id", "2")
+	req.URL.RawQuery = q.Encode()
+	resp, err = http.DefaultClient.Do(req)
+	a.Nil(err)
+	a.Equal(422, resp.StatusCode)
+
+	req, _ = http.NewRequest(http.MethodPost, ts.URL+Vips{}.Path(), nil)
+	q.Set("user_id", "-1")
+	req.URL.RawQuery = q.Encode()
+	resp, err = http.DefaultClient.Do(req)
+	a.Nil(err)
+	a.Equal(404, resp.StatusCode)
+
+	req, _ = http.NewRequest(http.MethodPost, ts.URL+Vips{}.Path(), nil)
+	q.Del("user_id")
+	req.URL.RawQuery = q.Encode()
+	resp, err = http.DefaultClient.Do(req)
+	a.Nil(err)
+	a.Equal(400, resp.StatusCode)
+}
+
 func TestInformation(t *testing.T) {
 	a := test_setup.SetupTestEnv(t)
 	ts := test_server.SetupTestServer(InformationEndpoint{})
@@ -129,7 +171,6 @@ func TestInformation(t *testing.T) {
 	q.Set("broadcaster_id", "2")
 	req.URL.RawQuery = q.Encode()
 	resp, err = http.DefaultClient.Do(req)
-	log.Print(resp.StatusCode)
 	a.Nil(err, resp.StatusCode)
 	a.Equal(401, resp.StatusCode)