Merge pull request #311 from hinoguma/feature/add-webhook-redelivery

add webhook redelivery
line · Apr 29, 2022 · 23b8e0c · 23b8e0c
2 parents f1daf67 + 79aa593
commit 23b8e0c
Show file tree

Hide file tree

Showing 4 changed files with 300 additions and 7 deletions.
diff --git a/linebot/event.go b/linebot/event.go
@@ -189,6 +189,11 @@ const (
 	StickerResourceTypeNameText       StickerResourceType = "CUSTOM"
 )
 
+// DeliveryContext type
+type DeliveryContext struct {
+	IsRedelivery bool `json:"isRedelivery"`
+}
+
 // Event type
 type Event struct {
 	ReplyToken        string
@@ -206,6 +211,8 @@ type Event struct {
 	Members           []*EventSource
 	Unsend            *Unsend
 	VideoPlayComplete *VideoPlayComplete
+	WebhookEventID    string
+	DeliveryContext   DeliveryContext
 }
 
 type rawEvent struct {
@@ -223,6 +230,8 @@ type rawEvent struct {
 	Things            *rawThingsEvent      `json:"things,omitempty"`
 	Unsend            *Unsend              `json:"unsend,omitempty"`
 	VideoPlayComplete *VideoPlayComplete   `json:"videoPlayComplete,omitempty"`
+	WebhookEventID    string               `json:"webhookEventId"`
+	DeliveryContext   DeliveryContext      `json:"deliveryContext"`
 }
 
 type rawMemberEvent struct {
@@ -299,6 +308,8 @@ func (e *Event) MarshalJSON() ([]byte, error) {
 		Postback:          e.Postback,
 		Unsend:            e.Unsend,
 		VideoPlayComplete: e.VideoPlayComplete,
+		WebhookEventID:    e.WebhookEventID,
+		DeliveryContext:   e.DeliveryContext,
 	}
 	if e.Beacon != nil {
 		raw.Beacon = &rawBeaconEvent{
@@ -423,6 +434,8 @@ func (e *Event) UnmarshalJSON(body []byte) (err error) {
 	e.Mode = rawEvent.Mode
 	e.Timestamp = time.Unix(rawEvent.Timestamp/milliSecPerSec, (rawEvent.Timestamp%milliSecPerSec)*nanoSecPerMilliSec).UTC()
 	e.Source = rawEvent.Source
+	e.WebhookEventID = rawEvent.WebhookEventID
+	e.DeliveryContext = rawEvent.DeliveryContext
 
 	switch rawEvent.Type {
 	case EventTypeMessage:

diff --git a/linebot/get_ids_test.go b/linebot/get_ids_test.go
@@ -408,11 +408,11 @@ func TestGetGroupMemberIDsScanner(t *testing.T) {
 	}
 
 	testCases := []struct {
-		FirstResponse   *MemberIDsResponse
+		FirstResponse  *MemberIDsResponse
 		SecondResponse *MemberIDsResponse
 	}{
 		{
-			FirstResponse:   res1,
+			FirstResponse:  res1,
 			SecondResponse: res2,
 		},
 		{
@@ -497,11 +497,11 @@ func TestGetRoomMemberIDsScanner(t *testing.T) {
 	}
 
 	testCases := []struct {
-		FirstResponse   *MemberIDsResponse
+		FirstResponse  *MemberIDsResponse
 		SecondResponse *MemberIDsResponse
 	}{
 		{
-			FirstResponse:   res1,
+			FirstResponse:  res1,
 			SecondResponse: res2,
 		},
 		{

diff --git a/linebot/raw.go b/linebot/raw.go
@@ -27,7 +27,7 @@ func (client *Client) NewRawCall(method string, endpoint string) (*RawCall, erro
 		return nil, err
 	}
 	return &RawCall{
-		c: client,
+		c:   client,
 		req: req,
 	}, nil
 }
@@ -39,7 +39,7 @@ func (client *Client) NewRawCallWithBody(method string, endpoint string, body io
 		return nil, err
 	}
 	return &RawCall{
-		c: client,
+		c:   client,
 		req: req,
 	}, nil
 }
@@ -49,7 +49,7 @@ type RawCall struct {
 	c   *Client
 	ctx context.Context
 
-	req         *http.Request
+	req *http.Request
 }
 
 // AddHeader method