From da60c15f4478169674bad4399a7bb4b81a910246 Mon Sep 17 00:00:00 2001 From: Hamcha Date: Mon, 17 Sep 2018 15:52:18 +0200 Subject: [PATCH] Let's try something --- main.go | 96 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/main.go b/main.go index c102565..503e298 100644 --- a/main.go +++ b/main.go @@ -51,56 +51,54 @@ func webhook(update tg.APIUpdate) { return } - go func() { - query := update.Inline.Query - offset, _ := strconv.Atoi(update.Inline.Offset) - results, err := scryfallSearch(query, offset) - if err != nil { - fmt.Println(err) - // DO SOMETHING - return - } + query := update.Inline.Query + offset, _ := strconv.Atoi(update.Inline.Offset) + results, err := scryfallSearch(query, offset) + if err != nil { + fmt.Println(err) + // DO SOMETHING + return + } - nextcard := "" - if results.HasMore { - nextcard = strconv.Itoa(offset + len(results.Data)) - } - photos := make([]tg.APIInlineQueryResultPhoto, len(results.Data)) - for i, card := range results.Data { - caption := fmt.Sprintf("EDHREC rank: #%d - cardmarket: € %s", card.EdhrecRank, card.Eur) - photos[i] = tg.APIInlineQueryResultPhoto{ - Type: "photo", - ResultID: card.ID, - PhotoURL: card.ImageUris.Large, - ThumbURL: card.ImageUris.Normal, - Title: card.Name, - Caption: caption, - ReplyMarkup: &tg.APIInlineKeyboardMarkup{ - InlineKeyboard: [][]tg.APIInlineKeyboardButton{{ - { - Text: "Scryfall", - URL: card.ScryfallURI, - }, { - Text: "EDHREC", - URL: card.RelatedUris.Edhrec, - }, { - Text: "MCM", - URL: card.PurchaseUris.Magiccardmarket, - }, - }}, - }, - } + nextcard := "" + if results.HasMore { + nextcard = strconv.Itoa(offset + len(results.Data)) + } + photos := make([]tg.APIInlineQueryResultPhoto, len(results.Data)) + for i, card := range results.Data { + caption := fmt.Sprintf("EDHREC rank: #%d - cardmarket: € %s", card.EdhrecRank, card.Eur) + photos[i] = tg.APIInlineQueryResultPhoto{ + Type: "photo", + ResultID: card.ID, + PhotoURL: card.ImageUris.Large, + ThumbURL: card.ImageUris.Normal, + Title: card.Name, + Caption: caption, + ReplyMarkup: &tg.APIInlineKeyboardMarkup{ + InlineKeyboard: [][]tg.APIInlineKeyboardButton{{ + { + Text: "Scryfall", + URL: card.ScryfallURI, + }, { + Text: "EDHREC", + URL: card.RelatedUris.Edhrec, + }, { + Text: "MCM", + URL: card.PurchaseUris.Magiccardmarket, + }, + }}, + }, } + } - err = api.AnswerInlineQuery(tg.InlineQueryResponse{ - QueryID: update.Inline.QueryID, - Results: photos, - NextOffset: nextcard, - }) - if err != nil { - fmt.Println(err) - // DO SOMETHING - return - } - }() + err = api.AnswerInlineQuery(tg.InlineQueryResponse{ + QueryID: update.Inline.QueryID, + Results: photos, + NextOffset: nextcard, + }) + if err != nil { + fmt.Println(err) + // DO SOMETHING + return + } }