From 2acae3302293be86f8a630da65a185b0fd750af6 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 3 Jun 2022 16:11:35 +0100 Subject: [PATCH 01/14] add fields for MSC3401 --- event/voip.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/event/voip.go b/event/voip.go index 28f56c95..f145832b 100644 --- a/event/voip.go +++ b/event/voip.go @@ -75,12 +75,16 @@ func (cv *CallVersion) Int() (int, error) { type BaseCallEventContent struct { CallID string `json:"call_id"` + ConfID string `json:"conf_id"` + DestSessionID string `json:"dest_session_id"` PartyID string `json:"party_id"` Version CallVersion `json:"version"` } type CallInviteEventContent struct { BaseCallEventContent + DeviceID string `json:"device_id"` + SenderSessionID string `json:"sender_session_id"` Lifetime int `json:"lifetime"` Offer CallData `json:"offer"` } From 80ebd9db03f4eee6b24e585d63322d8a90cd232b Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 3 Jun 2022 19:15:55 +0100 Subject: [PATCH 02/14] type device_id correctly in CallInviteEventContent --- event/voip.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/event/voip.go b/event/voip.go index f145832b..4ab77a66 100644 --- a/event/voip.go +++ b/event/voip.go @@ -10,6 +10,8 @@ import ( "encoding/json" "fmt" "strconv" + + "maunium.net/go/mautrix/id" ) type CallHangupReason string @@ -83,7 +85,7 @@ type BaseCallEventContent struct { type CallInviteEventContent struct { BaseCallEventContent - DeviceID string `json:"device_id"` + DeviceID id.DeviceID `json:"device_id"` SenderSessionID string `json:"sender_session_id"` Lifetime int `json:"lifetime"` Offer CallData `json:"offer"` From ca7dec7571da95f2673db4e9ab30a781bac7d709 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 5 Jun 2022 17:29:44 +0100 Subject: [PATCH 03/14] apparently all MSC3401 events have deviceID & sessionIDs --- event/voip.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/event/voip.go b/event/voip.go index 4ab77a66..e228bc93 100644 --- a/event/voip.go +++ b/event/voip.go @@ -78,15 +78,15 @@ func (cv *CallVersion) Int() (int, error) { type BaseCallEventContent struct { CallID string `json:"call_id"` ConfID string `json:"conf_id"` - DestSessionID string `json:"dest_session_id"` PartyID string `json:"party_id"` Version CallVersion `json:"version"` + DeviceID id.DeviceID `json:"device_id"` + DestSessionID string `json:"dest_session_id"` + SenderSessionID string `json:"sender_session_id"` } type CallInviteEventContent struct { BaseCallEventContent - DeviceID id.DeviceID `json:"device_id"` - SenderSessionID string `json:"sender_session_id"` Lifetime int `json:"lifetime"` Offer CallData `json:"offer"` } From d9f57be480aa142f7987d16981d3bb8345069046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 8 Aug 2022 13:07:36 +0200 Subject: [PATCH 04/14] Fix `SessionID` typing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/event/voip.go b/event/voip.go index e228bc93..845ad237 100644 --- a/event/voip.go +++ b/event/voip.go @@ -76,13 +76,13 @@ func (cv *CallVersion) Int() (int, error) { } type BaseCallEventContent struct { - CallID string `json:"call_id"` - ConfID string `json:"conf_id"` - PartyID string `json:"party_id"` - Version CallVersion `json:"version"` - DeviceID id.DeviceID `json:"device_id"` - DestSessionID string `json:"dest_session_id"` - SenderSessionID string `json:"sender_session_id"` + CallID string `json:"call_id"` + ConfID string `json:"conf_id"` + PartyID string `json:"party_id"` + Version CallVersion `json:"version"` + DeviceID id.DeviceID `json:"device_id"` + DestSessionID id.SessionID `json:"dest_session_id"` + SenderSessionID id.SessionID `json:"sender_session_id"` } type CallInviteEventContent struct { From 1ab8080b8c1983e803a901973f3fe035ed2a9fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Thu, 11 Aug 2022 21:16:20 +0200 Subject: [PATCH 05/14] Add `CallHangupKeepAliveTimeout` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/event/voip.go b/event/voip.go index 845ad237..9278b790 100644 --- a/event/voip.go +++ b/event/voip.go @@ -17,11 +17,12 @@ import ( type CallHangupReason string const ( - CallHangupICEFailed CallHangupReason = "ice_failed" - CallHangupInviteTimeout CallHangupReason = "invite_timeout" - CallHangupUserHangup CallHangupReason = "user_hangup" - CallHangupUserMediaFailed CallHangupReason = "user_media_failed" - CallHangupUnknownError CallHangupReason = "unknown_error" + CallHangupICEFailed CallHangupReason = "ice_failed" + CallHangupInviteTimeout CallHangupReason = "invite_timeout" + CallHangupUserHangup CallHangupReason = "user_hangup" + CallHangupUserMediaFailed CallHangupReason = "user_media_failed" + CallHangupKeepAliveTimeout CallHangupReason = "keep_alive_timeout" + CallHangupUnknownError CallHangupReason = "unknown_error" ) type CallDataType string From c1a4814c47de7aad357e5ca49c426e0c0f86baa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 13 Aug 2022 14:33:25 +0200 Subject: [PATCH 06/14] Add `sdp_stream_metadata` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/event/voip.go b/event/voip.go index 9278b790..f02feb67 100644 --- a/event/voip.go +++ b/event/voip.go @@ -86,10 +86,33 @@ type BaseCallEventContent struct { SenderSessionID id.SessionID `json:"sender_session_id"` } +type CallSDPStreamMetadataPurpose string + +const ( + Usermedia CallSDPStreamMetadataPurpose = "m.usermedia" + Screenshare CallSDPStreamMetadataPurpose = "m.screenshare" +) + +type CallSDPStreamMetadataTrack struct{} + +type CallSDPStreamMetadataTracks map[string]CallSDPStreamMetadataTrack + +type CallSDPStreamMetadataObject struct { + UserID id.UserID `json:"user_id"` + DeviceID id.DeviceID `json:"device_id"` + Purpose CallSDPStreamMetadataPurpose `json:"purpose"` + AudioMuted bool `json:"audio_muted"` + VideoMuted bool `json:"video_muted"` + Tracks CallSDPStreamMetadataTracks `json:"tracks"` +} + +type CallSDPStreamMetadata map[string]CallSDPStreamMetadataObject + type CallInviteEventContent struct { BaseCallEventContent - Lifetime int `json:"lifetime"` - Offer CallData `json:"offer"` + Lifetime int `json:"lifetime"` + Offer CallData `json:"offer"` + SDPStreamMetadata CallSDPStreamMetadata `json:"org.matrix.msc3077.sdp_stream_metadata"` } type CallCandidatesEventContent struct { @@ -103,7 +126,8 @@ type CallRejectEventContent struct { type CallAnswerEventContent struct { BaseCallEventContent - Answer CallData `json:"answer"` + Answer CallData `json:"answer"` + SDPStreamMetadata CallSDPStreamMetadata `json:"org.matrix.msc3077.sdp_stream_metadata"` } type CallSelectAnswerEventContent struct { @@ -113,8 +137,9 @@ type CallSelectAnswerEventContent struct { type CallNegotiateEventContent struct { BaseCallEventContent - Lifetime int `json:"lifetime"` - Description CallData `json:"description"` + Lifetime int `json:"lifetime"` + Description CallData `json:"description"` + SDPStreamMetadata CallSDPStreamMetadata `json:"org.matrix.msc3077.sdp_stream_metadata"` } type CallHangupEventContent struct { From 10bb9e7550fd969dde430246fa1d4d680a975dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 13 Aug 2022 17:42:45 +0200 Subject: [PATCH 07/14] Add new types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/event/voip.go b/event/voip.go index f02feb67..da4d1a28 100644 --- a/event/voip.go +++ b/event/voip.go @@ -146,3 +146,28 @@ type CallHangupEventContent struct { BaseCallEventContent Reason CallHangupReason `json:"reason"` } + +type SFUTrackDescription struct { + StreamID string `json:"stream_id"` + TrackID string `json:"track_id"` +} + +type SFUMessageOperation string + +const ( + SFUOperationSelect SFUMessageOperation = "select" + SFUOperationMetadata SFUMessageOperation = "metadata" + SFUOperationPublish SFUMessageOperation = "publish" + SFUOperationUnpublish SFUMessageOperation = "unpublish" + SFUOperationAlive SFUMessageOperation = "alive" + SFUOperationOffer SFUMessageOperation = "offer" + SFUOperationAnswer SFUMessageOperation = "answer" +) + +type SFUMessage struct { + Op SFUMessageOperation `json:"op"` + Start []SFUTrackDescription `json:"start,omitempty"` + Stop []SFUTrackDescription `json:"stop,omitempty"` + SDP string `json:"sdp,omitempty"` + Metadata CallSDPStreamMetadata `json:"metadata,omitempty"` +} From 601715cde25410dcc76f6c2f6fd62823d3325e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 13 Aug 2022 17:50:56 +0200 Subject: [PATCH 08/14] Add types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/content.go | 8 ++++++++ event/type.go | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/event/content.go b/event/content.go index a588b447..e09a0b65 100644 --- a/event/content.go +++ b/event/content.go @@ -86,6 +86,14 @@ var TypeMap = map[Type]reflect.Type{ CallSelectAnswer: reflect.TypeOf(CallSelectAnswerEventContent{}), CallNegotiate: reflect.TypeOf(CallNegotiateEventContent{}), CallHangup: reflect.TypeOf(CallHangupEventContent{}), + + ToDeviceCallInvite: reflect.TypeOf(CallInviteEventContent{}), + ToDeviceCallCandidates: reflect.TypeOf(CallCandidatesEventContent{}), + ToDeviceCallAnswer: reflect.TypeOf(CallAnswerEventContent{}), + ToDeviceCallReject: reflect.TypeOf(CallRejectEventContent{}), + ToDeviceCallSelectAnswer: reflect.TypeOf(CallSelectAnswerEventContent{}), + ToDeviceCallNegotiate: reflect.TypeOf(CallNegotiateEventContent{}), + ToDeviceCallHangup: reflect.TypeOf(CallHangupEventContent{}), } // Content stores the content of a Matrix event. diff --git a/event/type.go b/event/type.go index 38a5b06c..74b19d1f 100644 --- a/event/type.go +++ b/event/type.go @@ -251,4 +251,12 @@ var ( ToDeviceVerificationCancel = Type{"m.key.verification.cancel", ToDeviceEventType} ToDeviceOrgMatrixRoomKeyWithheld = Type{"org.matrix.room_key.withheld", ToDeviceEventType} + + ToDeviceCallInvite = Type{"m.call.invite", ToDeviceEventType} + ToDeviceCallCandidates = Type{"m.call.candidates", ToDeviceEventType} + ToDeviceCallAnswer = Type{"m.call.answer", ToDeviceEventType} + ToDeviceCallReject = Type{"m.call.reject", ToDeviceEventType} + ToDeviceCallSelectAnswer = Type{"m.call.select_answer", ToDeviceEventType} + ToDeviceCallNegotiate = Type{"m.call.negotiate", ToDeviceEventType} + ToDeviceCallHangup = Type{"m.call.hangup", ToDeviceEventType} ) From e67ce908f6add49310433afa62d7a46b5e5684b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 15 Aug 2022 17:05:19 +0200 Subject: [PATCH 09/14] Add UsernameFragment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/event/voip.go b/event/voip.go index da4d1a28..a2369929 100644 --- a/event/voip.go +++ b/event/voip.go @@ -38,9 +38,10 @@ type CallData struct { } type CallCandidate struct { - Candidate string `json:"candidate"` - SDPMLineIndex int `json:"sdpMLineIndex"` - SDPMID string `json:"sdpMid"` + Candidate string `json:"candidate"` + SDPMLineIndex int `json:"sdpMLineIndex"` + SDPMID string `json:"sdpMid"` + UsernameFragment string `json:"usernameFragment,omitempty"` } type CallVersion string From 160ea900a20bf7d657db3cc9b02a8ce12a8c26b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Wed, 17 Aug 2022 16:28:16 +0200 Subject: [PATCH 10/14] Remove UsernameFragment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/event/voip.go b/event/voip.go index a2369929..da4d1a28 100644 --- a/event/voip.go +++ b/event/voip.go @@ -38,10 +38,9 @@ type CallData struct { } type CallCandidate struct { - Candidate string `json:"candidate"` - SDPMLineIndex int `json:"sdpMLineIndex"` - SDPMID string `json:"sdpMid"` - UsernameFragment string `json:"usernameFragment,omitempty"` + Candidate string `json:"candidate"` + SDPMLineIndex int `json:"sdpMLineIndex"` + SDPMID string `json:"sdpMid"` } type CallVersion string From 8d4de1f225012c46d022f51add76cccefee431c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 4 Sep 2022 10:41:33 +0200 Subject: [PATCH 11/14] Add `Kind`, `Width` and `Height` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/event/voip.go b/event/voip.go index da4d1a28..c1857e20 100644 --- a/event/voip.go +++ b/event/voip.go @@ -93,7 +93,11 @@ const ( Screenshare CallSDPStreamMetadataPurpose = "m.screenshare" ) -type CallSDPStreamMetadataTrack struct{} +type CallSDPStreamMetadataTrack struct { + Kind string `json:"kind,omitempty"` + Width int `json:"width,omitempty"` + Height int `json:"height,omitempty"` +} type CallSDPStreamMetadataTracks map[string]CallSDPStreamMetadataTrack @@ -150,6 +154,8 @@ type CallHangupEventContent struct { type SFUTrackDescription struct { StreamID string `json:"stream_id"` TrackID string `json:"track_id"` + Width int `json:"width,omitempty"` + Height int `json:"height,omitempty"` } type SFUMessageOperation string From bd593dd0204bde7bab7c2666f3949bcfe2b7ff37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 10 Dec 2022 14:59:32 +0100 Subject: [PATCH 12/14] Change event shape to match MSC3898 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/content.go | 41 +++++++++++++++++++++++++++++++++++++++++ event/type.go | 17 +++++++++++++++++ event/voip.go | 32 +++++++++++++++----------------- 3 files changed, 73 insertions(+), 17 deletions(-) diff --git a/event/content.go b/event/content.go index 3acf336c..fe58fe39 100644 --- a/event/content.go +++ b/event/content.go @@ -95,6 +95,12 @@ var TypeMap = map[Type]reflect.Type{ ToDeviceCallSelectAnswer: reflect.TypeOf(CallSelectAnswerEventContent{}), ToDeviceCallNegotiate: reflect.TypeOf(CallNegotiateEventContent{}), ToDeviceCallHangup: reflect.TypeOf(CallHangupEventContent{}), + + FocusCallTrackSubscription: reflect.TypeOf(FocusCallTrackSubscriptionEventContent{}), + FocusCallNegotiate: reflect.TypeOf(FocusCallNegotiateEventContent{}), + FocusCallSDPStreamMetadataChanged: reflect.TypeOf(FocusCallSDPStreamMetadataChangedEventContent{}), + FocusCallPing: reflect.TypeOf(FocusCallPingEventContent{}), + FocusCallPong: reflect.TypeOf(FocusCallPongEventContent{}), } // Content stores the content of a Matrix event. @@ -504,6 +510,41 @@ func (content *Content) AsCallHangup() *CallHangupEventContent { } return casted } +func (content *Content) AsFocusCallTrackSubscription() *FocusCallTrackSubscriptionEventContent { + casted, ok := content.Parsed.(*FocusCallTrackSubscriptionEventContent) + if !ok { + return &FocusCallTrackSubscriptionEventContent{} + } + return casted +} +func (content *Content) AsFocusCallNegotiate() *FocusCallNegotiateEventContent { + casted, ok := content.Parsed.(*FocusCallNegotiateEventContent) + if !ok { + return &FocusCallNegotiateEventContent{} + } + return casted +} +func (content *Content) AsFocusCallSDPStreamMetadataChanged() *FocusCallSDPStreamMetadataChangedEventContent { + casted, ok := content.Parsed.(*FocusCallSDPStreamMetadataChangedEventContent) + if !ok { + return &FocusCallSDPStreamMetadataChangedEventContent{} + } + return casted +} +func (content *Content) AsFocusCallPing() *FocusCallPingEventContent { + casted, ok := content.Parsed.(*FocusCallPingEventContent) + if !ok { + return &FocusCallPingEventContent{} + } + return casted +} +func (content *Content) AsFocusCallPong() *FocusCallPongEventContent { + casted, ok := content.Parsed.(*FocusCallPongEventContent) + if !ok { + return &FocusCallPongEventContent{} + } + return casted +} func (content *Content) AsModPolicy() *ModPolicyContent { casted, ok := content.Parsed.(*ModPolicyContent) if !ok { diff --git a/event/type.go b/event/type.go index 46625463..4388fdce 100644 --- a/event/type.go +++ b/event/type.go @@ -33,6 +33,8 @@ func (tc TypeClass) Name() string { return "account data" case ToDeviceEventType: return "to-device" + case FocusEventType: + return "focus" default: return "unknown" } @@ -51,6 +53,8 @@ const ( AccountDataEventType // Device-to-device events ToDeviceEventType + // Focus events + FocusEventType ) type Type struct { @@ -80,6 +84,10 @@ func (et *Type) IsToDevice() bool { return et.Class == ToDeviceEventType } +func (et *Type) IsFocus() bool { + return et.Class == FocusEventType +} + func (et *Type) IsInRoomVerification() bool { switch et.Type { case InRoomVerificationStart.Type, InRoomVerificationReady.Type, InRoomVerificationAccept.Type, @@ -262,3 +270,12 @@ var ( ToDeviceCallNegotiate = Type{"m.call.negotiate", ToDeviceEventType} ToDeviceCallHangup = Type{"m.call.hangup", ToDeviceEventType} ) + +// Focus events +var ( + FocusCallTrackSubscription = Type{"m.call.track_subscription", FocusEventType} + FocusCallNegotiate = Type{"m.call.negotiate", FocusEventType} + FocusCallSDPStreamMetadataChanged = Type{"m.call.sdp_stream_metadata_changed", FocusEventType} + FocusCallPing = Type{"m.call.ping", FocusEventType} + FocusCallPong = Type{"m.call.pong", FocusEventType} +) diff --git a/event/voip.go b/event/voip.go index c1857e20..082f6aef 100644 --- a/event/voip.go +++ b/event/voip.go @@ -151,29 +151,27 @@ type CallHangupEventContent struct { Reason CallHangupReason `json:"reason"` } -type SFUTrackDescription struct { +type FocusTrackDescription struct { StreamID string `json:"stream_id"` TrackID string `json:"track_id"` Width int `json:"width,omitempty"` Height int `json:"height,omitempty"` } -type SFUMessageOperation string +type FocusCallTrackSubscriptionEventContent struct { + Subscribe []FocusTrackDescription `json:"subscribe"` + Unsubscribe []FocusTrackDescription `json:"unsubscribe"` +} -const ( - SFUOperationSelect SFUMessageOperation = "select" - SFUOperationMetadata SFUMessageOperation = "metadata" - SFUOperationPublish SFUMessageOperation = "publish" - SFUOperationUnpublish SFUMessageOperation = "unpublish" - SFUOperationAlive SFUMessageOperation = "alive" - SFUOperationOffer SFUMessageOperation = "offer" - SFUOperationAnswer SFUMessageOperation = "answer" -) +type FocusCallNegotiateEventContent struct { + Description CallData `json:"description"` + SDPStreamMetadata CallSDPStreamMetadata `json:"m.sdp_stream_metadata"` +} -type SFUMessage struct { - Op SFUMessageOperation `json:"op"` - Start []SFUTrackDescription `json:"start,omitempty"` - Stop []SFUTrackDescription `json:"stop,omitempty"` - SDP string `json:"sdp,omitempty"` - Metadata CallSDPStreamMetadata `json:"metadata,omitempty"` +type FocusCallSDPStreamMetadataChangedEventContent struct { + SDPStreamMetadata CallSDPStreamMetadata `json:"m.sdp_stream_metadata"` } + +type FocusCallPingEventContent struct{} + +type FocusCallPongEventContent struct{} From 3c0407890bd8c3b84470bcc9f90bf9f4e5bbb4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 13 Dec 2022 10:43:10 +0100 Subject: [PATCH 13/14] Fix `sdp_steam_metadata` key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/voip.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/event/voip.go b/event/voip.go index 082f6aef..5ea4529b 100644 --- a/event/voip.go +++ b/event/voip.go @@ -165,11 +165,11 @@ type FocusCallTrackSubscriptionEventContent struct { type FocusCallNegotiateEventContent struct { Description CallData `json:"description"` - SDPStreamMetadata CallSDPStreamMetadata `json:"m.sdp_stream_metadata"` + SDPStreamMetadata CallSDPStreamMetadata `json:"sdp_stream_metadata"` } type FocusCallSDPStreamMetadataChangedEventContent struct { - SDPStreamMetadata CallSDPStreamMetadata `json:"m.sdp_stream_metadata"` + SDPStreamMetadata CallSDPStreamMetadata `json:"sdp_stream_metadata"` } type FocusCallPingEventContent struct{} From 43c13b5162160589c98c0f1edb6f107515575454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 13 Dec 2022 10:43:44 +0100 Subject: [PATCH 14/14] Add focus events go `GuessClass()` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- event/type.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/event/type.go b/event/type.go index 4388fdce..72cd1624 100644 --- a/event/type.go +++ b/event/type.go @@ -132,6 +132,9 @@ func (et *Type) GuessClass() TypeClass { CallInvite.Type, CallCandidates.Type, CallAnswer.Type, CallReject.Type, CallSelectAnswer.Type, CallNegotiate.Type, CallHangup.Type, BeeperMessageStatus.Type: return MessageEventType + case FocusCallTrackSubscription.Type, FocusCallNegotiate.Type, FocusCallSDPStreamMetadataChanged.Type, FocusCallPing.Type, + FocusCallPong.Type: + return FocusEventType case ToDeviceRoomKey.Type, ToDeviceRoomKeyRequest.Type, ToDeviceForwardedRoomKey.Type, ToDeviceRoomKeyWithheld.Type: return ToDeviceEventType default: