Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 22:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

ignore whitespace in given webrtc_instance

Browse Source
This commit is contained in:
B. Petersen
2020-08-14 11:55:36 +02:00
parent 8159141d44
commit 0208c02ec2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/message.rs
View File

@@ -681,6 +681,7 @@ impl Message {
/// split a webrtc_instance as defined by the corresponding config-value into a type and a url /// split a webrtc_instance as defined by the corresponding config-value into a type and a url
pub fn parse_webrtc_instance(instance: &str) -> (VideochatType, String) { pub fn parse_webrtc_instance(instance: &str) -> (VideochatType, String) {
let instance: String = instance.split_whitespace().collect();
let mut split = instance.splitn(2, ':'); let mut split = instance.splitn(2, ':');
let type_str = split.next().unwrap_or_default().to_lowercase(); let type_str = split.next().unwrap_or_default().to_lowercase();
let url = split.next(); let url = split.next();
@@ -1914,6 +1915,7 @@ mod tests {
#[async_std::test] #[async_std::test]
async fn test_create_webrtc_instance() { async fn test_create_webrtc_instance() {
// webrtc_instance may come from an input field of the ui, be pretty tolerant on input
let instance = Message::create_webrtc_instance("https://meet.jit.si/", "123"); let instance = Message::create_webrtc_instance("https://meet.jit.si/", "123");
assert_eq!(instance, "https://meet.jit.si/123"); assert_eq!(instance, "https://meet.jit.si/123");
@@ -1940,6 +1942,12 @@ mod tests {
let instance = Message::create_webrtc_instance("bla.foo#room=$ROOM&after=cont", "234"); let instance = Message::create_webrtc_instance("bla.foo#room=$ROOM&after=cont", "234");
assert_eq!(instance, "https://bla.foo#room=234&after=cont"); assert_eq!(instance, "https://bla.foo#room=234&after=cont");
let instance = Message::create_webrtc_instance(" meet.jit .si ", "789");
assert_eq!(instance, "https://meet.jit.si/789");
let instance = Message::create_webrtc_instance(" basicwebrtc: basic . stuff\n ", "12345ab");
assert_eq!(instance, "basicwebrtc:https://basic.stuff/12345ab");
} }
#[async_std::test] #[async_std::test]