policyeval/commands: Allow specifying a target room for kicks

Author: nexy7574

policyeval/commands.go

@@ -292,13 +292,21 @@ var cmdKick = &CommandHandler{
 	Name: "kick",
 	Func: func(ce *CommandEvent) {
 		if len(ce.Args) < 1 {
-			ce.Reply("Usage: `!kick <user ID> [reason]`")
+			ce.Reply("Usage: `!kick [--force] [--room <room ID>] <user ID> [reason]`")
 			return
 		}
 		ignoreUserLimit := ce.Args[0] == "--force"
 		if ignoreUserLimit {
 			ce.Args = ce.Args[1:]
 		}
+		var targetRoom id.RoomID
+		if ce.Args[0] == "--room" && len(ce.Args) >= 2 {
+			targetRoom = resolveRoom(ce, ce.Args[1])
+			if targetRoom == "" {
+				return
+			}
+			ce.Args = ce.Args[2:]
+		}
 		pattern := glob.Compile(ce.Args[0])
 		reason := strings.Join(ce.Args[1:], " ")
 		users := slices.Collect(ce.Meta.findMatchingUsers(pattern, nil, true))
@@ -309,9 +317,14 @@ var cmdKick = &CommandHandler{
 		}
 		for _, userID := range users {
 			successCount := 0
-			rooms := ce.Meta.getRoomsUserIsIn(userID)
-			if len(rooms) == 0 {
-				continue
+			var rooms []id.RoomID
+			if targetRoom != "" {
+				rooms = ce.Meta.getRoomsUserIsIn(userID)
+				if len(rooms) == 0 {
+					continue
+				}
+			} else {
+				rooms = []id.RoomID{targetRoom}
 			}
 			roomStrings := make([]string, len(rooms))
 			for i, room := range rooms {