fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api: type GroupServ flags (GroupFlag/GroupFlags via a shared flag_set! macro); delete the stringly apply_flags
All checks were successful
CI / check (push) Successful in 4m0s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-17 18:47:08 +00:00
parent 2a12ebd6e3
commit bc4fada354
No known key found for this signature in database
4 changed files with 121 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/groupserv/src/flags.rs
View file

@ -1,4 +1,4 @@
use echo_api::{apply_flags, Sender, ServiceCtx, Store, GROUP_FLAGS};
use echo_api::{GroupFlags, Sender, ServiceCtx, Store, GROUP_FLAGS};
// FLAGS <!group> [account [+/-flags]]: list, show, or change group-access flags.
// Listing/showing is open; changing needs the founder or the `f` flag.
@ -39,15 +39,16 @@ pub fn handle(me: &str, from: &Sender, name: Option<&str>, target: Option<&str>,
ctx.notice(me, from.uid, format!("\x02{target}\x02 isn't registered."));
return;
};
let updated = match apply_flags(current.as_deref().unwrap_or(""), delta, GROUP_FLAGS) {
let updated = match GroupFlags::parse(current.as_deref().unwrap_or("")).apply_delta(delta) {
Ok(f) => f,
Err(bad) => {
ctx.notice(me, from.uid, format!("\x02{bad}\x02 isn't a valid group flag. Valid: \x02{GROUP_FLAGS}\x02."));
return;
}
};
match db.group_set_flags(name, &canonical, &updated) {
Ok(()) => ctx.notice(me, from.uid, format!("\x02{canonical}\x02 in \x02{name}\x02 now holds \x02{}\x02.", if updated.is_empty() { "(member)" } else { &updated })),
let letters = updated.to_letters();
match db.group_set_flags(name, &canonical, &letters) {
Ok(()) => ctx.notice(me, from.uid, format!("\x02{canonical}\x02 in \x02{name}\x02 now holds \x02{}\x02.", if letters.is_empty() { "(member)" } else { &letters })),
Err(_) => ctx.notice(me, from.uid, "Sorry, that didn't work. Please try again in a moment."),
}
}

8
modules/groupserv/src/lib.rs
View file

@ -85,6 +85,12 @@ fn account<'a>(me: &str, from: &'a Sender, ctx: &mut ServiceCtx) -> Option<&'a s
// Whether `who` may manage `group` (founder, or holds the F/f flag).
fn can_manage(group: &echo_api::GroupView, who: &str) -> bool {
use echo_api::{GroupFlag, GroupFlags};
group.founder.eq_ignore_ascii_case(who)
|| group.members.iter().any(|m| m.account.eq_ignore_ascii_case(who) && (m.flags.contains('F') || m.flags.contains('f')))
|| group.members.iter().any(|m| {
m.account.eq_ignore_ascii_case(who) && {
let f = GroupFlags::parse(&m.flags);
f.has(GroupFlag::Founder) || f.has(GroupFlag::Manage)
}
})
}