add and remove editors

douglascdev · douglascdev · commit 6e6aa050c498 · 2025-09-12T16:33:00.000-03:00
diff --git a/command/cmd_editor.go b/command/cmd_editor.go
@@ -0,0 +1,77 @@
+package command
+
+import (
+	"fmt"
+	"monkebot/database"
+	"monkebot/twitchapi"
+	"monkebot/types"
+)
+
+var editor = types.Command{
+	Name:              "editor",
+	Aliases:           []string{},
+	Usage:             "editor [add|remove] user",
+	Description:       "Opt out of one or all commands",
+	ChannelCooldown:   5,
+	UserCooldown:      5,
+	NoPrefix:          false,
+	NoPrefixShouldRun: nil,
+	CanDisable:        false,
+	Execute: func(message *types.Message, sender types.MessageSender, args []string) error {
+		if len(args) != 3 || args[1] != "add" && args[1] != "remove" {
+			sender.Say(message.Channel, "Usage: editor [add|remove] user")
+			return nil
+		}
+
+		if !message.Chatter.IsBroadcaster {
+			sender.Say(message.Channel, "❌Only the broadcaster can set editors")
+			return nil
+		}
+
+		tx, err := message.DB.Begin()
+		if err != nil {
+			return err
+		}
+		defer tx.Rollback()
+
+		editor, err := twitchapi.GetUserByName(message.Cfg, args[2])
+		if err != nil {
+			return err
+		}
+		if editor == nil || len(*editor) == 0 {
+			sender.Say(message.Channel, "User not found", struct {
+				Param types.SenderParam
+				Value string
+			}{Param: types.ReplyMessageID, Value: message.ID})
+			return nil
+		}
+
+		editorID, editorName := (*editor)[0].ID, (*editor)[0].Login
+		var successMsg string
+		switch args[1] {
+		case "add":
+			err = database.InsertEditor(tx, message.Chatter.ID, editorID, editorName)
+			if err != nil {
+				return err
+			}
+			successMsg = fmt.Sprintf("✅Added editor %q", args[2])
+		case "remove":
+			err = database.RemoveEditor(tx, message.Chatter.ID, editorID)
+			if err != nil {
+				return err
+			}
+			successMsg = fmt.Sprintf("✅Removed editor %q", args[2])
+		}
+
+		err = tx.Commit()
+		if err != nil {
+			return err
+		}
+
+		sender.Say(message.Channel, successMsg, struct {
+			Param types.SenderParam
+			Value string
+		}{Param: types.ReplyMessageID, Value: message.ID})
+		return nil
+	},
+}
diff --git a/command/cmd_remove.go b/command/cmd_remove.go
@@ -3,6 +3,7 @@ package command
 import (
 	"errors"
 	"fmt"
+	"monkebot/database"
 	"monkebot/seventvapi"
 	"monkebot/twitchapi"
 	"monkebot/types"
@@ -21,36 +22,45 @@ var remove = types.Command{
 	NoPrefixShouldRun: nil,
 	CanDisable:        true,
 	Execute: func(message *types.Message, sender types.MessageSender, args []string) error {
-		if len(args) < 3 {
+		if len(args) < 2 {
 			sender.Say(message.Channel, "❌Usage: remove [emote] #[channel]")
 			return nil
 		}
 
-		if !(message.Chatter.IsMod || message.Chatter.IsBroadcaster) {
-			sender.Say(message.Channel, "❌You must be a moderator to use this command")
-			return nil
+		tx, err := message.DB.Begin()
+		if err != nil {
+			return err
 		}
 
 		var targetChannelName string
 		for i := 1; i < len(args); i++ {
 			if channel, found := strings.CutPrefix(args[i], "#"); found {
 				targetChannelName = channel
-				// args left after this should be just emotes
-				args = slices.Concat(args[1:i], args[i+1:])
+				// remove channel from args
+				args = slices.Delete(args, i, i+1)
 				break
 			}
 		}
+
 		if targetChannelName == "" {
-			sender.Say(message.Channel, "❌Usage: remove [emote] #[channel]")
-			return nil
+			targetChannelName = message.Channel
 		}
+
 		res, err := twitchapi.GetUserByName(message.Cfg, targetChannelName)
 		if err != nil || len(*res) == 0 {
 			sender.Say(message.Channel, fmt.Sprintf("❌Failed to fetch channel %q", targetChannelName))
 			return err
 		}
 		targetChannel := (*res)[0]
 
+		if !message.Chatter.IsBroadcaster && !database.SelectIsEditor(tx, targetChannel.ID, message.Chatter.ID) {
+			sender.Say(message.Channel, "❌You must be an editor to use this command")
+			return nil
+		}
+
+		//remove command name from args
+		args = args[1:]
+
 		for _, emote := range args {
 			err = seventvapi.RemoveEmote("https://7tv.io", targetChannel.ID, emote, message.Cfg.SevenTVToken)
 			if err != nil {
diff --git a/command/command.go b/command/command.go
@@ -27,6 +27,7 @@ var Commands = []types.Command{
 	optout,
 	optin,
 	remove,
+	editor,
 }
 
 var UnknownCommandErr = errors.New("unknown command")
diff --git a/database/database.go b/database/database.go
@@ -507,3 +507,41 @@ func UpdateUserCommandLastUsed(tx *sql.Tx, channelID string, commandName string,
 
 	return nil
 }
+
+func SelectIsEditor(tx *sql.Tx, userID string, editorID string) bool {
+	err := tx.QueryRow("SELECT user_id FROM user_editor WHERE user_id=? AND editor_id=?", userID, editorID).Scan(&userID)
+	if err != nil {
+		return false
+	}
+	return true
+}
+
+func InsertEditor(tx *sql.Tx, userID string, editorID string, editorName string) error {
+	err := InsertUsers(tx, false, struct {
+		ID   string
+		Name string
+	}{ID: editorID, Name: editorName})
+	_, err = tx.Exec("INSERT INTO user_editor(user_id, editor_id) VALUES (?, ?)", userID, editorID)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func RemoveEditor(tx *sql.Tx, userID string, editorID string) error {
+	result, err := tx.Exec("DELETE FROM user_editor WHERE user_id=? AND editor_id=?", userID, editorID)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := result.RowsAffected()
+	if err != nil {
+		return err
+	}
+
+	if rowsAffected != 1 {
+		return fmt.Errorf("attempt to delete editor %q for channel %q resulted in %d rows affected", editorID, userID, rowsAffected)
+	}
+
+	return nil
+}
diff --git a/database/migrations.go b/database/migrations.go
@@ -36,6 +36,13 @@ var CurrentSchemaStmts = []string{
                        bot_is_joined BOOL NOT NULL DEFAULT false,
                        FOREIGN KEY (permission_id) REFERENCES permission(id)
                )`,
+	`CREATE TABLE user_editor (
+						id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                        user_id TEXT NOT NULL,
+                        editor_id TEXT NOT NULL,
+                        FOREIGN KEY (user_id) REFERENCES user(id) ON DELETE CASCADE,
+                        FOREIGN KEY (editor_id) REFERENCES user(id) ON DELETE CASCADE
+	)`,
 	`CREATE TABLE permission (
                        id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
                        name TEXT NOT NULL,
@@ -170,12 +177,51 @@ var Migrations = DBMigrations{
 			`INSERT INTO rpg_item (name, description) VALUES ('buttinho', 'The most widely used currency in the seven seas.')`,
 		}},
 		{Version: 7, Stmts: []string{
-			`CREATE TABLE app_data (
+			"ALTER TABLE user_command_cooldown RENAME TO user_command_data",
+			`
+			CREATE TABLE app_data (
 					   id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 					   migration_version INTEGER NOT NULL
 			)`,
 			`INSERT INTO app_data (migration_version) VALUES (7)`,
 		}},
+		{Version: 8, Stmts: []string{
+			`CREATE TABLE user_editor (
+				id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+				user_id TEXT NOT NULL,
+				editor_id TEXT NOT NULL,
+				FOREIGN KEY (user_id) REFERENCES user(id) ON DELETE CASCADE,
+				FOREIGN KEY (editor_id) REFERENCES user(id) ON DELETE CASCADE
+			)`,
+
+			"INSERT INTO command (name) VALUES ('editor'), ('remove'), ('yoink')",
+			`INSERT INTO user_command (user_id, command_id, is_enabled)
+				SELECT id, (
+					SELECT c.id FROM command c WHERE c.name = 'editor'
+				), true FROM user`,
+			`INSERT INTO user_command_data (user_id, command_id)
+				SELECT id, (
+					SELECT c.id FROM command c WHERE c.name = 'editor'
+				) FROM user`,
+
+			`INSERT INTO user_command (user_id, command_id, is_enabled)
+				SELECT id, (
+					SELECT c.id FROM command c WHERE c.name = 'remove'
+				), true FROM user`,
+			`INSERT INTO user_command_data (user_id, command_id)
+				SELECT id, (
+					SELECT c.id FROM command c WHERE c.name = 'remove'
+				) FROM user`,
+
+			`INSERT INTO user_command (user_id, command_id, is_enabled)
+				SELECT id, (
+					SELECT c.id FROM command c WHERE c.name = 'yoink'
+				), true FROM user`,
+			`INSERT INTO user_command_data (user_id, command_id)
+				SELECT id, (
+					SELECT c.id FROM command c WHERE c.name = 'yoink'
+				) FROM user`,
+		}},
 	}}
 
 func RunMigrations(tx *sql.Tx, migrations *DBMigrations, currentSchemaStmts []string) error {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ var Commands = []types.Command{`
`27`	`27`	`optout,`
`28`	`28`	`optin,`
`29`	`29`	`remove,`
	`30`	`+ editor,`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`var UnknownCommandErr = errors.New("unknown command")`