From af9b0f2d8f12ae9bd532128eaacd96c6a5a180a4 Mon Sep 17 00:00:00 2001 From: sugyan Date: Mon, 18 Mar 2019 16:27:57 +0900 Subject: [PATCH 1/2] Tweak event.go --- linebot/event.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linebot/event.go b/linebot/event.go index 0d5c8fae..644b4507 100644 --- a/linebot/event.go +++ b/linebot/event.go @@ -119,12 +119,12 @@ type Event struct { Timestamp time.Time Source *EventSource Message Message - Joined *Members `json:"joined"` - Left *Members `json:"left"` + Joined *Members + Left *Members Postback *Postback Beacon *Beacon AccountLink *AccountLink - Things *Things `json:"things"` + Things *Things Members []*EventSource } @@ -139,7 +139,7 @@ type rawEvent struct { AccountLink *rawAccountLinkEvent `json:"link,omitempty"` Joined *rawMemberEvent `json:"joined,omitempty"` Left *rawMemberEvent `json:"left,omitempty"` - Things *Things `json:"things,omitempty"` + *Things `json:"things,omitempty"` } type rawMemberEvent struct { From 4681ae71845ccce6a918424c7c1cd7128deecdfc Mon Sep 17 00:00:00 2001 From: sugyan Date: Tue, 26 Mar 2019 18:33:07 +0900 Subject: [PATCH 2/2] Avoid using embedded field --- linebot/event.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linebot/event.go b/linebot/event.go index 644b4507..2c894f2a 100644 --- a/linebot/event.go +++ b/linebot/event.go @@ -129,17 +129,17 @@ type Event struct { } type rawEvent struct { - ReplyToken string `json:"replyToken,omitempty"` - Type EventType `json:"type"` - Timestamp int64 `json:"timestamp"` - Source *EventSource `json:"source"` - Message *rawEventMessage `json:"message,omitempty"` - *Postback `json:"postback,omitempty"` + ReplyToken string `json:"replyToken,omitempty"` + Type EventType `json:"type"` + Timestamp int64 `json:"timestamp"` + Source *EventSource `json:"source"` + Message *rawEventMessage `json:"message,omitempty"` + Postback *Postback `json:"postback,omitempty"` Beacon *rawBeaconEvent `json:"beacon,omitempty"` AccountLink *rawAccountLinkEvent `json:"link,omitempty"` Joined *rawMemberEvent `json:"joined,omitempty"` Left *rawMemberEvent `json:"left,omitempty"` - *Things `json:"things,omitempty"` + Things *Things `json:"things,omitempty"` } type rawMemberEvent struct {