GET /bits/cheermotes provides proper data format; Check AutoMod Status no longer needs user_id; /moderation/banned/events and /moderation/moderators/events removed; Get Banned Users now includes created_at field; Get Moderators includes channel:manager:moderators scope

Author: Xemdo

internal/database/moderation.go

@@ -65,6 +65,7 @@ type Ban struct {
 	UserLogin          string  `db:"user_login" json:"user_login"`
 	UserName           string  `db:"user_name" json:"user_name"`
 	ExpiresAt          *string `db:"expires_at" json:"expires_at"`
+	CreatedAt          string  `db:"created_at" json:"created_at"`
 	Reason             string  `json:"reason"`
 	ModeratorID        string  `json:"moderator_id"`
 	ModeratorUserLogin string  `json:"moderator_login"`
@@ -184,7 +185,7 @@ func (q *Query) InsertBan(p UserRequestParams) error {
 
 func (q *Query) GetBans(p UserRequestParams) (*DBResponse, error) {
 	r := []Ban{}
-	stmt := generateSQL("select b.user_id, b.expires_at, u1.display_name as user_name, u1.user_login from bans b join users u1 on b.user_id=u1.id", p, SEP_AND)
+	stmt := generateSQL("select b.user_id, b.expires_at, b.created_at, u1.display_name as user_name, u1.user_login from bans b join users u1 on b.user_id=u1.id", p, SEP_AND)
 	rows, err := q.DB.NamedQuery(stmt+q.SQL, p)
 	if err != nil {
 		return nil, err

internal/mock_api/endpoints/bits/cheermotes.go

@@ -32,6 +32,10 @@ var cheermotesScopesByMethod = map[string][]string{
 type Cheermotes struct{}
 
 type CheermotesResponse struct {
+	Data []CheermotesResponseData `json:"data"`
+}
+
+type CheermotesResponseData struct {
 	Prefix       string      `json:"prefix"`
 	Order        int         `json:"order"`
 	LastUpdated  string      `json:"last_updated"`
@@ -93,9 +97,9 @@ func (e Cheermotes) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func getCheermotes(w http.ResponseWriter, r *http.Request) {
-	cheermoteBody := []CheermotesResponse{}
+	cheermoteBody := CheermotesResponse{}
 	for i := 0; i < len(defaultTypes); i++ {
-		cheermote := CheermotesResponse{
+		cheermote := CheermotesResponseData{
 			Prefix:       defaultPrefixes[i],
 			Order:        i + 1,
 			LastUpdated:  util.GetTimestamp().Format(time.RFC3339),
@@ -125,7 +129,7 @@ func getCheermotes(w http.ResponseWriter, r *http.Request) {
 			})
 		}
 
-		cheermoteBody = append(cheermoteBody, cheermote)
+		cheermoteBody.Data = append(cheermoteBody.Data, cheermote)
 	}
 
 	response, _ := json.Marshal(cheermoteBody)

internal/mock_api/endpoints/endpoints.go

@@ -45,9 +45,7 @@ func All() []mock_api.MockEndpoint {
 		hype_train.HypeTrainEvents{},
 		moderation.AutomodHeld{},
 		moderation.AutomodStatus{},
-		moderation.BannedEvents{},
 		moderation.Bans{},
-		moderation.ModeratorEvents{},
 		moderation.Moderators{},
 		polls.Polls{},
 		predictions.Predictions{},

internal/mock_api/endpoints/moderation/automod_status.go

@@ -83,25 +83,13 @@ func postAutomodStatus(w http.ResponseWriter, r *http.Request) {
 	}
 
 	for _, data := range body.Data {
-		if data.MessageID == "" || data.MessageText == "" || data.UserID == "" {
-			mock_errors.WriteBadRequest(w, "msg_id, msg_text, and user_id are required")
+		if data.MessageID == "" || data.MessageText == "" {
+			mock_errors.WriteBadRequest(w, "msg_id and msg_text are required")
 			return
 		}
 
-		shouldPermit := true
+		shouldPermit := util.RandomInt(2) == 0
 
-		dbr, err := db.NewQuery(r, 100).GetBans(database.UserRequestParams{BroadcasterID: userCtx.UserID, UserID: data.UserID})
-		if err != nil {
-			mock_errors.WriteServerError(w, "error getting ban status")
-			return
-		}
-
-		bans := dbr.Data.([]database.Ban)
-		if len(bans) > 0 {
-			shouldPermit = false
-		} else {
-			shouldPermit = util.RandomInt(2) == 0
-		}
 		response = append(response, PostAutomodStatusResponse{MessageID: data.MessageID, IsPermitted: shouldPermit})
 	}
 

internal/mock_api/endpoints/moderation/banned_events.go

@@ -118,30 +118,6 @@ func TestAutoModStatus(t *testing.T) {
 	a.Equal(200, resp.StatusCode)
 }
 
-func TestModeratorEvents(t *testing.T) {
-	a := test_setup.SetupTestEnv(t)
-	ts := test_server.SetupTestServer(ModeratorEvents{})
-
-	req, _ := http.NewRequest(http.MethodGet, ts.URL+ModeratorEvents{}.Path(), nil)
-	q := req.URL.Query()
-	req.URL.RawQuery = q.Encode()
-	resp, err := http.DefaultClient.Do(req)
-	a.Nil(err)
-	a.Equal(401, resp.StatusCode)
-
-	q.Set("broadcaster_id", "1")
-	req.URL.RawQuery = q.Encode()
-	resp, err = http.DefaultClient.Do(req)
-	a.Nil(err)
-	a.Equal(200, resp.StatusCode)
-
-	q.Set("user_id", "2")
-	req.URL.RawQuery = q.Encode()
-	resp, err = http.DefaultClient.Do(req)
-	a.Nil(err)
-	a.Equal(200, resp.StatusCode)
-}
-
 func TestBanned(t *testing.T) {
 	a := test_setup.SetupTestEnv(t)
 	ts := test_server.SetupTestServer(Bans{})
@@ -165,27 +141,3 @@ func TestBanned(t *testing.T) {
 	a.Nil(err)
 	a.Equal(200, resp.StatusCode)
 }
-
-func TestBannedEvents(t *testing.T) {
-	a := test_setup.SetupTestEnv(t)
-	ts := test_server.SetupTestServer(BannedEvents{})
-
-	req, _ := http.NewRequest(http.MethodGet, ts.URL+BannedEvents{}.Path(), nil)
-	q := req.URL.Query()
-	req.URL.RawQuery = q.Encode()
-	resp, err := http.DefaultClient.Do(req)
-	a.Nil(err)
-	a.Equal(401, resp.StatusCode)
-
-	q.Set("broadcaster_id", "1")
-	req.URL.RawQuery = q.Encode()
-	resp, err = http.DefaultClient.Do(req)
-	a.Nil(err)
-	a.Equal(200, resp.StatusCode)
-
-	q.Set("user_id", "2")
-	req.URL.RawQuery = q.Encode()
-	resp, err = http.DefaultClient.Do(req)
-	a.Nil(err)
-	a.Equal(200, resp.StatusCode)
-}

internal/mock_api/endpoints/moderation/moderation_test.go

@@ -22,7 +22,7 @@ var moderatorsMethodsSupported = map[string]bool{
 }
 
 var moderatorsScopesByMethod = map[string][]string{
-	http.MethodGet:    {"moderation:read"},
+	http.MethodGet:    {"moderation:read", "channel:manage:moderators"},
 	http.MethodPost:   {},
 	http.MethodDelete: {},
 	http.MethodPatch:  {},