Command Improvements

.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/config.go

@@ -69,7 +69,6 @@ func (b *Base) ConfigPlayChannels(c sevcord.Ctx, opts []any) {
 	))
 	b.configNewsMessage(c, "Changed Config - **Play Channels**")
 }
-
 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

@@ -3,6 +3,7 @@ package elements
 import (
 	"database/sql"
 	"fmt"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -65,7 +66,7 @@ func (e *Elements) Combine(c sevcord.Ctx, elemVals []string) {
 	dontExist := make([]string, 0)
 	for _, v := range elemVals {
 		_, exists := exist[strings.ToLower(v)]
-		if !exists {
+		if !exists && !slices.Contains(dontExist, "**"+v+"**") {
 			dontExist = append(dontExist, "**"+v+"**")
 		}
 	}

eod/elements/hint.go

@@ -154,12 +154,9 @@ func (e *Elements) HintHandler(c sevcord.Ctx, params string) {
 		e.base.Error(c, err)
 		return
 	}
-
 	// Create message
-
 	description := &strings.Builder{}
 	for _, item := range items {
-		// Emoji
 		if item.Cont {
 			description.WriteString(types.Check)
 		} else {

eod/msgs.go

@@ -2,6 +2,7 @@ package eod
 
 import (
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -16,13 +17,30 @@ var seps = []string{
 	"plus",
 }
 
-func (b *Bot) getElementId(c sevcord.Ctx, val string) (int64, bool) {
+func makeListResp(start, join, end string, vals []string) string {
+	if len(vals) == 2 {
+		return fmt.Sprintf("%s %s %s %s%s %s", start, vals[0], join, vals[1], end, types.RedCircle)
+	} else if len(vals) > 2 {
+		return fmt.Sprintf("%s %s, %s %s%s %s", start, strings.Join(vals[:len(vals)-1], ", "), join, vals[len(vals)-1], end, types.RedCircle)
+	}
+	return ""
+}
+func (b *Bot) getElementId(c sevcord.Ctx, val string, showerr bool) (int64, bool) {
 	var id int64
-	err := b.db.QueryRow("SELECT id FROM elements WHERE LOWER(name)=$1 AND guild=$2", strings.ToLower(strings.TrimSpace(val)), c.Guild()).Scan(&id)
-	if err != nil {
-		b.base.Error(c, err, "Element **"+val+"** doesn't exist!")
+	var err error
+	id, err = strconv.ParseInt(strings.Trim(strings.TrimSpace(val), "#"), 10, 64)
+	if err == nil {
+		err = b.db.QueryRow("SELECT id FROM elements WHERE id=$1 AND guild=$2", strings.ToLower(strings.TrimLeft(strings.TrimSpace(val), "#")), c.Guild()).Scan(&id)
+	} else {
+		err = b.db.QueryRow("SELECT id FROM elements WHERE LOWER(name)=$1 AND guild=$2", strings.ToLower(strings.TrimSpace(val)), c.Guild()).Scan(&id)
+	}
+	if err != nil && showerr {
+		b.base.Error(c, err, "Element **"+val+"** doesn't exist! "+types.RedCircle)
+		return 0, false
+	} else if err != nil && !showerr {
 		return 0, false
 	}
+
 	return id, true
 }
 
@@ -40,19 +58,31 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 		}
 		val := any(nil)
 		if content != "" {
-			v, ok := b.getElementId(c, content)
+			v, ok := b.getElementId(c, content, true)
 			if !ok {
 				return
 			}
 			val = any(v)
 		}
 		b.elements.Hint(c, []any{val, nil})
-
-	case "cat":
+	case "hq", "hintquery":
+		if !b.base.CheckCtx(c, "hint") {
+			return
+		}
+		b.elements.Hint(c, []any{nil, content})
+	case "ic", "ci", "infocategory", "infocat", "catinfo", "categoryinfo":
+		b.categories.Info(c, []any{content})
+	case "iq", "qi", "infoquery", "queryinfo":
+		b.queries.Info(c, []any{content})
+	case "cat", "c":
 		if !b.base.CheckCtx(c, "cat") {
 			return
 		}
-		b.pages.Cat(c, []any{any(content), nil})
+		if content != "" {
+			b.pages.Cat(c, []any{any(content), nil})
+		} else {
+			b.pages.CatList(c, []any{"name"})
+		}
 
 	case "inv":
 		if !b.base.CheckCtx(c, "inv") {
@@ -85,13 +115,43 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 		if !b.base.CheckCtx(c, "lb") {
 			return
 		}
-		b.pages.Lb(c, []any{nil, nil, nil})
+		parts := strings.Split(content, " ")
+		Lbsort := ""
+		switch strings.ToLower(parts[0]) {
+		case "made":
+			Lbsort = "made"
+		case "imaged", "img":
+			Lbsort = "img"
+		case "votes":
+			Lbsort = "voted"
+		case "signed":
+			Lbsort = "signed"
+		case "colored", "colour", "coloured", "color":
+			Lbsort = "color"
+		case "catsigned":
+			Lbsort = "catsigned"
+		case "catimg", "catimage":
+			Lbsort = "catimg"
+		case "catcolor":
+			Lbsort = "catcolor"
+		case "querysigned":
+			Lbsort = "querysigned"
+		case "queryimage", "queryimg":
+			Lbsort = "queryimg"
+		case "querycolor":
+			Lbsort = "querycolor"
+		case "found", "":
+			Lbsort = "found"
+		default:
+			Lbsort = "found"
+		}
+		b.pages.Lb(c, []any{Lbsort, nil, nil})
 
 	case "p", "products":
 		if !b.base.CheckCtx(c, "products") {
 			return
 		}
-		id, ok := b.getElementId(c, content)
+		id, ok := b.getElementId(c, content, true)
 		if !ok {
 			return
 		}
@@ -101,7 +161,11 @@ 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})
+		if content != "" {
+			b.pages.Query(c, []any{any(content), nil})
+		} else {
+			b.pages.QueryList(c, []any{"name"})
+		}
 
 	case "ac", "rc":
 		if !b.base.CheckCtx(c, "cat") {
@@ -112,28 +176,38 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 			c.Respond(sevcord.NewMessage("Invalid format! " + types.RedCircle))
 			return
 		}
+		dontExist := make([]string, 0)
 		els := make([]int, 0)
 		added := false
 		for sep := range seps {
 			if strings.Contains(parts[1], seps[sep]) {
 				vals := strings.Split(parts[1], seps[sep])
 				for _, val := range vals {
-					id, ok := b.getElementId(c, val)
-					if !ok {
-						return
+					id, ok := b.getElementId(c, val, false)
+					if !ok && !slices.Contains(dontExist, "**"+val+"**") {
+						dontExist = append(dontExist, "**"+val+"**")
 					}
 					els = append(els, int(id))
 				}
-				added = true
 				break
 			}
 		}
+		if len(dontExist) == 0 {
+
+		} else if len(dontExist) == 1 {
+			c.Respond(sevcord.NewMessage("Element **" + dontExist[0] + "** doesn't exist!"))
+			return
+		} else {
+			c.Respond(sevcord.NewMessage(makeListResp("Elements", "and", " don't exist!", dontExist)))
+			return
+		}
 		if !added {
-			id, ok := b.getElementId(c, parts[1])
+			id, ok := b.getElementId(c, parts[1], true)
 			if !ok {
 				return
 			}
 			els = append(els, int(id))
+			added = true
 		}
 		if len(els) == 0 {
 			c.Respond(sevcord.NewMessage("Invalid format! " + types.RedCircle))
@@ -149,18 +223,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.ToLower(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.ToLower(strings.TrimSpace(parts[0])) {
+		case "e", "element":
+			id, ok := b.getElementId(c, parts[1], true)
+			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") {
@@ -192,7 +311,7 @@ func (b *Bot) textCommandHandler(c sevcord.Ctx, name string, content string) {
 		}
 
 		// Run command
-		switch parts[0] {
+		switch strings.ToLower(parts[0]) {
 		case "e", "element":
 			// Get ID
 			var id int

eod/pages/categories.go

@@ -125,13 +125,23 @@ func (p *Pages) CatHandler(c sevcord.Ctx, params string) {
 		}
 	}
 
+	//get color and image
+	var color int
+	var img string
+	err = p.db.QueryRow("SELECT color, image FROM categories WHERE name=$1 AND guild=$2", parts[len(parts)-1], c.Guild()).Scan(&color, &img)
+
+	if err != nil || color == 0 {
+		color = 10181046 //Purple
+	}
 	// 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(color)
+	if err == nil {
+		embed = embed.Thumbnail(img)
+	}
 	c.Respond(sevcord.NewMessage("").
 		AddEmbed(embed).
 		AddComponentRow(PageSwitchBtns("cat", fmt.Sprintf("%s|%s|%d|%s", parts[1], parts[2], page, parts[4]))...),