Add config for required weekly supervisor activity

Author: Swan

cmd/console/commands/supervisor_activity.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"github.com/Quaver/api2/config"
 	"github.com/Quaver/api2/db"
 	"github.com/Quaver/api2/enums"
 	"github.com/Quaver/api2/webhooks"
@@ -39,7 +40,7 @@ var SupervisorActivityCmd = &cobra.Command{
 
 			userActions[supervisor] = len(actions)
 
-			if len(actions) < 3 {
+			if len(actions) < config.Instance.RankingQueue.WeeklyRequiredSupervisorActions {
 				continue
 			}
 

config.example.json

@@ -44,7 +44,8 @@
     "votes_required": 2,
     "denials_required": 2,
     "mapset_uploads_required": 10,
-    "resubmission_days": 14
+    "resubmission_days": 14,
+    "weekly_required_supervisor_actions": 4
   },
   "bundled_mapsets": [919, 536, 563, 523, 922, 919, 9, 923, 994, 954, 822, 21846],
   "events_webhook": "",

config/config.go

@@ -57,12 +57,13 @@ type Config struct {
 	QuaverToolsPath string `json:"quaver_tools_path"`
 
 	RankingQueue struct {
-		Webhook               string `json:"webhook"`
-		RankedWebhook         string `json:"ranked_webhook"`
-		VotesRequired         int    `json:"votes_required"`
-		DenialsRequired       int    `json:"denials_required"`
-		MapsetUploadsRequired int    `json:"mapset_uploads_required"`
-		ResubmissionDays      int    `json:"resubmission_days"`
+		Webhook                         string `json:"webhook"`
+		RankedWebhook                   string `json:"ranked_webhook"`
+		VotesRequired                   int    `json:"votes_required"`
+		DenialsRequired                 int    `json:"denials_required"`
+		MapsetUploadsRequired           int    `json:"mapset_uploads_required"`
+		ResubmissionDays                int    `json:"resubmission_days"`
+		WeeklyRequiredSupervisorActions int    `json:"weekly_required_supervisor_actions"`
 	} `json:"ranking_queue"`
 
 	BundledMapsets []int `json:"bundled_mapsets"`

handlers/ranking.go

@@ -20,10 +20,11 @@ import (
 // GetRankingQueueConfig Returns the vote/denial configuration for the ranking queue
 func GetRankingQueueConfig(c *gin.Context) *APIError {
 	c.JSON(http.StatusOK, gin.H{
-		"votes_required":          config.Instance.RankingQueue.VotesRequired,
-		"denials_required":        config.Instance.RankingQueue.DenialsRequired,
-		"mapset_uploads_required": config.Instance.RankingQueue.MapsetUploadsRequired,
-		"resubmission_days":       config.Instance.RankingQueue.ResubmissionDays,
+		"votes_required":                     config.Instance.RankingQueue.VotesRequired,
+		"denials_required":                   config.Instance.RankingQueue.DenialsRequired,
+		"mapset_uploads_required":            config.Instance.RankingQueue.MapsetUploadsRequired,
+		"resubmission_days":                  config.Instance.RankingQueue.ResubmissionDays,
+		"weekly_required_supervisor_actions": config.Instance.RankingQueue.WeeklyRequiredSupervisorActions,
 	})
 
 	return nil

webhooks/webhooks.go

@@ -282,7 +282,7 @@ func SendSupervisorActivityWebhook(results map[*db.User]int, timeStart int64, ti
 	for user, actionCount := range results {
 		var emoji string
 
-		if actionCount >= 3 {
+		if actionCount >= config.Instance.RankingQueue.WeeklyRequiredSupervisorActions {
 			emoji = "✅"
 		} else {
 			emoji = "❌"