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

feat: Put self-name into group invite codes (#7398)

Browse Source 
Fix https://github.com/chatmail/core/issues/7015 by putting the
self-name into invite codes for group and broadcast channels.

The self-name will be truncated to 16 characters.
This commit is contained in:
Hocuri
2025-11-04 23:17:54 +01:00
committed by GitHub
parent ee6b9075aa
commit f04c881b8c
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/securejoin.rs
View File

@@ -62,12 +62,18 @@ fn inviter_progress(
Ok(())
}
/// Shorten name to max. 25 characters.
/// Shorten name to max. `length` characters.
/// This is to not make QR codes or invite links arbitrary long.
fn shorten_name(name: &str) -> String {
if name.chars().count() > 25 {
fn shorten_name(name: &str, length: usize) -> String {
if name.chars().count() > length {
// We use _ rather than ... to avoid dots at the end of the URL, which would confuse linkifiers
format!("{}_", &name.chars().take(24).collect::<String>())
format!(
"{}_",
&name
.chars()
.take(length.saturating_sub(1))
.collect::<String>()
)
} else {
name.to_string()
}
@@ -126,6 +132,11 @@ pub async fn get_securejoin_qr(context: &Context, chat: Option<ChatId>) -> Resul
let self_addr = context.get_primary_self_addr().await?;
let self_addr_urlencoded = utf8_percent_encode(&self_addr, DISALLOWED_CHARACTERS).to_string();
let self_name = context
.get_config(Config::Displayname)
.await?
.unwrap_or_default();
let qr = if let Some(chat) = chat {
if sync_token {
context
@@ -135,27 +146,29 @@ pub async fn get_securejoin_qr(context: &Context, chat: Option<ChatId>) -> Resul
}
let chat_name = chat.get_name();
let chat_name_shortened = shorten_name(chat_name);
let chat_name_shortened = shorten_name(chat_name, 25);
let chat_name_urlencoded = utf8_percent_encode(&chat_name_shortened, DISALLOWED_CHARACTERS)
.to_string()
.replace("%20", "+");
let grpid = &chat.grpid;
let self_name_shortened = shorten_name(&self_name, 16);
let self_name_urlencoded = utf8_percent_encode(&self_name_shortened, DISALLOWED_CHARACTERS)
.to_string()
.replace("%20", "+");
if chat.typ == Chattype::OutBroadcast {
// For historic reansons, broadcasts currently use j instead of i for the invitenumber.
format!(
"https://i.delta.chat/#{fingerprint}&x={grpid}&j={invitenumber}&s={auth}&a={self_addr_urlencoded}&b={chat_name_urlencoded}",
"https://i.delta.chat/#{fingerprint}&x={grpid}&j={invitenumber}&s={auth}&a={self_addr_urlencoded}&n={self_name_urlencoded}&b={chat_name_urlencoded}",
)
} else {
format!(
"https://i.delta.chat/#{fingerprint}&x={grpid}&i={invitenumber}&s={auth}&a={self_addr_urlencoded}&g={chat_name_urlencoded}",
"https://i.delta.chat/#{fingerprint}&x={grpid}&i={invitenumber}&s={auth}&a={self_addr_urlencoded}&n={self_name_urlencoded}&g={chat_name_urlencoded}",
)
}
} else {
let self_name = context
.get_config(Config::Displayname)
.await?
.unwrap_or_default();
let self_name_shortened = shorten_name(&self_name);
let self_name_shortened = shorten_name(&self_name, 25);
let self_name_urlencoded = utf8_percent_encode(&self_name_shortened, DISALLOWED_CHARACTERS)
.to_string()
.replace("%20", "+");