Skip to content

Commit

Permalink
Modify message_token to uint64
Browse files Browse the repository at this point in the history
  • Loading branch information
mileusna committed Jun 20, 2017
1 parent 832368e commit b04b4d7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions message.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type MessageType string
type messageResponse struct {
Status int `json:"status"`
StatusMessage string `json:"status_message"`
MessageToken int64 `json:"message_token"`
MessageToken uint64 `json:"message_token"`
}

// Message interface for all types of viber messages
Expand Down Expand Up @@ -117,7 +117,7 @@ const (

//video, file, location, contact, sticker, carousel content

func parseMsgResponse(b []byte) (token int64, err error) {
func parseMsgResponse(b []byte) (msgToken uint64, err error) {
var resp messageResponse
if err := json.Unmarshal(b, &resp); err != nil {
return 0, err
Expand All @@ -130,7 +130,7 @@ func parseMsgResponse(b []byte) (token int64, err error) {
return resp.MessageToken, nil
}

func (v *Viber) sendMessage(url string, m interface{}) (token int64, err error) {
func (v *Viber) sendMessage(url string, m interface{}) (msgToken uint64, err error) {
b, err := v.PostData(url, m)
if err != nil {
return 0, err
Expand All @@ -149,7 +149,7 @@ func (v *Viber) NewTextMessage(msg string) *TextMessage {
}

// SendTextMessage to reciever, returns message token
func (v *Viber) SendTextMessage(receiver string, msg string) (token int64, err error) {
func (v *Viber) SendTextMessage(receiver string, msg string) (msgToken uint64, err error) {
m := v.NewTextMessage(msg)
m.Receiver = receiver
return v.sendMessage("https://chatapi.viber.com/pa/send_message", m)
Expand All @@ -167,7 +167,7 @@ func (v *Viber) NewURLMessage(msg string, url string) *URLMessage {
}

// SendURLMessage to receiver, return message token
func (v *Viber) SendURLMessage(receiver string, s Sender, msg string, url string) (token int64, err error) {
func (v *Viber) SendURLMessage(receiver string, s Sender, msg string, url string) (msgToken uint64, err error) {
m := v.NewURLMessage(msg, url)
return v.sendMessage("https://chatapi.viber.com/pa/send_message", m)
}
Expand Down Expand Up @@ -265,12 +265,12 @@ func (v *Viber) SendCarousel(receiver string) {

}

func (v *Viber) SendPublicMessage(from string, m Message) (token int64, err error) {
func (v *Viber) SendPublicMessage(from string, m Message) (msgToken uint64, err error) {
m.SetFrom(from)
return v.sendMessage("https://chatapi.viber.com/pa/post", m)
}

func (v *Viber) SendMessage(to string, m Message) (token int64, err error) {
func (v *Viber) SendMessage(to string, m Message) (msgToken uint64, err error) {
m.SetReceiver(to)
return v.sendMessage("https://chatapi.viber.com/pa/send_message", m)
}
Expand Down
14 changes: 7 additions & 7 deletions viber.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ type Sender struct {
Avatar string `json:"avatar,omitempty"`
}

type event struct {
type Event struct {
Event string `json:"event"`
Timestamp Timestamp `json:"timestamp"`
UserID string `json:"user_id"`
MessageToken string `json:"message_token"`
MessageToken uint64 `json:"message_token"`
Descr string `json:"descr"`
}

Expand All @@ -32,10 +32,10 @@ type Viber struct {
Subscribed func(u User, msgToken string, t time.Time)
ConversationStarted func()
Message func()
Unsubscribed func(userID, msgToken string, t time.Time)
Delivered func(userID, msgToken string, t time.Time)
Seen func(userID, msgToken string, t time.Time)
Failed func(userID, msgToken, descr string, t time.Time)
Unsubscribed func(userID string, msgToken uint64, t time.Time)
Delivered func(userID string, msgToken uint64, t time.Time)
Seen func(userID string, msgToken uint64, t time.Time)
Failed func(userID string, msgToken uint64, descr string, t time.Time)
}

func (v *Viber) ServeHTTP(w http.ResponseWriter, r *http.Request) {
Expand All @@ -50,7 +50,7 @@ func (v *Viber) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}

var e event
var e Event
if err := json.Unmarshal(body, &e); err != nil {
//return
}
Expand Down

0 comments on commit b04b4d7

Please sign in to comment.