.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Lint code with golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50.1
+          version: v1.42.1
           only-new-issues: true
   tests:
     name: Tests

.golangci.yml

@@ -6,33 +6,20 @@ output:
   format: colored-line-number
   sort-results: true
 
-# Linters below do not support go1.18 yet because of generics.
-# See https://github.com/golangci/golangci-lint/issues/2649
-#    - bodyclose
-#    - sqlclosecheck
-
 linters:
   disable-all: true
   enable:
-    - paralleltest
+    - deadcode
-    - tparallel
-    - asciicheck
-    - asasalint
-    - varnamelen
-    - reassign
-    - nilnil
-    - nilerr
-    - nakedret
-    - goprintffuncname
-    - typecheck
-    - errchkjson
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
+    - structcheck
     - unused
     - unparam
+    - varcheck
+    - bodyclose
     - dogsled
     - dupl
     - errorlint
@@ -47,13 +34,14 @@ linters:
     - goimports
     - revive
     - gosec
+    - ifshort
     - lll
     - makezero
     - misspell
     - nestif
     - prealloc
     - predeclared
-    - exportloopref
+    - sqlclosecheck
     - unconvert
     - whitespace
 
@@ -80,6 +68,7 @@ linters-settings:
       - unmarshal
       - unreachable
       - unsafeptr
+      - unused
     settings:
       printf:
         funcs:
@@ -138,48 +127,42 @@ linters-settings:
     threshold: 200
   errorlint:
     errorf: true
-    asserts: false
-    comparison: false
   exhaustive:
     check-generated: false
     default-signifies-exhaustive: false
   funlen:
-    lines: 90
+    lines: 60
     statements: 40
   gocognit:
     min-complexity: 25
   gocyclo:
     min-complexity: 25
   goimports:
-    local-prefixes: github.com/retailcrm/messenger
+    local-prefixes: github.com/retailcrm/mg-transport-core
   lll:
     line-length: 120
   misspell:
     locale: US
   nestif:
-    min-complexity: 4
+    min-complexity: 6
   whitespace:
     multi-if: false
     multi-func: false
-  varnamelen:
+
-    max-distance: 10
-    ignore-map-index-ok: true
-    ignore-type-assert-ok: true
-    ignore-chan-recv-ok: true
-    ignore-decls:
-      - t *testing.T
-      - e error
-      - i int
 issues:
   exclude-rules:
     - path: _test\.go
       linters:
         - lll
+        - errorlint
+        - bodyclose
         - errcheck
+        - sqlclosecheck
         - misspell
         - ineffassign
         - whitespace
         - makezero
+        - ifshort
         - errcheck
         - funlen
         - goconst
@@ -187,8 +170,6 @@ issues:
         - gocyclo
         - godot
         - unused
-        - errchkjson
-        - varnamelen
     - path: \.go
       text: "Error return value of `io.WriteString` is not checked"
   exclude-use-default: true
@@ -202,4 +183,4 @@ severity:
   case-sensitive: false
 
 service:
-  golangci-lint-version: 1.50.x
+  golangci-lint-version: 1.36.x

go.mod

@@ -1,11 +1,8 @@
 module github.com/retailcrm/messenger
 
-require (
-	github.com/stretchr/testify v1.2.2
-	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
-)
-
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.2.2
+	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
 )

message.go

@@ -81,7 +81,7 @@ type IGMessageReaction struct {
 	// Mid is a message ID.
 	Mid string `json:"mid"`
 	// Action can be {react|unreact}
-	Action ReactionAction `json:"action"`
+	Action string `json:"action"`
 	// Reaction is a reaction name. Optional.
 	Reaction string `json:"reaction,omitempty"`
 	// Emoji is optional.
@@ -94,10 +94,8 @@ type IGMessageProduct struct {
 	ID string `json:"id,omitempty"`
 }
 
-// IGMessageReferral represents Instagram message referral with ad data and product ID.
+// IGMessageReferral represents Instagram message referral with product ID.
 type IGMessageReferral struct {
-	// Ad data
-	Referral
 	// Product data.
 	Product IGMessageProduct `json:"product,omitempty"`
 }

messenger.go

@@ -517,20 +517,6 @@ func (m *Messenger) SenderAction(to Recipient, action SenderAction) (QueryRespon
 	return response.SenderAction(action)
 }
 
-func (m *Messenger) InstagramReaction(
-	to Recipient,
-	mid string,
-	action ReactionAction,
-	reaction ...string,
-) (QueryResponse, error) {
-	response := &Response{
-		token:          m.token,
-		to:             to,
-		sendAPIVersion: m.sendAPIVersion,
-	}
-	return response.InstagramReaction(mid, action, reaction...)
-}
-
 // classify determines what type of message a webhook event is.
 func (m *Messenger) classify(info MessageInfo) Action {
 	if info.Message != nil {

receiving.go

@@ -35,8 +35,6 @@ type MessageInfo struct {
 	// Delivery is the contents of a message if it is a DeliveryAction.
 	// Nil if it is not a DeliveryAction.
 	Delivery *Delivery `json:"delivery"`
-	// Reaction represents reaction to Instagram message.
-	Reaction *IGMessageReaction `json:"reaction,omitempty"`
 
 	PostBack *PostBack `json:"postback"`
 
@@ -84,8 +82,6 @@ type Referral struct {
 	AdID string `json:"ad_id,omitempty"`
 	// The data containing information about the CTM ad, the user initiated the thread from.
 	AdsContextData AdsContextData `json:"ads_context_data,omitempty"`
-	// URI of the site from which the message was sent to the Facebook chat plugin.
-	RefererURI string `json:"referer_uri,omitempty"`
 }
 
 // AdsContextData represents data containing information about the CTM ad, the user initiated the thread from.

response.go

@@ -182,7 +182,7 @@ func (r *Response) Image(im image.Image) (QueryResponse, error) {
 		return qr, err
 	}
 
-	return r.AttachmentData(ImageAttachment, "meme.jpg", "image/jpeg", imageBytes)
+	return r.AttachmentData(ImageAttachment, "meme.jpg", imageBytes)
 }
 
 // Attachment sends an image, sound, video or a regular file to a chat.
@@ -228,14 +228,15 @@ func createFormFile(filename string, w *multipart.Writer, contentType string) (i
 }
 
 // AttachmentData sends an image, sound, video or a regular file to a chat via an io.Reader.
-func (r *Response) AttachmentData(
+func (r *Response) AttachmentData(dataType AttachmentType, filename string, filedata io.Reader) (QueryResponse, error) {
-	dataType AttachmentType, filename string, contentType string, filedata io.Reader) (QueryResponse, error) {
 	var qr QueryResponse
 
 	filedataBytes, err := ioutil.ReadAll(filedata)
 	if err != nil {
 		return qr, err
 	}
+	contentType := http.DetectContentType(filedataBytes[:512])
+	fmt.Println("Content-type detected:", contentType)
 
 	var body bytes.Buffer
 	multipartWriter := multipart.NewWriter(&body)
@@ -360,21 +361,6 @@ func (r *Response) SenderAction(action SenderAction) (QueryResponse, error) {
 	return r.DispatchMessage(&m)
 }
 
-// InstagramReaction sends an info about Instagram reaction.
-func (r *Response) InstagramReaction(mid string, action ReactionAction, reaction ...string) (QueryResponse, error) {
-	m := SendInstagramReaction{
-		Recipient:    r.to,
-		SenderAction: action,
-		Payload: SenderInstagramReactionPayload{
-			MessageID: mid,
-		},
-	}
-	if len(reaction) > 0 {
-		m.Payload.Reaction = reaction[0]
-	}
-	return r.DispatchMessage(&m)
-}
-
 // DispatchMessage posts the message to messenger, return the error if there's any.
 func (r *Response) DispatchMessage(m interface{}) (QueryResponse, error) {
 	var res QueryResponse
@@ -564,26 +550,3 @@ type SendSenderAction struct {
 	Recipient    Recipient    `json:"recipient"`
 	SenderAction SenderAction `json:"sender_action"`
 }
-
-// ReactionAction contains info about reaction action type.
-type ReactionAction string
-
-const (
-	// ReactionActionReact is used when user added a reaction.
-	ReactionActionReact ReactionAction = "react"
-	// ReactionActionUnReact is used when user removed a reaction.
-	ReactionActionUnReact ReactionAction = "unreact"
-)
-
-// SendInstagramReaction is the information about sender action.
-type SendInstagramReaction struct {
-	Recipient    Recipient                      `json:"recipient"`
-	SenderAction ReactionAction                 `json:"sender_action"`
-	Payload      SenderInstagramReactionPayload `json:"payload"`
-}
-
-// SenderInstagramReactionPayload contains target message ID and reaction name.
-type SenderInstagramReactionPayload struct {
-	MessageID string `json:"message_id"`
-	Reaction  string `json:"reaction"`
-}