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

infoserv: type the news kind as an enum at the store boundary
All checks were successful
CI / check (push) Successful in 3m53s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-17 13:53:53 +00:00
parent ee95225eaf
commit 7a5f1502a4
No known key found for this signature in database
11 changed files with 49 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/engine/mod.rs
View file

@ -10,7 +10,7 @@ use base64::{engine::general_purpose::STANDARD, Engine as _};
use tokio::sync::mpsc;
use crate::proto::{AuthThen, NetAction, NetEvent, RegReply};
use db::{Db, LogEntry, RegError};
use db::{Db, LogEntry, NewsKind, RegError};
use scram::Verifier;
use echo_api::Privs;
use service::{Sender, Service, ServiceCtx};
@ -754,7 +754,7 @@ impl Engine {
// The news items of `kind` as server-sourced notices to `uid`, each tagged
// with `label` so it reads as an announcement. Empty if we have no SID yet.
fn news_notices(&self, kind: &str, label: &str, uid: &str) -> Vec<NetAction> {
fn news_notices(&self, kind: NewsKind, label: &str, uid: &str) -> Vec<NetAction> {
if self.sid.is_empty() {
return Vec::new();
}
@ -1100,7 +1100,7 @@ impl Engine {
// Greet with the logon news, and — separately — prompt-then-
// enforce if they arrived on a registered nick they aren't
// identified to.
let mut out = self.news_notices("logon", "News", &uid);
let mut out = self.news_notices(NewsKind::Logon, "News", &uid);
out.extend(self.enforce_registered_nick(&uid, &arriving_nick));
// A user already logged in the moment they connect (SASL during
// registration) never ran the IDENTIFY path, so give them their
@ -1446,7 +1446,7 @@ impl Engine {
self.db.mark_account_seen(value, self.now_secs());
// An operator logging in is shown the staff (oper) news.
if self.oper_privs(value).any() {
for note in self.news_notices("oper", "Staff News", target) {
for note in self.news_notices(NewsKind::Oper, "Staff News", target) {
self.emit_irc(note);
}
}