Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/pen-fun/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ import (
"os"

"github.com/Neon-Genesis-Linux/pen-bot/internal/community"
"github.com/Neon-Genesis-Linux/pen-bot/internal/config"
"github.com/Neon-Genesis-Linux/pen-bot/internal/core"
_ "github.com/Neon-Genesis-Linux/pen-bot/internal/logger"
"github.com/disgoorg/disgo/events"
)

func main() {
community.Register()
config.Register()
if err := core.Start(context.Background(), os.Getenv("BOT_TOKEN"), onMessageCreate); err != nil {
slog.Error("failed to start pen-fun bot", slog.Any("error", err))
}
Expand Down
6 changes: 3 additions & 3 deletions internal/community/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package community

import (
"github.com/Neon-Genesis-Linux/pen-bot/internal/core"
"github.com/disgoorg/disgo/discord"
"github.com/Neon-Genesis-Linux/pen-bot/internal/messaging"
"github.com/disgoorg/disgo/events"
)

Expand All @@ -13,9 +13,9 @@ func Register() {
}

func handlePing(event *events.MessageCreate) {
_, _ = event.Client().Rest.CreateMessage(event.ChannelID, discord.NewMessageCreate().WithContent("pong"))
_ = messaging.SendReply(event, "pong")
}

func handlePong(event *events.MessageCreate) {
_, _ = event.Client().Rest.CreateMessage(event.ChannelID, discord.NewMessageCreate().WithContent("ping"))
_ = messaging.SendReply(event, "ping")
}
46 changes: 46 additions & 0 deletions internal/config/commands.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package config

import (
"os"
"strings"

"github.com/Neon-Genesis-Linux/pen-bot/internal/core"
"github.com/Neon-Genesis-Linux/pen-bot/internal/messaging"
"github.com/disgoorg/disgo/events"
)

const ownerEnv = "BOT_OWNER_ID"

// Register registers configuration commands with the bot.
func Register() {
core.RegisterCommandPath([]string{"config", "prefix", "set"}, handlePrefixSet)

Check failure on line 16 in internal/config/commands.go

View workflow job for this annotation

GitHub Actions / ci

undefined: core.RegisterCommandPath
}

func handlePrefixSet(event *events.MessageCreate, args []string) {
if !isOwner(event) {
_ = messaging.SendReply(event, "Unauthorized: only bot owner can run config commands.")
return
}

if len(args) < 1 {
_ = messaging.SendReply(event, "Usage: "+core.GetBotPrefix()+"config prefix set <newprefix>")

Check failure on line 26 in internal/config/commands.go

View workflow job for this annotation

GitHub Actions / ci

undefined: core.GetBotPrefix
return
}

newPrefix := strings.TrimSpace(args[0])
if newPrefix == "" {
_ = messaging.SendReply(event, "Prefix cannot be empty.")
return
}

core.SetBotPrefix(newPrefix)
_ = messaging.Send(event, "Command prefix set to `"+newPrefix+"`.")
}

func isOwner(event *events.MessageCreate) bool {
ownerID := os.Getenv(ownerEnv)
if ownerID == "" {
return false
}
return event.Message.Author.ID.String() == ownerID
}
51 changes: 51 additions & 0 deletions internal/messaging/message.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package messaging

import (
"log/slog"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/events"
)

// SendOptions configures message sending behavior
type SendOptions struct {
Reply bool // If true, reply to the triggering message
}

// SendMessage sends a message with optional reply.
// Errors are logged but not returned to user.
// Returns error for caller's information if needed.
func SendMessage(event *events.MessageCreate, content string, opts *SendOptions) error {
if opts == nil {
opts = &SendOptions{}
}

builder := discord.NewMessageCreate().WithContent(content)

if opts.Reply {
messageID := event.Message.ID
builder = builder.WithMessageReference(&discord.MessageReference{
MessageID: &messageID,
})
}

_, err := event.Client().Rest.CreateMessage(event.ChannelID, builder)
if err != nil {
slog.Error("failed to send message",
slog.String("channel_id", event.ChannelID.String()),
slog.String("content", content),
slog.Any("error", err),
)
}
return err
}

// Send sends a simple message (no reply)
func Send(event *events.MessageCreate, content string) error {
return SendMessage(event, content, nil)
}

// SendReply sends a message as a reply to the user's message
func SendReply(event *events.MessageCreate, content string) error {
return SendMessage(event, content, &SendOptions{Reply: true})
}
Loading