Skip to content

Commit 2895793

Browse files
JayDweeJayDwee
committed
chore: clippy
1 parent 7444d0e commit 2895793

File tree

10 files changed

+21
-22
lines changed

10 files changed

+21
-22
lines changed

‎api/src/guilds/models.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ impl From<&HashMap<String, AttributeValue>> for Guild {
3434
.parse::<u64>()
3535
.map(Id::new)
3636
.unwrap(),
37-
verify: as_string_opt(item.get("verify")).map(|v| serde_json::from_str(&*v).unwrap_or_default()).unwrap_or_default(),
38-
vote: as_string_opt(item.get("vote")).map(|v| serde_json::from_str(&*v).unwrap_or_default()).unwrap_or_default(),
37+
verify: as_string_opt(item.get("verify")).map(|v| serde_json::from_str(&v).unwrap_or_default()).unwrap_or_default(),
38+
vote: as_string_opt(item.get("vote")).map(|v| serde_json::from_str(&v).unwrap_or_default()).unwrap_or_default(),
3939
}
4040
}
4141
}
@@ -146,7 +146,7 @@ impl Guild {
146146
{
147147
Ok(_) => {
148148
info!("Saved guild to DynamoDB");
149-
()
149+
150150
},
151151
Err(e) => {
152152
error!("DynamoDB write error: {}", e);

‎api/src/guilds/votes/controllers.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,7 @@ async fn post_votes_id_close(
168168
let _message = update_message(vote.channel_id, vote.message_id, Some(Some(&format!("# [CLOSED] {}\n{}\n", vote.title, vote.description))),
169169
Some(Some(group_to_rows(vote.options.iter().map(|o| {
170170
let mut c = o.to_component();
171-
match c {
172-
Component::Button(ref mut b) => b.disabled = true,
173-
_ => (),
174-
}
171+
if let Component::Button(ref mut b) = c { b.disabled = true }
175172
c
176173
}).collect())?.as_slice())), &app_state.discord_bot).await?;
177174

‎api/src/guilds/votes/interactions.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ pub(crate) async fn handle_component_interaction(
4040
let role_in_role_list = roles.iter().any(|r| role_list.contains(r));
4141

4242
let allowed = match role_list_type {
43-
RoleListType::BLACKLIST => {
43+
RoleListType::Blacklist => {
4444
!role_in_role_list
4545
}
46-
RoleListType::WHITELIST => {
46+
RoleListType::Whitelist => {
4747
role_in_role_list
4848
}
4949
};

‎api/src/guilds/votes/models.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl Display for VoteOption {
2525
impl From<&HashMap<String, AttributeValue>> for VoteOption {
2626
fn from(item: &HashMap<String, AttributeValue>) -> Self {
2727
VoteOption {
28-
emoji: as_string_opt(item.get("emoji")).filter(|s| !s.is_empty()).and_then(|v| serde_json::from_str(&*v).unwrap()),
28+
emoji: as_string_opt(item.get("emoji")).filter(|s| !s.is_empty()).and_then(|v| serde_json::from_str(&v).unwrap()),
2929
label: as_string_opt(item.get("label")),
3030
users: as_u64_set(item.get("label")).into_iter().map(|s| Id::new(s)).collect(),
3131
}
@@ -55,13 +55,15 @@ impl VoteOptionComponent for VoteOption {
5555
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
5656
pub enum RoleListType {
5757
#[default]
58-
BLACKLIST,
59-
WHITELIST
58+
#[serde(rename = "BLACKLIST")]
59+
Blacklist,
60+
#[serde(rename = "WHITELIST")]
61+
Whitelist
6062
}
6163

6264
impl Display for RoleListType {
6365
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
64-
write!(f, "{:?}", self)
66+
write!(f, "{self:?}")
6567
}
6668
}
6769

@@ -90,10 +92,10 @@ impl From<&HashMap<String, AttributeValue>> for VoteVote {
9092
description: as_string(item.get("description"), &"".to_string()),
9193
options: as_map_vec(item.get("options")).iter().map(|&v| VoteOption::from(v)).collect(),
9294
channel_id: Id::new(as_u64(item.get("channel_id"), 0)),
93-
close_at: as_string_opt(item.get("close_at")).filter(|v| !v.is_empty()).and_then(|v| serde_json::from_str(&*v).unwrap()),
95+
close_at: as_string_opt(item.get("close_at")).filter(|v| !v.is_empty()).and_then(|v| serde_json::from_str(&v).unwrap()),
9496
open: as_bool(item.get("open"), false),
9597
role_list: as_u64_set(item.get("role_list")).into_iter().map(|s| Id::new(s)).collect(),
96-
role_list_type: as_string_opt(item.get("role_list_type")).filter(|v| !v.is_empty()).and_then(|v| serde_json::from_str(&*v).unwrap()).unwrap_or_default(),
98+
role_list_type: as_string_opt(item.get("role_list_type")).filter(|v| !v.is_empty()).and_then(|v| serde_json::from_str(&v).unwrap()).unwrap_or_default(),
9799
is_multi_select: as_bool(item.get("is_multi_select"), false),
98100
}
99101
}

‎api/src/interactions/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use hex::FromHex;
99
use http::{HeaderMap, StatusCode};
1010
use http::header::AUTHORIZATION;
1111
use http_body_util::BodyExt;
12-
use lambda_http::tracing::error;
1312
use once_cell::sync::Lazy;
1413
use serde_json::{Value, json};
1514
use tower_http::cors::CorsLayer;

‎api/src/main.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ async fn get_bot_redirect() -> Response<Body> {
5555
async fn run_local(app: Router) -> Result<(), Error> {
5656
let router = Router::new().nest("/lambda-url/api", app)
5757
.route_layer(axum::middleware::from_fn(middleware::mock_ctx_middleware));
58-
Ok(axum::serve(tokio::net::TcpListener::bind("0.0.0.0:9000").await.unwrap(), router).await.unwrap())
58+
axum::serve(tokio::net::TcpListener::bind("0.0.0.0:9000").await.unwrap(), router).await.unwrap();
59+
Ok(())
5960
}
6061

6162
#[tokio::main]

‎api/src/meta/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ async fn refresh_meta_cache(discord_bot: Arc<Client>) {
107107
loop {
108108
debug!("Refreshing meta cache");
109109
let time = Instant::now();
110-
match get_current_user_guilds_prime_cache(&*discord_bot).await {
110+
match get_current_user_guilds_prime_cache(&discord_bot).await {
111111
Ok(guilds) => {
112112
debug!("Refreshing meta cache: {}", guilds.len());
113113
for guild in guilds {
114-
let _ = get_guild_prime_cache(guild.id, &*discord_bot).await;
114+
let _ = get_guild_prime_cache(guild.id, &discord_bot).await;
115115
}
116116
}
117117
Err(e) => {

‎api/src/users/email.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub async fn send_verify_email(
1919
let env = std::env::var("DEPLOYMENT_ENV").expect("DEPLOYMENT_ENV must be set");
2020
let mut host = "koalabot.uk".to_string();
2121
if env != "prod" {
22-
host = format!("{}.{}", env, host);
22+
host = format!("{env}.{host}");
2323
}
2424

2525
let t_data = serde_json::to_string(&TemplateData {

‎api/src/users/links.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ async fn post_send_email(
221221

222222
send_verify_email(
223223
&app_state.ses,
224-
&*current_user.name,
224+
&current_user.name,
225225
send_email_req.email,
226226
&token_str,
227227
)

‎api/src/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub async fn member_guilds(
1111
discord_bot: &Client
1212
) -> Result<Vec<CurrentUserGuild>, StatusCode> {
1313
let mut bot_guilds = get_current_user_guilds(discord_bot).await?;
14-
bot_guilds.retain(|g| is_admin(g));
14+
bot_guilds.retain(is_admin);
1515
let user_guilds = get_current_user_guilds(discord_user).await?;
1616
let mut guilds = vec![];
1717
for u_guild in &user_guilds {

0 commit comments

Comments
 (0)