Refactoring codes for more tg message types

datasources/cjlookup/query.go

@@ -1,13 +1,16 @@
 package cjlookup
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/tgckpg/golifehk/query"
 )
 
-func Query(lang string, message string) query.IQueryResult {
+func Query(q query.QueryMessage) query.IQueryResult {
+
+	lang := q.Lang
+	message := q.Text
+
 	var qResults *query.QueryObject
 	var err error
 	var searchables *[]query.ISearchable
@@ -17,9 +20,12 @@ func Query(lang string, message string) query.IQueryResult {
 
 	// Only look up jyut ping
 	if !strings.HasPrefix(messageU, "JP ") {
-		err = fmt.Errorf("Invalid query")
+		qr.ResultType = "IGNORE"
+		goto qrReturn
 	}
 
+	qr.isConsumed = true
+
 	if err != nil {
 		qr.Error = err
 		goto qrReturn
@@ -28,7 +34,7 @@ func Query(lang string, message string) query.IQueryResult {
 	messageU = messageU[3:]
 	searchables, err = getSearchables()
 
-	qResults, err = query.Parse(messageU, searchables)
+	qResults, err = query.MatchKeys(messageU, searchables)
 
 	qr.Query = qResults