Customization

.gitignore

@@ -69,4 +69,11 @@ run/bsharp/token.txt
 # Added by cargo
 
 /target
-output.log
+output.log
+run/eod/__debug_bin2487916788
+run/eod/main.go
+run/eod/main.go
+run/eod/main.go
+run/eod/main.go
+run/eod/main.go
+/run/eod

eod/base/base.go

@@ -32,6 +32,9 @@ func (b *Base) Init() {
 		sevcord.NewSlashCommand("votecnt", "Configure the minimum number of votes!", b.ConfigVoteCnt, sevcord.NewOption("count", "The new vote count!", sevcord.OptionKindInt, true)),
 		sevcord.NewSlashCommand("pollcnt", "Configure the maximum number of polls!", b.ConfigPollCnt, sevcord.NewOption("count", "The new poll count!", sevcord.OptionKindInt, true)),
 		sevcord.NewSlashCommand("playchannels", "Configure the channels in which users can combine elements!", b.ConfigPlayChannels),
+		sevcord.NewSlashCommand("voteicons", "Configure the emojis used for voting!", b.ConfigVoteIcons, sevcord.NewOption("upvote", "The new upvote emoji!", sevcord.OptionKindString, true), sevcord.NewOption("downvote", "The new downvote emoji!", sevcord.OptionKindString, true)),
+		sevcord.NewSlashCommand("progressicons", "Configure the emojis for progress!", b.ConfigProgIcons, sevcord.NewOption("positive", "The positive progress emoji!", sevcord.OptionKindString, true), sevcord.NewOption("negative", "The negative progress emoji!", sevcord.OptionKindString, true)),
+		sevcord.NewSlashCommand("combolength", "Configure the maximum number of elements in a combination!", b.ConfigComboLength, sevcord.NewOption("count", "The new maximum combination length!", sevcord.OptionKindInt, true)),
 	).RequirePermissions(discordgo.PermissionManageChannels))
 	b.s.AddSelectHandler("config_play", b.ConfigPlayChannelsHandler)
 }

eod/base/config.go

@@ -69,7 +69,38 @@ func (b *Base) ConfigPlayChannels(c sevcord.Ctx, opts []any) {
 	))
 	b.configNewsMessage(c, "Changed Config - **Play Channels**")
 }
+func (b *Base) ConfigVoteIcons(c sevcord.Ctx, opts []any) {
+	c.Acknowledge()
 
+	_, err := b.db.Exec("UPDATE config SET voteicons=$1 WHERE guild =$2", pq.Array(opts), c.Guild())
+	if err != nil {
+		b.Error(c, err)
+		return
+	}
+	c.Respond(sevcord.NewMessage("Successfully updated voting emojis!"))
+	b.configNewsMessage(c, "Change Config - **Vote Icons**")
+}
+func (b *Base) ConfigProgIcons(c sevcord.Ctx, opts []any) {
+	c.Acknowledge()
+	_, err := b.db.Exec("UPDATE config SET progicons=$1 WHERE guild =$2", pq.Array(opts), c.Guild())
+	if err != nil {
+		b.Error(c, err)
+		return
+	}
+	c.Respond(sevcord.NewMessage("Successfully updated progress emojis!"))
+	b.configNewsMessage(c, "Change Config - **Progress Icons**")
+
+}
+func (b *Base) ConfigComboLength(c sevcord.Ctx, opts []any) {
+	c.Acknowledge()
+	_, err := b.db.Exec("Update config SET combolength=$1 WHERE guild=$2", opts[0], c.Guild())
+	if err != nil {
+		b.Error(c, err)
+		return
+	}
+	c.Respond(sevcord.NewMessage("Successfully updated maximum combination limit!"))
+	b.configNewsMessage(c, "Change Config - **Combination Limit**")
+}
 func (b *Base) ConfigPlayChannelsHandler(c sevcord.Ctx, params string, opts []string) {
 	c.Acknowledge()
 

eod/categories/infoedit.go

@@ -1,6 +1,7 @@
 package categories
 
 import (
+	"database/sql"
 	"fmt"
 	"strconv"
 	"strings"
@@ -70,6 +71,40 @@ func (c *Categories) SignCmd(ctx sevcord.Ctx, opts []any) {
 	}).Input(sevcord.NewModalInput("New Comment", "None", sevcord.ModalInputStyleParagraph, 2400)))
 }
 
+func (c *Categories) MsgSignCmd(ctx sevcord.Ctx, cat string, mark string) {
+	ctx.Acknowledge()
+
+	var name string
+	var old string
+	err := c.db.QueryRow("SELECT name, comment FROM categories WHERE LOWER(name)=$1 AND guild=$2", strings.ToLower(cat), ctx.Guild()).Scan(&name, &old)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			ctx.Respond(sevcord.NewMessage("Element **" + cat + "** doesn't exist! " + types.RedCircle))
+			return
+		} else {
+			c.base.Error(ctx, err)
+			return
+		}
+	}
+
+	// Make poll
+	res := c.polls.CreatePoll(ctx, &types.Poll{
+		Kind: types.PollKindCatComment,
+		Data: types.PgData{
+			"cat": name,
+			"new": mark,
+			"old": old,
+		},
+	})
+	if !res.Ok {
+		ctx.Respond(res.Response())
+		return
+	}
+
+	// Respond
+	ctx.Respond(sevcord.NewMessage(fmt.Sprintf("Suggested a note for **%s** 🖋️", name)))
+}
+
 func (c *Categories) ColorCmd(ctx sevcord.Ctx, opts []any) {
 	ctx.Acknowledge()
 

eod/elements/combo.go

@@ -32,9 +32,13 @@ type comboRes struct {
 func (e *Elements) Combine(c sevcord.Ctx, elemVals []string) {
 	c.Acknowledge()
 	e.base.IncrementCommandStat(c, "combine")
-
-	if len(elemVals) > types.MaxComboLength {
-		c.Respond(sevcord.NewMessage(fmt.Sprintf("You can only combine up to %d elements! "+types.RedCircle, types.MaxComboLength)))
+	var comboLimit int
+	err := e.db.QueryRow("SELECT combolength FROM config WHERE guild=$1", c.Guild()).Scan(&comboLimit)
+	if err != nil {
+		comboLimit = types.DefaultMaxComboLength
+	}
+	if len(elemVals) > comboLimit {
+		c.Respond(sevcord.NewMessage(fmt.Sprintf("You can only combine up to %d elements! "+types.RedCircle, comboLimit)))
 		return
 	}
 	if len(elemVals) < 2 {
@@ -51,7 +55,7 @@ func (e *Elements) Combine(c sevcord.Ctx, elemVals []string) {
 
 	// Get status of everything (exists, whether you have it, etc.)
 	var res []comboRes
-	err := e.db.Select(&res, `SELECT id, name, id=ANY(SELECT UNNEST(inv) FROM inventories WHERE guild=$1 AND "user"=$2) cont FROM elements WHERE guild=$1 AND LOWER(name)=ANY($3)`, c.Guild(), c.Author().User.ID, pq.Array(lowered))
+	err = e.db.Select(&res, `SELECT id, name, id=ANY(SELECT UNNEST(inv) FROM inventories WHERE guild=$1 AND "user"=$2) cont FROM elements WHERE guild=$1 AND LOWER(name)=ANY($3)`, c.Guild(), c.Author().User.ID, pq.Array(lowered))
 	if err != nil {
 		e.base.Error(c, err)
 		return

eod/elements/hint.go

@@ -155,15 +155,21 @@ func (e *Elements) HintHandler(c sevcord.Ctx, params string) {
 		return
 	}
 
+	var progress pq.StringArray
+	err = e.db.QueryRow("SELECT progicons FROM config WHERE guild=$1", c.Guild()).Scan(&progress)
+	if err != nil {
+		e.base.Error(c, err)
+		return
+	}
 	// Create message
 
 	description := &strings.Builder{}
 	for _, item := range items {
 		// Emoji
 		if item.Cont {
-			description.WriteString(types.Check)
+			description.WriteString(progress[0])
 		} else {
-			description.WriteString(types.NoCheck)
+			description.WriteString(progress[1])
 		}
 		description.WriteString(" ")
 

eod/init.go

@@ -262,7 +262,7 @@ func (b *Bot) Init() {
 		sevcord.NewOption("query", "A query to select the elements in the idea to be made from!", sevcord.OptionKindString, false).
 			AutoComplete(b.queries.Autocomplete),
 		sevcord.NewOption("count", "The number of elements to include in the idea!", sevcord.OptionKindInt, false).
-			MinMax(2, types.MaxComboLength),
+			MinMax(2, types.DefaultMaxComboLength),
 	))
 	b.s.AddButtonHandler("idea", b.elements.IdeaHandler)
 	b.s.RegisterSlashCommand(sevcord.NewSlashCommand("uncheese", "Delete the lowest tree size combo for elements!", b.elements.Uncheese, sevcord.NewOption("query", "A query to select the elements from!", sevcord.OptionKindString, false).

eod/msgs.go

@@ -47,13 +47,11 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 			val = any(v)
 		}
 		b.elements.Hint(c, []any{val, nil})
-
-	case "cat":
+	case "cat", "c":
 		if !b.base.CheckCtx(c, "cat") {
 			return
 		}
 		b.pages.Cat(c, []any{any(content), nil})
-
 	case "inv":
 		if !b.base.CheckCtx(c, "inv") {
 			return
@@ -86,7 +84,6 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 			return
 		}
 		b.pages.Lb(c, []any{nil, nil, nil})
-
 	case "p", "products":
 		if !b.base.CheckCtx(c, "products") {
 			return
@@ -101,8 +98,6 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 		if !b.base.CheckCtx(c, "query") {
 			return
 		}
-		b.pages.Query(c, []any{any(content), nil})
-
 	case "ac", "rc":
 		if !b.base.CheckCtx(c, "cat") {
 			return
@@ -149,18 +144,63 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 		if !b.base.CheckCtx(c, "sign") {
 			return
 		}
-		parts := strings.SplitN(content, "|", 2)
-		if len(parts) != 2 {
-			c.Respond(sevcord.NewMessage("Invalid format! " + types.RedCircle))
+		parts := strings.SplitN(content, "|", 3)
+		if len(parts) != 3 {
+			c.Respond(sevcord.NewMessage("Use `!sign [e/c/q]|[element/category/query name]|<text>`! " + types.RedCircle))
 			return
 		}
-		b.elements.MsgSignCmd(c, strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1]))
+		// check for signing element/category/query
+		switch strings.TrimSpace(parts[0]) {
+		case "e", "element":
+			b.elements.MsgSignCmd(c, strings.TrimSpace(parts[1]), strings.TrimSpace(parts[2]))
+
+		case "c", "cat", "category":
+			b.categories.MsgSignCmd(c, strings.TrimSpace(parts[1]), strings.TrimSpace(parts[2]))
+
+		case "q", "query":
+			b.queries.MsgSignCmd(c, strings.TrimSpace(parts[1]), strings.TrimSpace(parts[2]))
 
+		default:
+			c.Respond(sevcord.NewMessage("Use `!sign [e/c/q]|[element/category/query name]|<text>`! " + types.RedCircle))
+		}
+	case "col", "color", "colour":
+		if !b.base.CheckCtx(c, "color") {
+			return
+		}
+		// check part amount
+		parts := strings.SplitN(content, "|", 3)
+		if len(parts) != 3 {
+			c.Respond(sevcord.NewMessage("Use `!color [e/c/q]|[element/category/query name]|<hex code>`! " + types.RedCircle))
+			return
+		}
+		// check for coloring element/category/query
+		switch strings.TrimSpace(parts[0]) {
+		case "e", "element":
+			id, ok := b.getElementId(c, parts[1])
+			if !ok {
+				return
+			}
+			b.elements.ColorCmd(c, []any{id, strings.TrimSpace(parts[2])})
+
+		case "c", "cat", "category":
+			b.categories.ColorCmd(c, []any{strings.TrimSpace(parts[1]), strings.TrimSpace(parts[2])})
+
+		case "q", "query":
+			b.queries.ColorCmd(c, []any{strings.TrimSpace(parts[1]), strings.TrimSpace(parts[2])})
+
+		default:
+			c.Respond(sevcord.NewMessage("Use `!color [e/c/q]|[element/category/query name]|<hex code>`! " + types.RedCircle))
+		}
 	case "n", "next":
 		if !b.base.CheckCtx(c, "next") {
 			return
 		}
-		b.elements.Next(c, []any{nil})
+		val := any(nil)
+		part := strings.TrimSpace(content)
+		if part != "" {
+			val = any(part)
+		}
+		b.elements.Next(c, []any{val})
 
 	case "img", "image":
 		if !b.base.CheckCtx(c, "image") {
@@ -300,8 +340,13 @@ func (b *Bot) messageHandler(c sevcord.Ctx, content string) {
 			c.Respond(sevcord.NewMessage("Invalid number of repeats! " + types.RedCircle))
 			return
 		}
-		if cnt > types.MaxComboLength {
-			c.Respond(sevcord.NewMessage(fmt.Sprintf("You can only combine up to %d elements! "+types.RedCircle, types.MaxComboLength)))
+		var comboLength int
+		err = b.db.QueryRow("SELECT combolength FROM config WHERE guild=$1", c.Guild()).Scan(&comboLength)
+		if err != nil {
+			comboLength = types.DefaultMaxComboLength
+		}
+		if cnt > comboLength {
+			c.Respond(sevcord.NewMessage(fmt.Sprintf("You can only combine up to %d elements! "+types.RedCircle, comboLength)))
 			return
 		}
 		if cnt < 2 {
@@ -313,6 +358,7 @@ func (b *Bot) messageHandler(c sevcord.Ctx, content string) {
 			for i := 0; i < cnt; i++ {
 				inps = append(inps, strings.TrimSpace(parts[1]))
 			}
+
 			b.elements.Combine(c, inps)
 			return
 		} else {

eod/pages/categories.go

@@ -9,6 +9,7 @@ import (
 	"github.com/Nv7-Github/Nv7Haven/eod/types"
 	"github.com/Nv7-Github/sevcord/v2"
 	"github.com/dustin/go-humanize"
+	"github.com/lib/pq"
 )
 
 var catListSorts = []sevcord.Choice{
@@ -53,11 +54,17 @@ func (p *Pages) CatListHandler(c sevcord.Ctx, params string) {
 		return
 	}
 
+	var progress pq.StringArray
+	err = p.db.QueryRow("SELECT progicons FROM config WHERE guild=$1", c.Guild()).Scan(&progress)
+	if err != nil {
+		p.base.Error(c, err)
+		return
+	}
 	// Description
 	desc := &strings.Builder{}
 	for _, v := range cats {
 		if v.Length == v.InvIntersect {
-			fmt.Fprintf(desc, "%s %s\n", v.Name, types.Check)
+			fmt.Fprintf(desc, "%s %s\n", v.Name, progress[0])
 		} else {
 			fmt.Fprintf(desc, "%s (%s%%)\n", v.Name, humanize.FormatFloat("", float64(v.InvIntersect)/float64(v.Length)*100))
 		}
@@ -116,22 +123,26 @@ func (p *Pages) CatHandler(c sevcord.Ctx, params string) {
 	}
 
 	// Description
+	var progress pq.StringArray
+	err = p.db.QueryRow("SELECT progicons FROM config WHERE guild=$1", c.Guild()).Scan(&progress)
+	if err != nil {
+		p.base.Error(c, err)
+		return
+	}
 	desc := &strings.Builder{}
 	for _, v := range items {
 		if v.Cont {
-			fmt.Fprintf(desc, "%s %s\n", v.Name, types.Check)
+			fmt.Fprintf(desc, "%s %s\n", v.Name, progress[0])
 		} else {
-			fmt.Fprintf(desc, "%s %s\n", v.Name, types.NoCheck)
+			fmt.Fprintf(desc, "%s %s\n", v.Name, progress[1])
 		}
 	}
-
 	// Create
 	embed := sevcord.NewEmbed().
 		Title(fmt.Sprintf("%s (%s, %s%%)", parts[4], humanize.Comma(int64(cnt)), humanize.FormatFloat("", float64(common)/float64(cnt)*100))).
 		Description(desc.String()).
 		Footer(fmt.Sprintf("Page %d/%d", page+1, pagecnt), "").
-		Color(10181046) // Purple
-
+		Color(10181046) //Purple
 	c.Respond(sevcord.NewMessage("").
 		AddEmbed(embed).
 		AddComponentRow(PageSwitchBtns("cat", fmt.Sprintf("%s|%s|%d|%s", parts[1], parts[2], page, parts[4]))...),

eod/pages/inv.go

@@ -10,6 +10,7 @@ import (
 	"github.com/Nv7-Github/sevcord/v2"
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustin/go-humanize"
+	"github.com/lib/pq"
 )
 
 // Params: prevnext|user|sort|page
@@ -58,13 +59,19 @@ func (p *Pages) InvHandler(c sevcord.Ctx, params string) {
 	}
 
 	// Make description
+	var progress pq.StringArray
+	err = p.db.QueryRow("SELECT progicons FROM config WHERE guild=$1", c.Guild()).Scan(&progress)
+	if err != nil {
+		p.base.Error(c, err)
+		return
+	}
 	desc := &strings.Builder{}
 	for _, v := range inv {
 		if c.Author().User.ID != parts[1] {
 			if v.Cont {
-				fmt.Fprintf(desc, "%s %s\n", v.Name, types.Check)
+				fmt.Fprintf(desc, "%s %s\n", v.Name, progress[0])
 			} else {
-				fmt.Fprintf(desc, "%s %s\n", v.Name, types.NoCheck)
+				fmt.Fprintf(desc, "%s %s\n", v.Name, progress[1])
 			}
 		} else {
 			fmt.Fprintf(desc, "%s\n", v.Name)