fix(lint): fixed lint 2.0 warnings

Author: trakhimenok

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/bots-go-framework/bots-api-telegram v0.11.1
 	github.com/bots-go-framework/bots-fw v0.56.8
 	github.com/bots-go-framework/bots-fw-store v0.10.0
-	github.com/bots-go-framework/bots-fw-telegram-models v0.3.15
+	github.com/bots-go-framework/bots-fw-telegram-models v0.3.17
 	github.com/dal-go/dalgo v0.18.2
 	github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7
 	github.com/strongo/i18n v0.6.1
@@ -23,7 +23,7 @@ require (
 	github.com/strongo/gamp v0.0.1 // indirect
 	github.com/strongo/random v0.0.1 // indirect
 	github.com/strongo/slice v0.3.1 // indirect
-	github.com/strongo/strongoapp v0.26.6 // indirect
+	github.com/strongo/strongoapp v0.27.0 // indirect
 	github.com/strongo/validation v0.0.7 // indirect
 	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
 )

go.sum

@@ -1,35 +1,15 @@
 github.com/alexsergivan/transliterator v1.0.1 h1:vON2ilWCHjq+S5Y4obhLGhHK4Y1VIhsHEtQlij5d9pI=
 github.com/alexsergivan/transliterator v1.0.1/go.mod h1:0IrumukulURJ4PD0z6UcdJKP2job1DYDhnHAP5y+5pE=
-github.com/bots-go-framework/bots-api-telegram v0.11.0 h1:ataPsrv4xM+ueL+wLeddDCUkq7t3O2Hh5YlKe/nLAX4=
-github.com/bots-go-framework/bots-api-telegram v0.11.0/go.mod h1:aY3y10SeCY4K3pHOrqOxXImjs8CfYD7n71Q5VZXKkJw=
 github.com/bots-go-framework/bots-api-telegram v0.11.1 h1:Zl4bjyRHqp6R9DFSZWPY/V9uFnk1Ij3NX71EHFH6NMg=
 github.com/bots-go-framework/bots-api-telegram v0.11.1/go.mod h1:aY3y10SeCY4K3pHOrqOxXImjs8CfYD7n71Q5VZXKkJw=
-github.com/bots-go-framework/bots-fw v0.56.0 h1:8SwAU6pPy2nGXBbfBZGFnrtmXMKHJW14Zj5n2H67mnw=
-github.com/bots-go-framework/bots-fw v0.56.0/go.mod h1:0jnsvUxO7RiYYaHQ4MIu5xT+YMwMb8LZMcBz/odkPuE=
-github.com/bots-go-framework/bots-fw v0.56.5 h1:3Gg4qzNf2oA5xlSZqbc+mBc+uU0x7ugZmsOqvOOk6SI=
-github.com/bots-go-framework/bots-fw v0.56.5/go.mod h1:ilehI7OfAHMrw3HDtSzEMobPaf6xDR30Bjgpbb2uxYs=
-github.com/bots-go-framework/bots-fw v0.56.6 h1:Q7/097VRvVc09gDtiGvpfGabmOj2wW00LJIipxpEirg=
-github.com/bots-go-framework/bots-fw v0.56.6/go.mod h1:+WvuSWy1AoE/PYudRYbBXZKgA3bhaIjJLNIag4GWDSQ=
 github.com/bots-go-framework/bots-fw v0.56.8 h1:GvI64fbEu1/IzDuC1a4aAbYyfPEKZ7jXcU8HWFcSpjg=
 github.com/bots-go-framework/bots-fw v0.56.8/go.mod h1:ACPz3YEtwvJEPZRLFqFdEKnI1EJcEOthzBquZ25GKn4=
 github.com/bots-go-framework/bots-fw-store v0.10.0 h1:e6bD274mjrHVp+X05/7uqqT3s5xZOqV9divKTaM2W+w=
 github.com/bots-go-framework/bots-fw-store v0.10.0/go.mod h1:7oU4B8j5HuJZM8AftosbyQD+AqckXsDv8eU1auGPzn8=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.12 h1:iyWy6gIa5xwRf62XKfOJncb268DgwkPzNyUIuq/KINY=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.12/go.mod h1:3sKXa5EoYYYqoBp3vA9wbk+0XQC3lfdJXvAKYb7/01Y=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.13 h1:JzuVyBu6cOuwdLy7LITxpcP43DGgNgl5IpoS36IKbCI=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.13/go.mod h1:Mcp5LZBRaS3/y0poKFv+/XHxmQtadNEBr5wOiSGtjgg=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.14 h1:KB3LLxEfhAHl0N+o24IJzXYXYurz0s/FhR7BuBz11D8=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.14/go.mod h1:41yA4PDgUeV9Mm5Q0IjmuC+g1+foL9jt8cJP0mNDEuI=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.15 h1:0SYCSpdYNH7snvSgUiU72Svo/ry6ye4/UBuFTO5CVm8=
-github.com/bots-go-framework/bots-fw-telegram-models v0.3.15/go.mod h1:sEt+3FXTheAf+HVJrnT2iESCKIAwuUCwH+/wjLkwNSk=
+github.com/bots-go-framework/bots-fw-telegram-models v0.3.17 h1:xKqPtFRIv5N9o79qjSImclref+GdZtfFNopE7jnYTt8=
+github.com/bots-go-framework/bots-fw-telegram-models v0.3.17/go.mod h1:tes245Y7+NmNhY5Ja23xbvJMlkwk1u43Cq+sZo6Myig=
 github.com/bots-go-framework/bots-go-core v0.0.3 h1:z3A7DLUgxbHWxvTCGnkHP9WHpTT9xxROEypoqAfvYIQ=
 github.com/bots-go-framework/bots-go-core v0.0.3/go.mod h1:XCn9z4TI8sbgwyus+VDzw7iMY2QCPWEAvl23GMDjeEU=
-github.com/dal-go/dalgo v0.16.1 h1:cr1CefLIEH/Q1jIJuygv5sh02CDKKAqHXDNPOsUUSwE=
-github.com/dal-go/dalgo v0.16.1/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
-github.com/dal-go/dalgo v0.18.0 h1:GAl+WiRg7J2Y3SWaKI12+PgKebA6Z2dZGXyZ3NPktI4=
-github.com/dal-go/dalgo v0.18.0/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
-github.com/dal-go/dalgo v0.18.1 h1:QV4xkjEE5I5PS6ZTKINQhU3+J5loKiCkj/vUmF+8Hd8=
-github.com/dal-go/dalgo v0.18.1/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
 github.com/dal-go/dalgo v0.18.2 h1:KMHfJgkf7wKtyM/VAlg4ZCQa+kFrFdErrgXPCFxPqc4=
 github.com/dal-go/dalgo v0.18.2/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -53,14 +33,8 @@ github.com/strongo/random v0.0.1 h1:OZHJBb/3uEa7OX8L2Dv2pLnSeewRmXMyTACoeto6O8I=
 github.com/strongo/random v0.0.1/go.mod h1:/pSI+SjBNLBkjljNtVdYr6ERddA+LqSa87o0/s+9iuU=
 github.com/strongo/slice v0.3.1 h1:VWkyYBgcVJn6Hs7wYhL9Vxwgb7V3zQAUFTBV9wo5lc4=
 github.com/strongo/slice v0.3.1/go.mod h1:B5ODKCkl0rp2oiG0UBqkN1cCOrSCU2cUuhqCM1sC8r4=
-github.com/strongo/strongoapp v0.26.1 h1:epeqRbW2ynTY0F+3eATO/1XYlhKLyXaHCElvi+5PJIs=
-github.com/strongo/strongoapp v0.26.1/go.mod h1:N7kE2B74xwn0F7FWMwpy6piD+E9iVG6cSV/o1L/8Cfk=
-github.com/strongo/strongoapp v0.26.2 h1:ynxBIYrL1sl+56fNxjgkfQht5rm/ioxe06UQpzSSCcg=
-github.com/strongo/strongoapp v0.26.2/go.mod h1:YFiVxiy78/RQK7ScicbNl6QejWnh8rmDCXbg6qmlqrU=
-github.com/strongo/strongoapp v0.26.3 h1:57MnSiqZPXkllQTTSnSJzZGiFgaAlWw01aQBsoUXCJQ=
-github.com/strongo/strongoapp v0.26.3/go.mod h1:tXScXwuO0aywBKrFc/50ychTQAbbZgDJSWnNnk+h/bo=
-github.com/strongo/strongoapp v0.26.6 h1:NuanIYlDVS/1yho4BqrkbfHtHG1aDYhhKAodL1zGNC8=
-github.com/strongo/strongoapp v0.26.6/go.mod h1:tXScXwuO0aywBKrFc/50ychTQAbbZgDJSWnNnk+h/bo=
+github.com/strongo/strongoapp v0.27.0 h1:nC9rzSSC4e8kyIH57ODLCGInIqLSyTdZe/eSE6xIYmk=
+github.com/strongo/strongoapp v0.27.0/go.mod h1:NpH0QJ0P8VOJpo7mk5leT1f32PKpfbUM39Faz80bloM=
 github.com/strongo/validation v0.0.7 h1:gs6YkwPsYtVsepQaQOB+ZF+T0Gu5+nk4ZMND8F85e+U=
 github.com/strongo/validation v0.0.7/go.mod h1:YUwoPEItLJd/Bc9X1OCUm03ofhvm3kwZvuihU7/jz58=
 github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM=

telegram/tg_webhook_handler.go

@@ -70,7 +70,7 @@ func (h tgWebhookHandler) RegisterHttpHandlers(driver botsfw.WebhookDriver, host
 	if router == nil {
 		panic("router == nil")
 	}
-	h.WebhookHandlerBase.Register(driver, host)
+	h.Register(driver, host)
 
 	pathPrefix = strings.TrimSuffix(pathPrefix, "/")
 	//router.POST(pathPrefix+"/telegram/webhook", h.HandleWebhookRequest) // TODO: Remove obsolete
@@ -136,16 +136,15 @@ func (h tgWebhookHandler) SetWebhook(w http.ResponseWriter, r *http.Request) {
 		"chosen_inline_result",
 		"callback_query",
 	}
-	if response, err := bot.SetWebhook(*webhookConfig); err != nil {
+	var response tgbotapi.APIResponse
+	if response, err = bot.SetWebhook(*webhookConfig); err != nil {
 		logus.Errorf(ctx, "%v", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		if _, err := w.Write([]byte(err.Error())); err != nil {
 			logus.Errorf(ctx, "Failed to write error to response: %v", err)
 		}
-	} else {
-		if _, err := w.Write([]byte(fmt.Sprintf("Webhook set\nErrorCode: %d\nDescription: %v\nContent: %v", response.ErrorCode, response.Description, string(response.Result)))); err != nil {
-			logus.Errorf(ctx, "Failed to write error to response: %v", err)
-		}
+	} else if _, err = fmt.Fprintf(w, "Webhook set\nErrorCode: %d\nDescription: %v\nContent: %v", response.ErrorCode, response.Description, string(response.Result)); err != nil {
+		logus.Errorf(ctx, "Failed to write error to response: %v", err)
 	}
 }
 

telegram/webhook_callbackquery.go

@@ -21,7 +21,7 @@ type TgWebhookCallbackQuery struct { // TODO: make non-exportable
 }
 
 func (whi TgWebhookCallbackQuery) GetChatInstanceID() string {
-	return whi.tgWebhookInput.update.CallbackQuery.ChatInstance
+	return whi.update.CallbackQuery.ChatInstance
 }
 
 func newTelegramWebhookCallbackQuery(input tgWebhookInput) TgWebhookCallbackQuery {