diff --git a/src/chat.rs b/src/chat.rs index 59afd2918..4e49cb885 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -1638,7 +1638,7 @@ pub async fn send_videochat_invitation(context: &Context, chat_id: ChatId) -> Re }; let mut msg = Message::new(Viewtype::VideochatInvitation); - msg.param.set(Param::WebrtcInstance, &instance); + msg.param.set(Param::WebrtcRoom, &instance); msg.text = Some( context .stock_string_repl_str( diff --git a/src/headerdef.rs b/src/headerdef.rs index 482a47ada..5743351e6 100644 --- a/src/headerdef.rs +++ b/src/headerdef.rs @@ -35,7 +35,7 @@ pub enum HeaderDef { ChatContent, ChatDuration, ChatDispositionNotificationTo, - ChatWebrtcInstance, + ChatWebrtcRoom, Autocrypt, AutocryptSetupMessage, SecureJoin, diff --git a/src/message.rs b/src/message.rs index b4859c6ef..38e90b3dc 100644 --- a/src/message.rs +++ b/src/message.rs @@ -655,7 +655,7 @@ impl Message { pub fn get_videochat_url(&self) -> Option { if self.viewtype == Viewtype::VideochatInvitation { - if let Some(instance) = self.param.get(Param::WebrtcInstance) { + if let Some(instance) = self.param.get(Param::WebrtcRoom) { return Some(Message::parse_webrtc_instance(instance).1); } } @@ -664,7 +664,7 @@ impl Message { pub fn get_videochat_type(&self) -> Option { if self.viewtype == Viewtype::VideochatInvitation { - if let Some(instance) = self.param.get(Param::WebrtcInstance) { + if let Some(instance) = self.param.get(Param::WebrtcRoom) { return Some(Message::parse_webrtc_instance(instance).0); } } diff --git a/src/mimefactory.rs b/src/mimefactory.rs index 7558ef523..f17659e5d 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -881,10 +881,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> { "videochat-invitation".into(), )); protected_headers.push(Header::new( - "Chat-Webrtc-Instance".into(), + "Chat-Webrtc-Room".into(), self.msg .param - .get(Param::WebrtcInstance) + .get(Param::WebrtcRoom) .unwrap_or_default() .into(), )); diff --git a/src/mimeparser.rs b/src/mimeparser.rs index 7dc3e5766..1cfd71a38 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -245,11 +245,11 @@ impl MimeMessage { fn parse_videochat_headers(&mut self) { if let Some(value) = self.get(HeaderDef::ChatContent).cloned() { if value == "videochat-invitation" { - let instance = self.get(HeaderDef::ChatWebrtcInstance).cloned(); + let instance = self.get(HeaderDef::ChatWebrtcRoom).cloned(); if let Some(part) = self.parts.first_mut() { part.typ = Viewtype::VideochatInvitation; part.param - .set(Param::WebrtcInstance, instance.unwrap_or_default()); + .set(Param::WebrtcRoom, instance.unwrap_or_default()); } } } @@ -1474,7 +1474,7 @@ mod tests { assert_eq!( mimeparser.parts[0] .param - .get(Param::WebrtcInstance) + .get(Param::WebrtcRoom) .unwrap_or_default(), "https://example.org/p2p/?roomname=6HiduoAn4xN" ); diff --git a/src/param.rs b/src/param.rs index f3681ebc3..4d87202eb 100644 --- a/src/param.rs +++ b/src/param.rs @@ -69,7 +69,7 @@ pub enum Param { AttachGroupImage = b'A', /// For Messages - WebrtcInstance = b'V', + WebrtcRoom = b'V', /// For Messages: space-separated list of messaged IDs of forwarded copies. ///