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

add a slash before room if there is no other separator

Browse Source
This commit is contained in:
B. Petersen
2020-08-14 00:45:21 +02:00
parent a66d624b87
commit 38a32d176b
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/message.rs
View File

@@ -649,7 +649,18 @@ impl Message {
if instance.contains("$ROOM") { if instance.contains("$ROOM") {
instance.replace("$ROOM", &room) instance.replace("$ROOM", &room)
} else { } else {
format!("{}{}", instance, room) // if there nothing that would separate the room, add a slash as a separator
// this way, urls can be given as "https://meet.jit.si" as well as "https://meet.jit.si/"
let maybe_slash = if instance.ends_with("/")
|| instance.ends_with("?")
|| instance.ends_with("#")
|| instance.ends_with("=")
{
""
} else {
"/"
};
format!("{}{}{}", instance, maybe_slash, room)
} }
} }