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

Migrate interpolated service messages to the t! macro (8 modules)

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-19 23:22:56 +00:00
parent b462d37bd5
commit d207c3d60d
No known key found for this signature in database
133 changed files with 782 additions and 702 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/statserv/src/channel.rs
View file

@ -1,4 +1,4 @@
use echo_api::{NetView, Sender, ServiceCtx, Store};
use echo_api::{t, NetView, Sender, ServiceCtx, Store};
// <#channel>: the lines seen in a channel this session and its top talkers.
// Founder-or-admin.
@ -7,15 +7,15 @@ pub fn handle(me: &str, from: &Sender, chan: &str, ctx: &mut ServiceCtx, net: &d
return;
}
let Some((lines, top)) = net.channel_activity(chan) else {
ctx.notice(me, from.uid, format!("No activity recorded for \x02{chan}\x02 yet."));
ctx.notice(me, from.uid, t!(ctx, "No activity recorded for \x02{chan}\x02 yet.", chan = chan));
return;
};
ctx.notice(me, from.uid, format!("\x02{chan}\x02 — \x02{lines}\x02 line(s) seen."));
ctx.notice(me, from.uid, t!(ctx, "\x02{chan}\x02 — \x02{lines}\x02 line(s) seen.", chan = chan, lines = lines));
if top.is_empty() {
return;
}
ctx.notice(me, from.uid, "Top talkers:");
for (i, (nick, count)) in top.iter().enumerate() {
ctx.notice(me, from.uid, format!(" {}. \x02{nick}\x02 — {count}", i + 1));
ctx.notice(me, from.uid, t!(ctx, " {n}. \x02{nick}\x02 — {count}", n = i + 1, nick = nick, count = count));
}
}

4
modules/statserv/src/global.rs
View file

@ -1,4 +1,4 @@
use echo_api::{NetView, Priv, Sender, ServiceCtx, Store};
use echo_api::{t, NetView, Priv, Sender, ServiceCtx, Store};
// SERVER: the shared, cross-service counter registry plus a couple of live
// gauges. Operators only (Priv::Auspex), since it is network-wide.
@ -47,7 +47,7 @@ pub fn handle(me: &str, from: &Sender, ctx: &mut ServiceCtx, net: &dyn NetView,
ctx.notice(me, from.uid, " games:");
header = true;
}
ctx.notice(me, from.uid, format!(" {ty}: {games} games, {} players", players.len()));
ctx.notice(me, from.uid, t!(ctx, " {ty}: {games} games, {n} players", ty = ty, games = games, n = players.len()));
}
}
}

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

@ -3,7 +3,7 @@
//! (a #channel argument, for its founder). `lib.rs` holds the dispatcher; each
//! view lives in its own file.
use echo_api::{HelpEntry, NetView, Priv, Sender, Service, ServiceCtx, Store};
use echo_api::{t, HelpEntry, NetView, Priv, Sender, Service, ServiceCtx, Store};
#[path = "global.rs"]
mod global;
@ -43,7 +43,7 @@ impl Service for StatServ {
Some(cmd) if cmd.eq_ignore_ascii_case("SERVER") || cmd.eq_ignore_ascii_case("GLOBAL") => global::handle(me, from, ctx, net, db),
Some(cmd) if cmd.eq_ignore_ascii_case("HELP") => echo_api::help(me, from, ctx, BLURB, TOPICS, args.get(1).copied()),
None => echo_api::help(me, from, ctx, BLURB, TOPICS, None),
Some(other) => ctx.notice(me, from.uid, format!("I don't know \x02{other}\x02. Try \x02SERVER\x02, a \x02#channel\x02, or \x02HELP\x02.")),
Some(other) => ctx.notice(me, from.uid, t!(ctx, "I don't know \x02{other}\x02. Try \x02SERVER\x02, a \x02#channel\x02, or \x02HELP\x02.", other = other)),
}
}
}
@ -52,11 +52,11 @@ impl Service for StatServ {
// services admin.
fn require_channel_admin(me: &str, from: &Sender, chan: &str, ctx: &mut ServiceCtx, db: &dyn Store) -> bool {
let Some(founder) = db.channel(chan).map(|c| c.founder) else {
ctx.notice(me, from.uid, format!("\x02{chan}\x02 isn't registered."));
ctx.notice(me, from.uid, t!(ctx, "\x02{chan}\x02 isn't registered.", chan = chan));
return false;
};
if from.account != Some(founder.as_str()) && !from.privs.has(Priv::Oper) {
ctx.notice(me, from.uid, format!("Only \x02{chan}\x02's founder can see its stats."));
ctx.notice(me, from.uid, t!(ctx, "Only \x02{chan}\x02's founder can see its stats.", chan = chan));
return false;
}
true