Added !s command and fixed links bug

cardsinfo/names.go

@@ -5,6 +5,18 @@ import (
 	"strings"
 )
 
+func GetNameByCardId(set string, number string) string {
+	/*
+		From https://docs.magicthegathering.io/#api_v1cards_list
+
+		Number: This is a string, not an integer,
+		because some cards have letters in their numbers.
+	*/
+	cards, _, _ := mtg.NewQuery().Where(mtg.CardSet, set).Where(mtg.CardNumber, number).PageS(1, 1)
+	name := fetchCardNameFromSlice(cards)
+	return name
+}
+
 func GetOriginalName(name string) string {
 	langs := []string{"Russian", ""}
 	channel := make(chan string)
@@ -22,12 +34,16 @@ func GetOriginalName(name string) string {
 
 func getOriginalNameFromLang(name, lang string, channel chan string) {
 	cards, _, _ := mtg.NewQuery().Where(mtg.CardLanguage, lang).Where(mtg.CardName, name).PageS(1, 1)
+	originalName := fetchCardNameFromSlice(cards)
+	channel <- originalName
+}
+
+func fetchCardNameFromSlice(cards []*mtg.Card) string {
 	if len(cards) > 0 {
 		name := getCardName(cards[0])
-		channel <- name
+		return name
-	} else {
-		channel <- ""
 	}
+	return ""
 }
 
 func getCardName(card *mtg.Card) string {

cardsinfo/scgprices.go

@@ -110,7 +110,7 @@ func parsePrice(container *html.Node) float64 {
 }
 
 func parseLink(container *html.Node) string {
-	linkNodes := htmlquery.Find(container, "//td[contains(@class, 'search_results_2')]/a")
+	linkNodes := htmlquery.Find(container, "//td[contains(@class, 'search_results_1')]/b/a")
 	if len(linkNodes) == 0 {
 		return ""
 	}

main.go

@@ -11,5 +11,5 @@ func main() {
 	rand.Seed(time.Now().UTC().UnixNano())
 	r := gin.Default()
 	r.POST("callback/message", vk.HandleMessage)
-	r.Run(":8000")
+	r.Run(":80")
 }

tests/names_test.go

@@ -35,3 +35,13 @@ func TestGetCardByStringWrong(t *testing.T) {
 	name := cardsinfo.GetOriginalName("fwijefiwjfew")
 	assert.Equal(t, "", name)
 }
+
+func TestGetCardBySetId(t *testing.T) {
+	name := cardsinfo.GetNameByCardId("DOM", "207")
+	assert.Equal(t, "Teferi, Hero of Dominaria", name)
+}
+
+func TestGetCardBySetIdWrong(t *testing.T) {
+	name := cardsinfo.GetNameByCardId("DOM", "1207")
+	assert.Equal(t, "", name)
+}

vk/handlers.go

@@ -1,9 +1,11 @@
 package vk
 
 import (
+	"errors"
 	"github.com/flygrounder/mtg-price-vk/cardsinfo"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"strings"
 )
 
 const CARDSLIMIT = 8
@@ -18,16 +20,23 @@ func min(a, b int) int {
 func HandleMessage(c *gin.Context) {
 	var req MessageRequest
 	c.BindJSON(&req)
-	if (req.Type == "confirmation") && (req.GroupId == GROUPID) {
-		c.String(http.StatusOK, CONFIRMATION_STRING)
-		return
-	}
-	defer c.String(http.StatusOK, "ok")
 	if req.Secret != SECRET_KEY {
 		return
 	}
-	cardName := cardsinfo.GetOriginalName(req.Object.Body)
+	switch req.Type {
-	if cardName == "" {
+	case "confirmation":
+		handleConfirmation(c, &req)
+	case "message_new":
+		handleSearch(c, &req)
+	}
+}
+
+func handleSearch(c *gin.Context, req *MessageRequest) {
+	defer c.String(http.StatusOK, "ok")
+	cardName, err := getCardNameByCommand(req.Object.Body)
+	if err != nil {
+		Message(req.Object.UserId, "Некорректная команда")
+	} else if cardName == "" {
 		Message(req.Object.UserId, "Карта не найдена")
 	} else {
 		prices, _ := cardsinfo.GetSCGPrices(cardName)
@@ -37,3 +46,26 @@ func HandleMessage(c *gin.Context) {
 		Message(req.Object.UserId, priceInfo)
 	}
 }
+
+func getCardNameByCommand(command string) (string, error) {
+	var name string
+	switch {
+	case strings.HasPrefix(command, "!s"):
+		split := strings.Split(command, " ")
+		if len(split) < 3 {
+			return "", errors.New("wrong command")
+		}
+		set := split[1]
+		number := split[2]
+		name = cardsinfo.GetNameByCardId(set, number)
+	default:
+		name = cardsinfo.GetOriginalName(command)
+	}
+	return name, nil
+}
+
+func handleConfirmation(c *gin.Context, req *MessageRequest) {
+	if (req.Type == "confirmation") && (req.GroupId == GROUPID) {
+		c.String(http.StatusOK, CONFIRMATION_STRING)
+	}
+}