Skip to content

Commit f0550dd

Browse files
committed
style: use tabs over spaces
1 parent f2979d4 commit f0550dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1157
-1154
lines changed

.rustfmt.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hard_tabs = true

build.rs

+33-33
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ include!("src/tags.rs");
88
/// generate the ChoiceParameter enum and tag data we will use in the `tag` command
99
#[allow(dead_code)]
1010
fn main() {
11-
let out_dir = env::var_os("OUT_DIR").unwrap();
12-
let generated = Path::new(&out_dir).join("generated.rs");
11+
let out_dir = env::var_os("OUT_DIR").unwrap();
12+
let generated = Path::new(&out_dir).join("generated.rs");
1313

14-
let tag_files: Vec<String> = fs::read_dir(TAG_DIR)
15-
.unwrap()
16-
.map(|f| f.unwrap().file_name().to_string_lossy().to_string())
17-
.collect();
14+
let tag_files: Vec<String> = fs::read_dir(TAG_DIR)
15+
.unwrap()
16+
.map(|f| f.unwrap().file_name().to_string_lossy().to_string())
17+
.collect();
1818

19-
let tags: Vec<Tag> = tag_files
19+
let tags: Vec<Tag> = tag_files
2020
.clone()
2121
.into_iter()
2222
.map(|name| {
@@ -45,23 +45,23 @@ fn main() {
4545
})
4646
.collect();
4747

48-
let formatted_names: Vec<String> = tags
49-
.iter()
50-
.map(|t| t.file_name.replace(".md", "").replace('-', "_"))
51-
.collect();
48+
let formatted_names: Vec<String> = tags
49+
.iter()
50+
.map(|t| t.file_name.replace(".md", "").replace('-', "_"))
51+
.collect();
5252

53-
let tag_choice = format!(
54-
r#"
53+
let tag_choice = format!(
54+
r#"
5555
#[allow(non_camel_case_types, clippy::upper_case_acronyms)]
5656
#[derive(Clone, Debug, poise::ChoiceParameter)]
5757
pub enum TagChoice {{
5858
{}
5959
}}"#,
60-
formatted_names.join(",\n")
61-
);
60+
formatted_names.join(",\n")
61+
);
6262

63-
let to_str = format!(
64-
r#"
63+
let to_str = format!(
64+
r#"
6565
impl TagChoice {{
6666
fn as_str(&self) -> &str {{
6767
match &self {{
@@ -70,22 +70,22 @@ fn main() {
7070
}}
7171
}}
7272
"#,
73-
formatted_names
74-
.iter()
75-
.map(|n| {
76-
let file_name = n.replace('_', "-") + ".md";
77-
format!("Self::{n} => \"{file_name}\",")
78-
})
79-
.collect::<Vec<String>>()
80-
.join("\n")
81-
);
73+
formatted_names
74+
.iter()
75+
.map(|n| {
76+
let file_name = n.replace('_', "-") + ".md";
77+
format!("Self::{n} => \"{file_name}\",")
78+
})
79+
.collect::<Vec<String>>()
80+
.join("\n")
81+
);
8282

83-
let contents = Vec::from([tag_choice, to_str]).join("\n\n");
83+
let contents = Vec::from([tag_choice, to_str]).join("\n\n");
8484

85-
fs::write(generated, contents).unwrap();
86-
println!(
87-
"cargo:rustc-env=TAGS={}",
88-
// make sure we can deserialize with env! at runtime
89-
serde_json::to_string(&tags).unwrap()
90-
);
85+
fs::write(generated, contents).unwrap();
86+
println!(
87+
"cargo:rustc-env=TAGS={}",
88+
// make sure we can deserialize with env! at runtime
89+
serde_json::to_string(&tags).unwrap()
90+
);
9191
}

src/api/dadjoke.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ use reqwest::StatusCode;
77
const DADJOKE: &str = "https://icanhazdadjoke.com";
88

99
pub async fn get_joke() -> Result<String> {
10-
let req = REQWEST_CLIENT.get(DADJOKE).build()?;
10+
let req = REQWEST_CLIENT.get(DADJOKE).build()?;
1111

12-
debug!("Making request to {}", req.url());
13-
let resp = REQWEST_CLIENT.execute(req).await?;
14-
let status = resp.status();
12+
debug!("Making request to {}", req.url());
13+
let resp = REQWEST_CLIENT.execute(req).await?;
14+
let status = resp.status();
1515

16-
if let StatusCode::OK = status {
17-
Ok(resp.text().await?)
18-
} else {
19-
Err(eyre!("Couldn't get a joke!"))
20-
}
16+
if let StatusCode::OK = status {
17+
Ok(resp.text().await?)
18+
} else {
19+
Err(eyre!("Couldn't get a joke!"))
20+
}
2121
}

src/api/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ pub mod prism_meta;
66
pub mod rory;
77

88
pub static USER_AGENT: Lazy<String> = Lazy::new(|| {
9-
let version = option_env!("CARGO_PKG_VERSION").unwrap_or("development");
9+
let version = option_env!("CARGO_PKG_VERSION").unwrap_or("development");
1010

11-
format!("refraction/{version}")
11+
format!("refraction/{version}")
1212
});
1313

1414
pub static REQWEST_CLIENT: Lazy<reqwest::Client> = Lazy::new(|| {
15-
reqwest::Client::builder()
16-
.user_agent(USER_AGENT.to_string())
17-
.build()
18-
.unwrap_or_default()
15+
reqwest::Client::builder()
16+
.user_agent(USER_AGENT.to_string())
17+
.build()
18+
.unwrap_or_default()
1919
});

src/api/pluralkit.rs

+17-15
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,32 @@ use serde::{Deserialize, Serialize};
88

99
#[derive(Clone, Debug, Serialize, Deserialize)]
1010
pub struct PluralKitMessage {
11-
pub sender: String,
11+
pub sender: String,
1212
}
1313

1414
const PLURAL_KIT: &str = "https://api.pluralkit.me/v2";
1515
const MESSAGES_ENDPOINT: &str = "/messages";
1616

1717
pub async fn get_sender(message_id: MessageId) -> Result<UserId> {
18-
let req = REQWEST_CLIENT
19-
.get(format!("{PLURAL_KIT}{MESSAGES_ENDPOINT}/{message_id}"))
20-
.build()?;
18+
let req = REQWEST_CLIENT
19+
.get(format!("{PLURAL_KIT}{MESSAGES_ENDPOINT}/{message_id}"))
20+
.build()?;
2121

22-
debug!("Making request to {}", req.url());
23-
let resp = REQWEST_CLIENT.execute(req).await?;
24-
let status = resp.status();
22+
debug!("Making request to {}", req.url());
23+
let resp = REQWEST_CLIENT.execute(req).await?;
24+
let status = resp.status();
2525

26-
if let StatusCode::OK = status {
27-
let data = resp.json::<PluralKitMessage>().await?;
28-
let id: u64 = data.sender.parse().wrap_err_with(|| format!("Couldn't parse response from PluralKit as a UserId! Here's the response:\n{data:#?}"))?;
29-
let sender = UserId::from(id);
26+
if let StatusCode::OK = status {
27+
let data = resp.json::<PluralKitMessage>().await?;
28+
let id: u64 = data.sender.parse().wrap_err_with(|| {
29+
format!("Couldn't parse response from PluralKit as a UserId! Here's the response:\n{data:#?}")
30+
})?;
31+
let sender = UserId::from(id);
3032

31-
Ok(sender)
32-
} else {
33-
Err(eyre!(
33+
Ok(sender)
34+
} else {
35+
Err(eyre!(
3436
"Failed to get PluralKit message information from {PLURAL_KIT}{MESSAGES_ENDPOINT}/{message_id} with {status}",
3537
))
36-
}
38+
}
3739
}

src/api/prism_meta.rs

+27-27
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ use serde::{Deserialize, Serialize};
88
#[derive(Serialize, Deserialize)]
99
#[serde(rename_all = "camelCase")]
1010
pub struct MinecraftPackageJson {
11-
pub format_version: u8,
12-
pub name: String,
13-
pub recommended: Vec<String>,
14-
pub uid: String,
11+
pub format_version: u8,
12+
pub name: String,
13+
pub recommended: Vec<String>,
14+
pub uid: String,
1515
}
1616

1717
const PRISM_META: &str = "https://meta.prismlauncher.org/v1";
1818
const MINECRAFT_PACKAGEJSON_ENDPOINT: &str = "/net.minecraft/package.json";
1919

2020
pub async fn get_latest_minecraft_version() -> Result<String> {
21-
let req = REQWEST_CLIENT
22-
.get(format!("{PRISM_META}{MINECRAFT_PACKAGEJSON_ENDPOINT}"))
23-
.build()?;
24-
25-
debug!("Making request to {}", req.url());
26-
let resp = REQWEST_CLIENT.execute(req).await?;
27-
let status = resp.status();
28-
29-
if let StatusCode::OK = status {
30-
let data = resp
31-
.json::<MinecraftPackageJson>()
32-
.await
33-
.wrap_err_with(|| "Couldn't parse Minecraft versions!")?;
34-
35-
let version = data
36-
.recommended
37-
.first()
38-
.ok_or_else(|| eyre!("Couldn't find latest version of Minecraft!"))?;
39-
40-
Ok(version.clone())
41-
} else {
42-
Err(eyre!(
21+
let req = REQWEST_CLIENT
22+
.get(format!("{PRISM_META}{MINECRAFT_PACKAGEJSON_ENDPOINT}"))
23+
.build()?;
24+
25+
debug!("Making request to {}", req.url());
26+
let resp = REQWEST_CLIENT.execute(req).await?;
27+
let status = resp.status();
28+
29+
if let StatusCode::OK = status {
30+
let data = resp
31+
.json::<MinecraftPackageJson>()
32+
.await
33+
.wrap_err_with(|| "Couldn't parse Minecraft versions!")?;
34+
35+
let version = data
36+
.recommended
37+
.first()
38+
.ok_or_else(|| eyre!("Couldn't find latest version of Minecraft!"))?;
39+
40+
Ok(version.clone())
41+
} else {
42+
Err(eyre!(
4343
"Failed to get latest Minecraft version from {PRISM_META}{MINECRAFT_PACKAGEJSON_ENDPOINT} with {status}",
4444
))
45-
}
45+
}
4646
}

src/api/rory.rs

+30-30
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ use serde::{Deserialize, Serialize};
77

88
#[derive(Serialize, Deserialize)]
99
pub struct RoryResponse {
10-
pub id: u64,
11-
pub url: String,
12-
pub error: Option<String>,
10+
pub id: u64,
11+
pub url: String,
12+
pub error: Option<String>,
1313
}
1414

1515
const RORY: &str = "https://rory.cat";
1616
const ENDPOINT: &str = "/purr";
1717

1818
pub async fn get_rory(id: Option<u64>) -> Result<RoryResponse> {
19-
let target = id.map(|id| id.to_string()).unwrap_or_default();
20-
21-
let req = REQWEST_CLIENT
22-
.get(format!("{RORY}{ENDPOINT}/{target}"))
23-
.build()
24-
.wrap_err_with(|| "Couldn't build reqwest client!")?;
25-
26-
debug!("Making request to {}", req.url());
27-
let resp = REQWEST_CLIENT
28-
.execute(req)
29-
.await
30-
.wrap_err_with(|| "Couldn't make request for rory!")?;
31-
32-
let status = resp.status();
33-
34-
if let StatusCode::OK = status {
35-
let data = resp
36-
.json::<RoryResponse>()
37-
.await
38-
.wrap_err_with(|| "Couldn't parse the rory response!")?;
39-
40-
Ok(data)
41-
} else {
42-
Err(eyre!(
43-
"Failed to get rory from {RORY}{ENDPOINT}/{target} with {status}",
44-
))
45-
}
19+
let target = id.map(|id| id.to_string()).unwrap_or_default();
20+
21+
let req = REQWEST_CLIENT
22+
.get(format!("{RORY}{ENDPOINT}/{target}"))
23+
.build()
24+
.wrap_err_with(|| "Couldn't build reqwest client!")?;
25+
26+
debug!("Making request to {}", req.url());
27+
let resp = REQWEST_CLIENT
28+
.execute(req)
29+
.await
30+
.wrap_err_with(|| "Couldn't make request for rory!")?;
31+
32+
let status = resp.status();
33+
34+
if let StatusCode::OK = status {
35+
let data = resp
36+
.json::<RoryResponse>()
37+
.await
38+
.wrap_err_with(|| "Couldn't parse the rory response!")?;
39+
40+
Ok(data)
41+
} else {
42+
Err(eyre!(
43+
"Failed to get rory from {RORY}{ENDPOINT}/{target} with {status}",
44+
))
45+
}
4646
}

src/commands/general/joke.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use color_eyre::eyre::Result;
66
/// It's a joke
77
#[poise::command(slash_command, prefix_command)]
88
pub async fn joke(ctx: Context<'_>) -> Result<()> {
9-
let joke = dadjoke::get_joke().await?;
9+
let joke = dadjoke::get_joke().await?;
1010

11-
ctx.reply(joke).await?;
12-
Ok(())
11+
ctx.reply(joke).await?;
12+
Ok(())
1313
}

src/commands/general/members.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ use color_eyre::eyre::{eyre, Result};
55
/// Returns the number of members in the server
66
#[poise::command(slash_command, prefix_command)]
77
pub async fn members(ctx: Context<'_>) -> Result<()> {
8-
let guild = ctx.guild().ok_or_else(|| eyre!("Couldn't fetch guild!"))?;
8+
let guild = ctx.guild().ok_or_else(|| eyre!("Couldn't fetch guild!"))?;
99

10-
let count = guild.member_count;
11-
let online = if let Some(count) = guild.approximate_presence_count {
12-
count.to_string()
13-
} else {
14-
"Undefined".to_string()
15-
};
10+
let count = guild.member_count;
11+
let online = if let Some(count) = guild.approximate_presence_count {
12+
count.to_string()
13+
} else {
14+
"Undefined".to_string()
15+
};
1616

17-
ctx.send(|m| {
18-
m.embed(|e| {
19-
e.title(format!("{count} total members!"))
20-
.description(format!("{online} online members"))
21-
.color(consts::COLORS["blue"])
22-
})
23-
})
24-
.await?;
25-
Ok(())
17+
ctx.send(|m| {
18+
m.embed(|e| {
19+
e.title(format!("{count} total members!"))
20+
.description(format!("{online} online members"))
21+
.color(consts::COLORS["blue"])
22+
})
23+
})
24+
.await?;
25+
Ok(())
2626
}

src/commands/general/ping.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ use color_eyre::eyre::Result;
55
/// Replies with pong!
66
#[poise::command(slash_command, prefix_command, ephemeral)]
77
pub async fn ping(ctx: Context<'_>) -> Result<()> {
8-
ctx.reply("Pong!").await?;
9-
Ok(())
8+
ctx.reply("Pong!").await?;
9+
Ok(())
1010
}

0 commit comments

Comments
 (0)