Skip to content
This repository was archived by the owner on Jan 1, 2023. It is now read-only.

Commit 036b286

Browse files
committed
Fix styling
1 parent 09dbfd4 commit 036b286

File tree

5 files changed

+73
-71
lines changed

5 files changed

+73
-71
lines changed

actions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ const (
1111
// DeliveryAction means that the event was a previous recipient reading their respective
1212
// messages.
1313
DeliveryAction
14-
// PostBackAction represents post call back
14+
// PostBackAction represents post call back
1515
PostBackAction
1616
)

message.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ type Delivery struct {
3434

3535
// PostBack represents postback callback
3636
type PostBack struct {
37-
// Sender is who the message was sent from.
37+
// Sender is who the message was sent from.
3838
Sender Sender `json:"-"`
3939
// Recipient is who the message was sent to.
4040
Recipient Recipient `json:"-"`
4141
// Time is when the message was sent.
4242
Time time.Time `json:"-"`
43-
// PostBack ID
43+
// PostBack ID
4444
Payload string `json:"payload"`
4545
}
4646

messenger.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type Options struct {
2323
VerifyToken string
2424
// Token is the access token of the Facebook page to send messages from.
2525
Token string
26-
// WebhookURL is where the Messenger client should listen for webhook events.
26+
// WebhookURL is where the Messenger client should listen for webhook events.
2727
WebhookURL string
2828
}
2929

@@ -41,7 +41,7 @@ type Messenger struct {
4141
mux *http.ServeMux
4242
messageHandlers []MessageHandler
4343
deliveryHandlers []DeliveryHandler
44-
postBackHandlers []PostBackHandler
44+
postBackHandlers []PostBackHandler
4545
token string
4646
verifyHandler func(http.ResponseWriter, *http.Request)
4747
}
@@ -143,26 +143,26 @@ func (m *Messenger) dispatch(r Receive) {
143143
}
144144

145145
switch a {
146-
case TextAction:
147-
for _, f := range m.messageHandlers {
148-
message := *info.Message
149-
message.Sender = info.Sender
150-
message.Recipient = info.Recipient
151-
message.Time = time.Unix(info.Timestamp, 0)
152-
f(message, resp)
153-
}
154-
case DeliveryAction:
155-
for _, f := range m.deliveryHandlers {
156-
f(*info.Delivery, resp)
157-
}
158-
case PostBackAction:
159-
for _, f := range m.postBackHandlers {
160-
message := *info.PostBack
161-
message.Sender = info.Sender
162-
message.Recipient = info.Recipient
163-
message.Time = time.Unix(info.Timestamp, 0)
164-
f(message, resp)
165-
}
146+
case TextAction:
147+
for _, f := range m.messageHandlers {
148+
message := *info.Message
149+
message.Sender = info.Sender
150+
message.Recipient = info.Recipient
151+
message.Time = time.Unix(info.Timestamp, 0)
152+
f(message, resp)
153+
}
154+
case DeliveryAction:
155+
for _, f := range m.deliveryHandlers {
156+
f(*info.Delivery, resp)
157+
}
158+
case PostBackAction:
159+
for _, f := range m.postBackHandlers {
160+
message := *info.PostBack
161+
message.Sender = info.Sender
162+
message.Recipient = info.Recipient
163+
message.Time = time.Unix(info.Timestamp, 0)
164+
f(message, resp)
165+
}
166166
}
167167
}
168168
}

receiving.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type MessageInfo struct {
3333
// Delivery is the contents of a message if it is a DeliveryAction.
3434
// Nil if it is not a DeliveryAction.
3535
Delivery *Delivery `json:"delivery"`
36-
36+
3737
PostBack *PostBack `json:"postback"`
3838
}
3939

response.go

+47-45
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,23 @@ func (r *Response) Image(im image.Image) error {
9797
return nil
9898
}
9999

100+
// ButtonTemplate sends a message with the main contents being button elements
100101
func (r *Response) ButtonTemplate(text string, buttons *[]StructuredMessageButton) error {
101-
m := SendStructuredMessage {
102+
m := SendStructuredMessage{
102103
Recipient: r.to,
103-
Message: StructuredMessageData {
104-
Attachment: StructuredMessageAttachment {
105-
Type: "template",
106-
Payload: StructuredMessagePayload {
107-
TemplateType: "button",
108-
Text: text,
109-
Buttons: buttons,
110-
Elements: nil,
111-
},
112-
},
104+
Message: StructuredMessageData{
105+
Attachment: StructuredMessageAttachment{
106+
Type: "template",
107+
Payload: StructuredMessagePayload{
108+
TemplateType: "button",
109+
Text: text,
110+
Buttons: buttons,
111+
Elements: nil,
112+
},
113+
},
113114
},
114115
}
115-
116+
116117
data, err := json.Marshal(m)
117118
if err != nil {
118119
return nil
@@ -130,25 +131,26 @@ func (r *Response) ButtonTemplate(text string, buttons *[]StructuredMessageButto
130131

131132
resp, err := client.Do(req)
132133
defer resp.Body.Close()
133-
134+
134135
return err
135136
}
136137

138+
// GenericTemplate is a message which allows for structural elements to be sent
137139
func (r *Response) GenericTemplate(text string, elements *[]StructuredMessageElement) error {
138-
m := SendStructuredMessage {
140+
m := SendStructuredMessage{
139141
Recipient: r.to,
140-
Message: StructuredMessageData {
141-
Attachment: StructuredMessageAttachment {
142-
Type: "template",
143-
Payload: StructuredMessagePayload {
144-
TemplateType: "generic",
145-
Buttons: nil,
146-
Elements: elements,
147-
},
148-
},
142+
Message: StructuredMessageData{
143+
Attachment: StructuredMessageAttachment{
144+
Type: "template",
145+
Payload: StructuredMessagePayload{
146+
TemplateType: "generic",
147+
Buttons: nil,
148+
Elements: elements,
149+
},
150+
},
149151
},
150152
}
151-
153+
152154
data, err := json.Marshal(m)
153155
if err != nil {
154156
return nil
@@ -166,7 +168,7 @@ func (r *Response) GenericTemplate(text string, elements *[]StructuredMessageEle
166168

167169
resp, err := client.Do(req)
168170
defer resp.Body.Close()
169-
171+
170172
return err
171173
}
172174

@@ -181,45 +183,45 @@ type MessageData struct {
181183
Text string `json:"text,omitempty"`
182184
}
183185

184-
// SendStructuredMessage is a structured message template
186+
// SendStructuredMessage is a structured message template.
185187
type SendStructuredMessage struct {
186-
Recipient Recipient `json:"recipient"`
188+
Recipient Recipient `json:"recipient"`
187189
Message StructuredMessageData `json:"message"`
188190
}
189191

192+
// StructuredMessageData is an attachment sent with a structured message.
190193
type StructuredMessageData struct {
191194
Attachment StructuredMessageAttachment `json:"attachment"`
192195
}
193196

197+
// StructuredMessageAttachment is the attachment of a structured message.
194198
type StructuredMessageAttachment struct {
195-
// Template allways
199+
// Type must be template
196200
Type string `json:"type"`
197201
// Payload is the information for the file which was sent in the attachment.
198202
Payload StructuredMessagePayload `json:"payload"`
199203
}
200204

205+
// StructuredMessagePayload is the actual payload of an attachment
201206
type StructuredMessagePayload struct {
202-
// button, generic, receipt
203-
TemplateType string `json:"template_type"`
204-
Text string `json:"text,omitempty"`
205-
Elements *[]StructuredMessageElement `json:"elements,omitempty"`
206-
Buttons *[]StructuredMessageButton `json:"buttons,omitempty"`
207+
// TemplateType must be button, generic or receipt
208+
TemplateType string `json:"template_type"`
209+
Text string `json:"text,omitempty"`
210+
Elements *[]StructuredMessageElement `json:"elements,omitempty"`
211+
Buttons *[]StructuredMessageButton `json:"buttons,omitempty"`
207212
}
208213

209-
// StructuredMessageElement - Generic Template
214+
// StructuredMessageElement is a response containing structural elements
210215
type StructuredMessageElement struct {
211-
Title string `json:"title"`
212-
ImageURL string `json:"image_url"`
213-
Subtitle string `json:"subtitle"`
214-
Buttons []StructuredMessageButton `json:"buttons"`
216+
Title string `json:"title"`
217+
ImageURL string `json:"image_url"`
218+
Subtitle string `json:"subtitle"`
219+
Buttons []StructuredMessageButton `json:"buttons"`
215220
}
216221

217-
// StructuredMessageButton - Button Template
222+
// StructuredMessageButton is a response containing buttons
218223
type StructuredMessageButton struct {
219-
Type string `json:"type"`
220-
URL string `json:"url"`
221-
Title string `json:"title"`
224+
Type string `json:"type"`
225+
URL string `json:"url"`
226+
Title string `json:"title"`
222227
}
223-
224-
225-

0 commit comments

Comments
 (0)