fix minor bug
This commit is contained in:
parent
f98be52f7c
commit
2efba783c4
1 changed files with 17 additions and 11 deletions
|
@ -44,10 +44,13 @@ pub(crate) async fn helpstart(
|
||||||
};
|
};
|
||||||
|
|
||||||
let bots = fetch_all(&ctx.data().clients.local_api_client).await?;
|
let bots = fetch_all(&ctx.data().clients.local_api_client).await?;
|
||||||
let usable = bots.iter().filter(|b| match b.list_type() {
|
let usable = bots
|
||||||
|
.iter()
|
||||||
|
.filter(|b| match b.list_type() {
|
||||||
Whitelist => b.list().iter().any(|w| mc_accounts.contains(w)),
|
Whitelist => b.list().iter().any(|w| mc_accounts.contains(w)),
|
||||||
Blacklist => mc_accounts.iter().any(|m| !b.list().contains(m)),
|
Blacklist => mc_accounts.iter().any(|m| !b.list().contains(m)),
|
||||||
}).collect::<Vec<_>>();
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
let s: String = usable
|
let s: String = usable
|
||||||
.iter()
|
.iter()
|
||||||
|
@ -60,7 +63,7 @@ pub(crate) async fn helpstart(
|
||||||
.filter_map(|b| {
|
.filter_map(|b| {
|
||||||
if !*b.in_party()
|
if !*b.in_party()
|
||||||
&& *b.last_updated()
|
&& *b.last_updated()
|
||||||
< (SystemTime::now().duration_since(UNIX_EPOCH).ok()? - Duration::from_secs(5))
|
> (SystemTime::now().duration_since(UNIX_EPOCH).ok()? - Duration::from_secs(5))
|
||||||
.as_secs_f64()
|
.as_secs_f64()
|
||||||
{
|
{
|
||||||
Some(b.username().as_str())
|
Some(b.username().as_str())
|
||||||
|
@ -85,7 +88,8 @@ pub(crate) async fn helpstart(
|
||||||
|
|
||||||
let reply = CreateReply::default()
|
let reply = CreateReply::default()
|
||||||
.content(format!(
|
.content(format!(
|
||||||
"Bots that are ready for use: {ready}\nBots you can use: {s}\nTotal registered bots: {}",
|
"Bots that are ready for use: {ready}\nBots you can use: {s}\nTotal registered bots: \
|
||||||
|
{}",
|
||||||
bots.len()
|
bots.len()
|
||||||
))
|
))
|
||||||
.ephemeral(ephemeral)
|
.ephemeral(ephemeral)
|
||||||
|
@ -99,11 +103,13 @@ pub(crate) async fn helpstart(
|
||||||
.filter(move |i| i.data.custom_id == bid.to_string())
|
.filter(move |i| i.data.custom_id == bid.to_string())
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
let iter = bots
|
let embed = CreateEmbed::new().fields(bots.iter().filter_map(|b| {
|
||||||
.iter()
|
if b.note().trim().is_empty() || usable.iter().any(|&u| std::ptr::eq(u, b)) {
|
||||||
.skip_while(|&b| b.note().trim().is_empty() || usable.iter().any(|&u| std::ptr::eq(u,b)))
|
None
|
||||||
.map(|b| (b.username(), b.note(), true));
|
} else {
|
||||||
let embed = CreateEmbed::new().fields(iter).title("Notes").description(
|
Some((b.username(), b.note(), true))
|
||||||
|
}
|
||||||
|
})).title("Notes").description(
|
||||||
"Below is the note of each bot that you cannot use. It might help you get whitelisted.",
|
"Below is the note of each bot that you cannot use. It might help you get whitelisted.",
|
||||||
);
|
);
|
||||||
i.create_response(
|
i.create_response(
|
||||||
|
|
Loading…
Add table
Reference in a new issue