mirror of
https://git.asonix.dog/asonix/relay.git
synced 2024-11-20 00:21:03 +00:00
Prioritize open-reg servers on index page
This commit is contained in:
parent
b901322706
commit
a0dc917dfe
1 changed files with 23 additions and 2 deletions
|
@ -1,19 +1,40 @@
|
|||
use crate::{
|
||||
config::Config,
|
||||
data::State,
|
||||
data::{Node, State},
|
||||
error::{Error, ErrorKind},
|
||||
};
|
||||
use actix_web::{web, HttpResponse};
|
||||
use rand::{seq::SliceRandom, thread_rng};
|
||||
use std::io::BufWriter;
|
||||
|
||||
fn open_reg(node: &Node) -> bool {
|
||||
node.instance
|
||||
.as_ref()
|
||||
.map(|i| i.reg)
|
||||
.or_else(|| node.info.as_ref().map(|i| i.reg))
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
#[tracing::instrument(name = "Index", skip(config, state))]
|
||||
pub(crate) async fn route(
|
||||
state: web::Data<State>,
|
||||
config: web::Data<Config>,
|
||||
) -> Result<HttpResponse, Error> {
|
||||
let mut nodes = state.node_cache().nodes().await?;
|
||||
nodes.shuffle(&mut thread_rng());
|
||||
|
||||
nodes.sort_by(|lhs, rhs| match (open_reg(lhs), open_reg(rhs)) {
|
||||
(true, true) | (false, false) => std::cmp::Ordering::Equal,
|
||||
(true, false) => std::cmp::Ordering::Less,
|
||||
(false, true) => std::cmp::Ordering::Greater,
|
||||
});
|
||||
|
||||
if let Some((i, _)) = nodes.iter().enumerate().find(|(_, node)| !open_reg(node)) {
|
||||
nodes[..i].shuffle(&mut thread_rng());
|
||||
nodes[i..].shuffle(&mut thread_rng());
|
||||
} else {
|
||||
nodes.shuffle(&mut thread_rng());
|
||||
}
|
||||
|
||||
let mut buf = BufWriter::new(Vec::new());
|
||||
|
||||
crate::templates::index(&mut buf, &nodes, &config)?;
|
||||
|
|
Loading…
Reference in a new issue