Merge pull request #28 from tada-team/9015-call-events

9015 fix: set omitempty

call_event.go

@@ -1,18 +1,36 @@
 package tdproto
 
-// Audio call information
+// Call information
 type CallEvent struct {
-	// Call start
-	Start *ISODateTimeString `json:"start"`
+	// Chat or contact id
+	Jid JID `json:"jid"`
+
+	// Call id
+	Uid string `json:"uid"`
+
+	// Call buzzing
+	Buzz bool `json:"buzz,omitempty"`
+
+	// Creation date, iso datetime
+	Created ISODateTimeString `json:"created"`
+
+	// Call start. For direct calls can be empty when buzzing
+	Start ISODateTimeString `json:"start,omitempty"`
 
 	// Call finish
-	Finish *ISODateTimeString `json:"finish"`
+	Finish ISODateTimeString `json:"finish,omitempty"`
 
 	// Call record enabled
 	Audiorecord bool `json:"audiorecord"`
 
 	// Call participants
 	Onliners []CallOnliner `json:"onliners,omitempty"`
+
+	// Version
+	Gentime int64 `json:"gentime"`
+
+	// Deprecated: use gentime or created
+	Timestamp int64 `json:"timestamp"`
 }
 
 // Call participant

client_call_buzz.go

@@ -13,6 +13,6 @@ type clientCallBuzzParams struct {
 	// Chat or contact id
 	Jid JID `json:"jid"`
 
-	// List of call participants
-	Members []JID `json:"members"`
+	// List of call participants. Empty value means all participants in call
+	Members []JID `json:"members,omitempty"`
 }

client_call_leave.go

@@ -13,5 +13,5 @@ type clientCallLeaveParams struct {
 	Jid JID `json:"jid"`
 
 	// Reason, if any
-	Reason string `json:"reason"`
+	Reason string `json:"reason,omitempty"`
 }

client_call_reject.go

@@ -13,5 +13,5 @@ type clientCallRejectParams struct {
 	Jid JID `json:"jid"`
 
 	// Reason, if any
-	Reason string `json:"reason"`
+	Reason string `json:"reason,omitempty"`
 }

client_call_trickle.go

@@ -16,8 +16,8 @@ type clientCallTrickleParams struct {
 	Candidate string `json:"candidate"`
 
 	// SDP mid
-	SdpMid string `json:"sdp_mid"`
+	SdpMid string `json:"sdp_mid,omitempty"`
 
 	// SDP index
-	SdpMlineIndex int `json:"sdp_mline_index"`
+	SdpMlineIndex int `json:"sdp_mline_index,omitempty"`
 }

server_call_answer.go

@@ -23,7 +23,7 @@ type serverCallAnswerParams struct {
 	Jid JID `json:"jid"`
 
 	// List of ICE candidates (when trickle = false)
-	Candidates []serverCallAnswerCandidate `json:"candidates"`
+	Candidates []serverCallAnswerCandidate `json:"candidates,omitempty"`
 
 	// Current call participants
 	Onliners []CallOnliner `json:"onliners,omitempty"`

server_call_state.go

@@ -1,59 +1,15 @@
 package tdproto
 
-import "time"
-
-func NewServerCallState(chat HasJid, startCall, finishCall *time.Time, onliners []CallOnliner, audiorecord, buzz bool, uid string, timestamp int64) (r ServerCallState) {
+func NewServerCallState(callEvent CallEvent) (r ServerCallState) {
 	r.Name = r.GetName()
-	r.Params.Jid = chat.JID()
-	r.Params.Onliners = onliners
-	r.Params.Buzz = buzz
-	r.Params.Uid = uid
-	r.Params.Audiorecord = audiorecord
-	r.Params.Timestamp = timestamp
-
-	if startCall != nil {
-		r.Params.Start = NullableIsoDatetime(startCall)
-	} else {
-		r.Params.Buzz = true
-	}
-
-	if finishCall != nil {
-		r.Params.Finish = NullableIsoDatetime(startCall)
-	}
-
-	return r
+	r.Params = callEvent
+	return
 }
 
-// Call participant number or parameters changed
+// Call information
 type ServerCallState struct {
 	BaseEvent
-	Params serverCallStateParams `json:"params"`
+	Params CallEvent `json:"params"`
 }
 
 func (p ServerCallState) GetName() string { return "server.call.state" }
-
-type serverCallStateParams struct {
-	// Chat or contact id
-	Jid JID `json:"jid"`
-
-	// Call id
-	Uid string `json:"uid"`
-
-	// Call participants
-	Onliners []CallOnliner `json:"onliners,omitempty"`
-
-	// Call start, if any
-	Start *ISODateTimeString `json:"start"`
-
-	// Call finish, if any
-	Finish *ISODateTimeString `json:"finish"`
-
-	// Call record enabled
-	Audiorecord bool `json:"audiorecord"`
-
-	// Call buzzing
-	Buzz bool `json:"buzz,omitempty"`
-
-	// Event start. FIXME: why not gentime?
-	Timestamp int64 `json:"timestamp"`
-}

server_online.go

@@ -44,7 +44,7 @@ type OnlineCall struct {
 	Uid string `json:"uid"`
 
 	// Call start
-	Start *ISODateTimeString `json:"start,omitempty"`
+	Start ISODateTimeString `json:"start,omitempty"`
 
 	// Number participants in call
 	OnlineCount int `json:"online_count,omitempty"`

utils.go

@@ -33,14 +33,6 @@ func IsoDatetime(dt time.Time) string {
 	return strings.Replace(s, "+0000", "Z", 1)
 }
 
-func NullableIsoDatetime(dt *time.Time) *string {
-	if dt == nil {
-		return nil
-	}
-	v := IsoDatetime(*dt)
-	return &v
-}
-
 func ConfirmId() string {
 	return randomSymbols(12, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
 }