muffin/goMuffin
1
1
Fork 0
Code Issues Pull requests Projects Releases 3 Packages Wiki Activity Actions

refactor: use omitempty

Browse source
This commit is contained in:
Siwoo Jeon 2025-07-02 14:08:56 +09:00
parent 5f5c14df7e
commit 2f655a1384
Signed by: migan
GPG key ID: 036E9A8C5E8E48DA
9 changed files with 15 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chatbot/chatbot.go
View file

@ -151,7 +151,7 @@ func getAIResponse(s *discordgo.Session, c *Chatbot, user *discordgo.User, quest
}
resultText := result.Text()
err = SaveMemory(&databases.InsertMemory{
err = SaveMemory(&databases.Memory{
UserId: user.ID,
Content: question,
Answer: resultText,

2
chatbot/memory.go
View file

@ -8,7 +8,7 @@ import (
"google.golang.org/genai"
)
func SaveMemory(data *databases.InsertMemory) error {
func SaveMemory(data *databases.Memory) error {
_, err := databases.Database.Memory.InsertOne(context.TODO(), *data)
return err
}

2
commands/learn.go
View file

@ -154,7 +154,7 @@ func learnRun(m any, userId, command, result string) error {
return nil
}
_, err := databases.Database.Learns.InsertOne(context.TODO(), databases.InsertLearn{
_, err := databases.Database.Learns.InsertOne(context.TODO(), databases.Learn{
Command: command,
Result: result,
UserId: userId,

2
components/register.go
View file

@ -36,7 +36,7 @@ var RegisterComponent *commands.Component = &commands.Component{
switch {
case strings.HasPrefix(customId, utils.ServiceAgree):
_, err := databases.Database.Users.InsertOne(context.TODO(), databases.InsertUser{
_, err := databases.Database.Users.InsertOne(context.TODO(), databases.User{
UserId: ctx.Inter.User.ID,
CreatedAt: time.Now(),
})

17
databases/Learn.go
View file

@ -6,17 +6,10 @@ import (
"go.mongodb.org/mongo-driver/v2/bson"
)
type InsertLearn struct {
Command string `bson:"command"`
Result string `bson:"result"`
UserId string `bson:"user_id"`
CreatedAt time.Time `bson:"created_at"`
}
type Learn struct {
Id bson.ObjectID `bson:"_id" json:"id"`
Command string `bson:"command" json:"command"`
Result string `bson:"result" json:"result"`
UserId string `bson:"user_id" json:"user_id"`
CreatedAt time.Time `bson:"created_at" json:"created_at"`
Id bson.ObjectID `bson:"_id,omitempty" json:"id"`
Command string `bson:"command"`
Result string `bson:"result"`
UserId string `bson:"user_id"`
CreatedAt time.Time `bson:"created_at"`
}

8
databases/Memory.go
View file

@ -2,14 +2,8 @@ package databases
import "go.mongodb.org/mongo-driver/v2/bson"
type InsertMemory struct {
UserId string `bson:"user_id"`
Content string `bson:"content"`
Answer string `bson:"answer"`
}
type Memory struct {
Id bson.ObjectID `bson:"_id"`
Id bson.ObjectID `bson:"_id,omitempty"`
UserId string `bson:"user_id"`
Content string `bson:"content"`
Answer string `bson:"answer"`

10
databases/Text.go
View file

@ -6,15 +6,9 @@ import (
"go.mongodb.org/mongo-driver/v2/bson"
)
type InsertText struct {
Text string `bson:"text" json:"text"`
Persona string `bson:"persona" json:"persona"`
CreatedAt time.Time `bson:"created_at"`
}
type Text struct {
Id bson.ObjectID `bson:"_id" json:"id"`
Id bson.ObjectID `bson:"_id,omitempty" json:"id"`
Text string `bson:"text" json:"text"`
Persona string `bson:"persona" json:"persona"`
CreatedAt time.Time `bson:"created_at" json:"created_at"`
CreatedAt time.Time `bson:"created_at"`
}

13
databases/User.go
View file

@ -7,13 +7,8 @@ import (
"go.mongodb.org/mongo-driver/v2/bson"
)
type InsertUser struct {
UserId string `bson:"user_id"`
CreatedAt time.Time `bson:"created_at"`
}
type User struct {
Id bson.ObjectID `bson:"_id"`
Id bson.ObjectID `bson:"_id,omitempty"`
UserId string `bson:"user_id"`
CreatedAt time.Time `bson:"created_at"`
}
@ -21,9 +16,5 @@ type User struct {
func (d *MuffinDatabase) IsUser(userId string) bool {
var user *User
d.Users.FindOne(context.TODO(), bson.D{{Key: "user_id", Value: userId}}).Decode(&user)
if user != nil {
return true
}
return false
return user != nil
}

2
handler/messageCreate.go
View file

@ -91,7 +91,7 @@ func MessageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
return
} else {
if m.Author.ID == config.Chatbot.Train.UserId {
if _, err := databases.Database.Texts.InsertOne(context.TODO(), databases.InsertText{
if _, err := databases.Database.Texts.InsertOne(context.TODO(), databases.Text{
Text: m.Content,
Persona: "muffin",
CreatedAt: time.Now(),