v3.2.0 #13
@@ -78,12 +78,16 @@ func HandleInteraction(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||||||
music.HandleComponent(s, i)
|
music.HandleComponent(s, i)
|
||||||
case strings.HasPrefix(data.CustomID, "schedule:"):
|
case strings.HasPrefix(data.CustomID, "schedule:"):
|
||||||
schedule.HandleComponent(s, i)
|
schedule.HandleComponent(s, i)
|
||||||
|
case strings.HasPrefix(data.CustomID, "projects:"):
|
||||||
|
projects.HandleComponent(s, i)
|
||||||
}
|
}
|
||||||
case discordgo.InteractionModalSubmit:
|
case discordgo.InteractionModalSubmit:
|
||||||
data := i.ModalSubmitData()
|
data := i.ModalSubmitData()
|
||||||
switch {
|
switch {
|
||||||
case strings.HasPrefix(data.CustomID, "schedule:"):
|
case strings.HasPrefix(data.CustomID, "schedule:"):
|
||||||
schedule.HandleModalSubmit(s, i)
|
schedule.HandleModalSubmit(s, i)
|
||||||
|
case strings.HasPrefix(data.CustomID, "projects:"):
|
||||||
|
projects.HandleModalSubmit(s, i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,222 @@
|
|||||||
|
package public
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"velox-bot/internal/commands/projects/shared"
|
||||||
|
"velox-bot/internal/db/services"
|
||||||
|
|
||||||
|
"github.com/bwmarrin/discordgo"
|
||||||
|
)
|
||||||
|
|
||||||
|
// HandleComponent routes the select menus shown after /projects add-helper
|
||||||
|
// and /projects close.
|
||||||
|
func HandleComponent(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
|
parts := strings.Split(i.MessageComponentData().CustomID, ":")
|
||||||
|
if len(parts) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch parts[1] {
|
||||||
|
case "add_helper_project_select":
|
||||||
|
handleAddHelperProjectSelect(s, i)
|
||||||
|
case "add_helper_user_select":
|
||||||
|
handleAddHelperUserSelect(s, i, parts)
|
||||||
|
case "close_select":
|
||||||
|
handleCloseSelect(s, i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleAddHelperProjectSelect is step 1: a project was picked, now show a
|
||||||
|
// native Discord user-select to pick who helps - the actual AddHelper call
|
||||||
|
// happens in handleAddHelperUserSelect once both are known.
|
||||||
|
func handleAddHelperProjectSelect(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
|
if !shared.RequireManageGuild(s, i) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
values := i.MessageComponentData().Values
|
||||||
|
if len(values) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
projectID := values[0]
|
||||||
|
|
||||||
|
_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
||||||
|
Type: discordgo.InteractionResponseUpdateMessage,
|
||||||
|
Data: &discordgo.InteractionResponseData{
|
||||||
|
Content: "Who should help with this project?",
|
||||||
|
Components: []discordgo.MessageComponent{
|
||||||
|
discordgo.ActionsRow{
|
||||||
|
Components: []discordgo.MessageComponent{
|
||||||
|
discordgo.SelectMenu{
|
||||||
|
MenuType: discordgo.UserSelectMenu,
|
||||||
|
CustomID: "projects:add_helper_user_select:" + projectID,
|
||||||
|
Placeholder: "Select a user",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleAddHelperUserSelect is step 2: a user was picked from the native
|
||||||
|
// select menu, so both the project (carried in the CustomID) and the user
|
||||||
|
// (the selected value) are now known - perform the actual AddHelper call.
|
||||||
|
func handleAddHelperUserSelect(s *discordgo.Session, i *discordgo.InteractionCreate, parts []string) {
|
||||||
|
if !shared.RequireManageGuild(s, i) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(parts) < 3 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
projectID, err := strconv.ParseInt(parts[2], 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
guildID, ok := shared.ParseGuildID(s, i)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
values := i.MessageComponentData().Values
|
||||||
|
if len(values) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
userID := values[0]
|
||||||
|
userID64, err := strconv.ParseInt(userID, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
project, err := services.Global.Projects.GetProject(ctx, guildID, projectID)
|
||||||
|
if err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Failed to load project.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if project == nil {
|
||||||
|
shared.RespondEphemeral(s, i, "That project no longer exists in this server.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := services.Global.Projects.AddHelper(ctx, projectID, userID64); err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Failed to add helper to project.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
||||||
|
Type: discordgo.InteractionResponseUpdateMessage,
|
||||||
|
Data: &discordgo.InteractionResponseData{
|
||||||
|
Content: "Added <@" + userID + "> as helper to project **" + project.Name + "**.",
|
||||||
|
Components: []discordgo.MessageComponent{},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleCloseSelect(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
|
if !shared.RequireManageGuild(s, i) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
guildID, ok := shared.ParseGuildID(s, i)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
values := i.MessageComponentData().Values
|
||||||
|
if len(values) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
projectID, err := strconv.ParseInt(values[0], 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
project, err := services.Global.Projects.GetProject(ctx, guildID, projectID)
|
||||||
|
if err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Failed to load project.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if project == nil {
|
||||||
|
shared.RespondEphemeral(s, i, "That project no longer exists in this server.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := services.Global.Projects.DeactivateProject(ctx, guildID, projectID); err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Failed to close project.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
||||||
|
Type: discordgo.InteractionResponseUpdateMessage,
|
||||||
|
Data: &discordgo.InteractionResponseData{
|
||||||
|
Content: "Closed project **" + project.Name + "**.",
|
||||||
|
Components: []discordgo.MessageComponent{},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleModalSubmit handles the /projects create modal.
|
||||||
|
func HandleModalSubmit(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
|
parts := strings.Split(i.ModalSubmitData().CustomID, ":")
|
||||||
|
if len(parts) < 2 || parts[1] != "create_modal" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !shared.RequireManageGuild(s, i) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
guildID, ok := shared.ParseGuildID(s, i)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if i.Member == nil || i.Member.User == nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Missing member info.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
values := modalTextInputValues(i.ModalSubmitData().Components)
|
||||||
|
name := strings.TrimSpace(values["name"])
|
||||||
|
description := strings.TrimSpace(values["description"])
|
||||||
|
if name == "" {
|
||||||
|
shared.RespondEphemeral(s, i, "Project name cannot be empty.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
creatorID, err := strconv.ParseInt(i.Member.User.ID, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Invalid user ID.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
id, err := services.Global.Projects.CreateProject(context.Background(), guildID, creatorID, name, description)
|
||||||
|
if err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Failed to create project.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
shared.RespondEphemeral(s, i, "Created project **"+name+"** with ID `"+strconv.FormatInt(id, 10)+"`.")
|
||||||
|
}
|
||||||
|
|
||||||
|
func modalTextInputValues(components []discordgo.MessageComponent) map[string]string {
|
||||||
|
values := make(map[string]string)
|
||||||
|
for _, c := range components {
|
||||||
|
row, ok := c.(*discordgo.ActionsRow)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, rc := range row.Components {
|
||||||
|
ti, ok := rc.(*discordgo.TextInput)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
values[ti.CustomID] = ti.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return values
|
||||||
|
}
|
||||||
@@ -24,39 +24,16 @@ var Projects = &discordgo.ApplicationCommand{
|
|||||||
Type: discordgo.ApplicationCommandOptionSubCommand,
|
Type: discordgo.ApplicationCommandOptionSubCommand,
|
||||||
Name: "create",
|
Name: "create",
|
||||||
Description: "Create a new active project",
|
Description: "Create a new active project",
|
||||||
Options: []*discordgo.ApplicationCommandOption{
|
|
||||||
{
|
|
||||||
Type: discordgo.ApplicationCommandOptionString,
|
|
||||||
Name: "name",
|
|
||||||
Description: "Project name",
|
|
||||||
Required: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: discordgo.ApplicationCommandOptionString,
|
|
||||||
Name: "description",
|
|
||||||
Description: "Short description (optional)",
|
|
||||||
Required: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Type: discordgo.ApplicationCommandOptionSubCommand,
|
Type: discordgo.ApplicationCommandOptionSubCommand,
|
||||||
Name: "add-helper",
|
Name: "add-helper",
|
||||||
Description: "Add a helper to an existing project",
|
Description: "Add a helper to an existing project",
|
||||||
Options: []*discordgo.ApplicationCommandOption{
|
},
|
||||||
{
|
{
|
||||||
Type: discordgo.ApplicationCommandOptionInteger,
|
Type: discordgo.ApplicationCommandOptionSubCommand,
|
||||||
Name: "project-id",
|
Name: "close",
|
||||||
Description: "ID of the project",
|
Description: "Close (deactivate) a project",
|
||||||
Required: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: discordgo.ApplicationCommandOptionUser,
|
|
||||||
Name: "user",
|
|
||||||
Description: "User to add as helper",
|
|
||||||
Required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -79,6 +56,8 @@ func ProjectsHandler(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||||||
handleCreate(s, i)
|
handleCreate(s, i)
|
||||||
case "add-helper":
|
case "add-helper":
|
||||||
handleAddHelper(s, i)
|
handleAddHelper(s, i)
|
||||||
|
case "close":
|
||||||
|
handleClose(s, i)
|
||||||
default:
|
default:
|
||||||
shared.RespondEphemeral(s, i, "Unknown subcommand.")
|
shared.RespondEphemeral(s, i, "Unknown subcommand.")
|
||||||
}
|
}
|
||||||
@@ -154,56 +133,53 @@ func mentionUser(id int64) string {
|
|||||||
return "<@" + strconv.FormatInt(id, 10) + ">"
|
return "<@" + strconv.FormatInt(id, 10) + ">"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handleCreate just opens the modal - the actual creation happens on
|
||||||
|
// submit, in HandleModalSubmit (components.go).
|
||||||
func handleCreate(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
func handleCreate(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
if !shared.RequireManageGuild(s, i) {
|
if !shared.RequireManageGuild(s, i) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
guildID, ok := shared.ParseGuildID(s, i)
|
_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
||||||
if !ok {
|
Type: discordgo.InteractionResponseModal,
|
||||||
return
|
Data: &discordgo.InteractionResponseData{
|
||||||
}
|
CustomID: "projects:create_modal",
|
||||||
if i.Member == nil || i.Member.User == nil {
|
Title: "Create a project",
|
||||||
shared.RespondEphemeral(s, i, "Missing member info.")
|
Components: []discordgo.MessageComponent{
|
||||||
return
|
discordgo.ActionsRow{
|
||||||
}
|
Components: []discordgo.MessageComponent{
|
||||||
|
discordgo.TextInput{
|
||||||
data := i.ApplicationCommandData()
|
CustomID: "name",
|
||||||
if len(data.Options) == 0 {
|
Label: "Project name",
|
||||||
shared.RespondEphemeral(s, i, "Missing options.")
|
Style: discordgo.TextInputShort,
|
||||||
return
|
Required: true,
|
||||||
}
|
},
|
||||||
opt := data.Options[0]
|
},
|
||||||
|
},
|
||||||
var name, description string
|
discordgo.ActionsRow{
|
||||||
for _, o := range opt.Options {
|
Components: []discordgo.MessageComponent{
|
||||||
switch o.Name {
|
discordgo.TextInput{
|
||||||
case "name":
|
CustomID: "description",
|
||||||
name = o.StringValue()
|
Label: "Description (optional)",
|
||||||
case "description":
|
Style: discordgo.TextInputParagraph,
|
||||||
description = o.StringValue()
|
Required: false,
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
if strings.TrimSpace(name) == "" {
|
},
|
||||||
shared.RespondEphemeral(s, i, "Project name cannot be empty.")
|
},
|
||||||
return
|
},
|
||||||
}
|
})
|
||||||
|
|
||||||
creatorID, err := strconv.ParseInt(i.Member.User.ID, 10, 64)
|
|
||||||
if err != nil {
|
|
||||||
shared.RespondEphemeral(s, i, "Invalid user ID.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
id, err := services.Global.Projects.CreateProject(context.Background(), guildID, creatorID, name, description)
|
|
||||||
if err != nil {
|
|
||||||
shared.RespondEphemeral(s, i, "Failed to create project.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
shared.RespondEphemeral(s, i, "Created project **"+name+"** with ID `"+strconv.FormatInt(id, 10)+"`.")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handleAddHelper collects the user via Discord's native user-option (a
|
||||||
|
// modal can't hold one of these), then responds with a select menu of the
|
||||||
|
// guild's active projects instead of making the caller remember/type a
|
||||||
|
// numeric project ID - the actual add-helper call happens on selection, in
|
||||||
|
// HandleComponent (components.go).
|
||||||
|
// handleAddHelper is the first of two dropdown steps: pick a project here,
|
||||||
|
// then HandleComponent (components.go) follows up with a native Discord
|
||||||
|
// user-select to pick who helps, and performs the actual AddHelper call
|
||||||
|
// once both are known.
|
||||||
func handleAddHelper(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
func handleAddHelper(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
if !shared.RequireManageGuild(s, i) {
|
if !shared.RequireManageGuild(s, i) {
|
||||||
return
|
return
|
||||||
@@ -214,55 +190,110 @@ func handleAddHelper(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
data := i.ApplicationCommandData()
|
options, err := activeProjectOptions(context.Background(), guildID)
|
||||||
if len(data.Options) == 0 {
|
|
||||||
shared.RespondEphemeral(s, i, "Missing options.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
opt := data.Options[0]
|
|
||||||
|
|
||||||
var projectID int64
|
|
||||||
var userID string
|
|
||||||
for _, o := range opt.Options {
|
|
||||||
switch o.Name {
|
|
||||||
case "project-id":
|
|
||||||
projectID = o.IntValue()
|
|
||||||
case "user":
|
|
||||||
if u := o.UserValue(s); u != nil {
|
|
||||||
userID = u.ID
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if projectID <= 0 {
|
|
||||||
shared.RespondEphemeral(s, i, "Invalid project ID.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if userID == "" {
|
|
||||||
shared.RespondEphemeral(s, i, "Invalid user.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
exists, err := services.Global.Projects.ProjectExistsInGuild(context.Background(), guildID, projectID)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
shared.RespondEphemeral(s, i, "Failed to load project.")
|
shared.RespondEphemeral(s, i, "Failed to load projects.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !exists {
|
if len(options) == 0 {
|
||||||
shared.RespondEphemeral(s, i, "Project `"+strconv.FormatInt(projectID, 10)+"` not found in this server.")
|
shared.RespondEphemeral(s, i, "There are no active projects to add a helper to.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
userID64, err := strconv.ParseInt(userID, 10, 64)
|
_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
||||||
if err != nil {
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
||||||
shared.RespondEphemeral(s, i, "Invalid user ID.")
|
Data: &discordgo.InteractionResponseData{
|
||||||
return
|
Content: "Which project should get a new helper?",
|
||||||
}
|
Flags: discordgo.MessageFlagsEphemeral,
|
||||||
|
Components: []discordgo.MessageComponent{
|
||||||
if err := services.Global.Projects.AddHelper(context.Background(), projectID, userID64); err != nil {
|
discordgo.ActionsRow{
|
||||||
shared.RespondEphemeral(s, i, "Failed to add helper to project. ("+err.Error()+")")
|
Components: []discordgo.MessageComponent{
|
||||||
return
|
discordgo.SelectMenu{
|
||||||
}
|
CustomID: "projects:add_helper_project_select",
|
||||||
|
Placeholder: "Select a project",
|
||||||
shared.RespondEphemeral(s, i, "Added <@"+userID+"> as helper to project `"+strconv.FormatInt(projectID, 10)+"`.")
|
Options: options,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handleClose responds with a select menu of the guild's active projects -
|
||||||
|
// same reasoning as handleAddHelper, picking from a live list beats typing
|
||||||
|
// an ID. The actual deactivation happens on selection, in HandleComponent.
|
||||||
|
func handleClose(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
|
if !shared.RequireManageGuild(s, i) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
guildID, ok := shared.ParseGuildID(s, i)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
options, err := activeProjectOptions(context.Background(), guildID)
|
||||||
|
if err != nil {
|
||||||
|
shared.RespondEphemeral(s, i, "Failed to load projects.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(options) == 0 {
|
||||||
|
shared.RespondEphemeral(s, i, "There are no active projects to close.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
||||||
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
||||||
|
Data: &discordgo.InteractionResponseData{
|
||||||
|
Content: "Which project should be closed?",
|
||||||
|
Flags: discordgo.MessageFlagsEphemeral,
|
||||||
|
Components: []discordgo.MessageComponent{
|
||||||
|
discordgo.ActionsRow{
|
||||||
|
Components: []discordgo.MessageComponent{
|
||||||
|
discordgo.SelectMenu{
|
||||||
|
CustomID: "projects:close_select",
|
||||||
|
Placeholder: "Select a project",
|
||||||
|
Options: options,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// activeProjectOptions builds select-menu options for the guild's active
|
||||||
|
// projects, truncating name/description to Discord's option limits
|
||||||
|
// (label: 100 chars, description: 100 chars).
|
||||||
|
func activeProjectOptions(ctx context.Context, guildID int64) ([]discordgo.SelectMenuOption, error) {
|
||||||
|
const limit = 25 // Discord's own cap on select menu options
|
||||||
|
items, err := services.Global.Projects.ListActive(ctx, guildID, limit)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
options := make([]discordgo.SelectMenuOption, 0, len(items))
|
||||||
|
for _, p := range items {
|
||||||
|
if p == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
name := p.Name
|
||||||
|
if name == "" {
|
||||||
|
name = "Unnamed project"
|
||||||
|
}
|
||||||
|
options = append(options, discordgo.SelectMenuOption{
|
||||||
|
Label: truncate(name, 100),
|
||||||
|
Value: strconv.FormatInt(p.ID, 10),
|
||||||
|
Description: truncate(p.Description, 100),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return options, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func truncate(s string, max int) string {
|
||||||
|
if len(s) <= max {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return s[:max]
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,3 +12,9 @@ var (
|
|||||||
|
|
||||||
func ProjectsHandler(s *discordgo.Session, i *discordgo.InteractionCreate) { public.ProjectsHandler(s, i) }
|
func ProjectsHandler(s *discordgo.Session, i *discordgo.InteractionCreate) { public.ProjectsHandler(s, i) }
|
||||||
|
|
||||||
|
func HandleComponent(s *discordgo.Session, i *discordgo.InteractionCreate) { public.HandleComponent(s, i) }
|
||||||
|
|
||||||
|
func HandleModalSubmit(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
|
public.HandleModalSubmit(s, i)
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,35 @@ func (r *Repo) AddHelper(ctx context.Context, projectID, userID int64) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Repo) DeactivateProject(ctx context.Context, guildID, projectID int64) error {
|
||||||
|
const q = `
|
||||||
|
UPDATE projects
|
||||||
|
SET is_active = FALSE
|
||||||
|
WHERE id = $1 AND guild_id = $2
|
||||||
|
`
|
||||||
|
_, err := r.db.ExecContext(ctx, q, projectID, guildID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetProject fetches a single project, scoped to guildID so a project ID
|
||||||
|
// from one server can't be used to reach into another's data.
|
||||||
|
func (r *Repo) GetProject(ctx context.Context, guildID, projectID int64) (*Project, error) {
|
||||||
|
const q = `
|
||||||
|
SELECT id, name, description, created_by
|
||||||
|
FROM projects
|
||||||
|
WHERE id = $1 AND guild_id = $2
|
||||||
|
`
|
||||||
|
row := r.db.QueryRowContext(ctx, q, projectID, guildID)
|
||||||
|
p := &Project{GuildID: guildID, IsActive: true}
|
||||||
|
if err := row.Scan(&p.ID, &p.Name, &p.Description, &p.CreatedBy); err != nil {
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (r *Repo) ProjectExistsInGuild(ctx context.Context, guildID, projectID int64) (bool, error) {
|
func (r *Repo) ProjectExistsInGuild(ctx context.Context, guildID, projectID int64) (bool, error) {
|
||||||
const q = `
|
const q = `
|
||||||
SELECT 1
|
SELECT 1
|
||||||
@@ -79,6 +108,37 @@ func (r *Repo) ProjectExistsInGuild(ctx context.Context, guildID, projectID int6
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ListActiveProjects is a lighter version of ListActiveProjectsWithMembers,
|
||||||
|
// without the member-join query - for callers (like building a select menu
|
||||||
|
// of projects to pick from) that only need name/id, not creator/helpers.
|
||||||
|
func (r *Repo) ListActiveProjects(ctx context.Context, guildID int64, limit int) ([]*Project, error) {
|
||||||
|
const q = `
|
||||||
|
SELECT id, name, description, created_by
|
||||||
|
FROM projects
|
||||||
|
WHERE guild_id = $1 AND is_active = TRUE
|
||||||
|
ORDER BY created_at DESC
|
||||||
|
LIMIT $2
|
||||||
|
`
|
||||||
|
rows, err := r.db.QueryContext(ctx, q, guildID, limit)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []*Project
|
||||||
|
for rows.Next() {
|
||||||
|
p := &Project{GuildID: guildID, IsActive: true}
|
||||||
|
if err := rows.Scan(&p.ID, &p.Name, &p.Description, &p.CreatedBy); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (r *Repo) ListActiveProjectsWithMembers(ctx context.Context, guildID int64, limit int) ([]*ProjectWithMembers, error) {
|
func (r *Repo) ListActiveProjectsWithMembers(ctx context.Context, guildID int64, limit int) ([]*ProjectWithMembers, error) {
|
||||||
const qProjects = `
|
const qProjects = `
|
||||||
SELECT id, name, description, created_by
|
SELECT id, name, description, created_by
|
||||||
|
|||||||
@@ -113,3 +113,31 @@ func (r *Repo) SetNotificationChannel(ctx context.Context, guildID, channelID in
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsEnabled reports whether Twitch notifications are enabled for guildID.
|
||||||
|
// A guild with no twitch_config row yet defaults to enabled, matching the
|
||||||
|
// column's own DEFAULT TRUE - "never configured" and "explicitly on" are
|
||||||
|
// the same state until someone actually flips it off.
|
||||||
|
func (r *Repo) IsEnabled(ctx context.Context, guildID int64) (bool, error) {
|
||||||
|
const q = `SELECT enabled FROM twitch_config WHERE guild_id = $1`
|
||||||
|
var enabled bool
|
||||||
|
err := r.db.QueryRowContext(ctx, q, guildID).Scan(&enabled)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return enabled, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Repo) SetEnabled(ctx context.Context, guildID int64, enabled bool) error {
|
||||||
|
const q = `
|
||||||
|
INSERT INTO twitch_config (guild_id, enabled)
|
||||||
|
VALUES ($1, $2)
|
||||||
|
ON CONFLICT (guild_id)
|
||||||
|
DO UPDATE SET enabled = EXCLUDED.enabled
|
||||||
|
`
|
||||||
|
_, err := r.db.ExecContext(ctx, q, guildID, enabled)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,19 @@ func (s *Service) ListActiveWithMembers(ctx context.Context, guildID int64, limi
|
|||||||
return s.repo.ListActiveProjectsWithMembers(ctx, guildID, limit)
|
return s.repo.ListActiveProjectsWithMembers(ctx, guildID, limit)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Service) ListActive(ctx context.Context, guildID int64, limit int) ([]*projectsrepo.Project, error) {
|
||||||
|
return s.repo.ListActiveProjects(ctx, guildID, limit)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Service) ProjectExistsInGuild(ctx context.Context, guildID, projectID int64) (bool, error) {
|
func (s *Service) ProjectExistsInGuild(ctx context.Context, guildID, projectID int64) (bool, error) {
|
||||||
return s.repo.ProjectExistsInGuild(ctx, guildID, projectID)
|
return s.repo.ProjectExistsInGuild(ctx, guildID, projectID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Service) GetProject(ctx context.Context, guildID, projectID int64) (*projectsrepo.Project, error) {
|
||||||
|
return s.repo.GetProject(ctx, guildID, projectID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) DeactivateProject(ctx context.Context, guildID, projectID int64) error {
|
||||||
|
return s.repo.DeactivateProject(ctx, guildID, projectID)
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -59,6 +59,14 @@ func (s *Service) SetNotificationChannel(ctx context.Context, guildID, channelID
|
|||||||
return s.repo.SetNotificationChannel(ctx, guildID, channelID)
|
return s.repo.SetNotificationChannel(ctx, guildID, channelID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Service) IsEnabled(ctx context.Context, guildID int64) (bool, error) {
|
||||||
|
return s.repo.IsEnabled(ctx, guildID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) SetEnabled(ctx context.Context, guildID int64, enabled bool) error {
|
||||||
|
return s.repo.SetEnabled(ctx, guildID, enabled)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Service) IsUserStreaming(ctx context.Context, username string) (bool, error) {
|
func (s *Service) IsUserStreaming(ctx context.Context, username string) (bool, error) {
|
||||||
type gqlRequest struct {
|
type gqlRequest struct {
|
||||||
Query string `json:"query"`
|
Query string `json:"query"`
|
||||||
|
|||||||
@@ -47,6 +47,16 @@ func StartTwitchLiveLoop(s *discordgo.Session, svc *services.Services) {
|
|||||||
for _, guildID := range guildIDs {
|
for _, guildID := range guildIDs {
|
||||||
log.Printf("twitch: processing guild %d", guildID)
|
log.Printf("twitch: processing guild %d", guildID)
|
||||||
|
|
||||||
|
enabled, err := svc.Twitch.IsEnabled(ctx, guildID)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("twitch: failed to check enabled state for guild %d: %v", guildID, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !enabled {
|
||||||
|
log.Printf("twitch: notifications disabled for guild %d", guildID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
channelID, ok, err := svc.Twitch.GetNotificationChannel(ctx, guildID)
|
channelID, ok, err := svc.Twitch.GetNotificationChannel(ctx, guildID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("twitch: failed to get channel for guild %d: %v", guildID, err)
|
log.Printf("twitch: failed to get channel for guild %d: %v", guildID, err)
|
||||||
|
|||||||
@@ -97,7 +97,10 @@ func HandleComponent(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||||||
content = "Done."
|
content = "Done."
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
content = "Error: " + err.Error()
|
// err can carry a raw Lavalink/network failure here (Player.Update),
|
||||||
|
// not just our own "music manager not initialized" - don't echo
|
||||||
|
// that detail into the ephemeral reply.
|
||||||
|
content = "That didn't work. Please try again."
|
||||||
}
|
}
|
||||||
|
|
||||||
// send ephemeral confirmation
|
// send ephemeral confirmation
|
||||||
|
|||||||
+2
-1
@@ -45,7 +45,8 @@ CREATE TABLE IF NOT EXISTS levelup (
|
|||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS twitch_config (
|
CREATE TABLE IF NOT EXISTS twitch_config (
|
||||||
guild_id BIGINT PRIMARY KEY,
|
guild_id BIGINT PRIMARY KEY,
|
||||||
twitch_channel_id BIGINT
|
twitch_channel_id BIGINT,
|
||||||
|
enabled BOOLEAN NOT NULL DEFAULT TRUE
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS rps (
|
CREATE TABLE IF NOT EXISTS rps (
|
||||||
|
|||||||
Reference in New Issue
Block a user