tegakituesday/ji-chan
tegakituesday/ji-chan
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

cargo fmt

Browse source
This commit is contained in:
Elnu 2022-11-14 23:05:33 -08:00
parent 9e9eb48025
commit 6aff34ceab
6 changed files with 178 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/utils.rs
View file

@ -1,3 +1,6 @@
use crate::serenity;
use crate::Error;
use crate::{Context, PrefixContext};
use rand::seq::IteratorRandom;
use serde_json::Map;
use serde_json::Value;
@ -9,9 +12,6 @@ use std::fs::OpenOptions;
use std::io::Read;
use std::io::Write;
use std::process::Command;
use crate::serenity;
use crate::Error;
use crate::{Context, PrefixContext};
pub fn get_challenge_number() -> i32 {
let challenge_dir = format!("{}/content/challenges", env::var("HUGO").unwrap());
@ -152,12 +152,7 @@ pub fn set_guild_data(guild_data: Map<String, Value>) {
.unwrap();
}
pub async fn send(
ctx: Context<'_>,
message: &str,
ping: bool,
pin: bool,
) -> Result<(), Error> {
pub async fn send(ctx: Context<'_>, message: &str, ping: bool, pin: bool) -> Result<(), Error> {
let guild_data = get_guild_data();
let mut announcements_count = 0;
for (_guild, data) in guild_data.iter() {
@ -198,13 +193,11 @@ pub async fn send(
}
announcements_count += 1;
}
ctx.say(
format!(
"Announced to {} server{}!",
announcements_count,
if announcements_count == 1 { "" } else { "s" }
),
)
ctx.say(format!(
"Announced to {} server{}!",
announcements_count,
if announcements_count == 1 { "" } else { "s" }
))
.await?;
Ok(())
}
@ -220,13 +213,8 @@ pub fn get_so_diagram(kanji: char) -> String {
)
}
pub async fn display_kanji(
ctx: Context<'_>,
kanji: char,
comment: &str,
) -> Result<(), Error> {
ctx.say(format!("{}{}", kanji, comment))
.await?;
pub async fn display_kanji(ctx: Context<'_>, kanji: char, comment: &str) -> Result<(), Error> {
ctx.say(format!("{}{}", kanji, comment)).await?;
let url = get_so_diagram(kanji);
let client = reqwest::Client::new();
let request = client.head(&url).build().unwrap();
@ -339,8 +327,7 @@ pub async fn random_kanji(
.unwrap();
let list = subcategories[subcategory_key].as_str().unwrap();
let kanji = random_from_string(&list);
display_kanji(ctx, kanji, &format!(", **{}**", subcategory_key))
.await?;
display_kanji(ctx, kanji, &format!(", **{}**", subcategory_key)).await?;
} else if subcategories.contains_key(&subcategory) {
let list = list[&subcategory].as_str().unwrap();
let kanji = random_from_string(&list);