Merge pull request 'bugfix: truncate usernames on invite codes to 32 characters' (#2) from bugfix/evie/T148 into develop

Reviewed-on: #2
This commit is contained in:
husky 2025-03-10 20:43:08 -07:00
commit 5ecfca061f

View file

@ -343,14 +343,45 @@ pub async fn admin_invitecode(
}
let active_codes = match list_invite_codes(nats.clone(), token.clone(), false).await {
Ok(v) => v,
Ok(mut v) => {
for v in &mut v {
if let Some(used_by) = &v.used_by {
if used_by.len() > 32 {
v.used_by = Some(format!("{}...", &used_by[0..32]));
}
}
if v.creator.len() > 32 {
v.creator = format!("{}...", &v.creator[0..32]);
}
}
v
},
Err(e) => {
return e.into_response();
}
};
let used_codes = match list_invite_codes(nats.clone(), token.clone(), true).await {
Ok(v) => v.into_iter().map(|mut v| if v.used_at.is_none() { v.used_at = Some(String::from("unset")); v } else { v }).collect(),
Ok(v) => v.into_iter().map(|mut v| {
if let Some(used_by) = &v.used_by {
if used_by.len() > 32 {
v.used_by = Some(format!("{}...", &used_by[0..32]));
}
}
if v.creator.len() > 32 {
v.creator = format!("{}...", &v.creator[0..32]);
}
if v.used_at.is_none() {
v.used_at = Some(String::from("unset"));
v
} else {
v
}
}).collect(),
Err(e) => {
return e.into_response();
}