this repo has no description
refactor: code cleanup
+29
-28
+5
-3
src/commands/misc/nixpkgs.rs
+5
-3
src/commands/misc/nixpkgs.rs
···
1
1
use color_eyre::eyre::Result;
2
2
use nixpkgs_track_lib::{branch_contains_commit, fetch_nixpkgs_pull_request};
3
3
use poise::{serenity_prelude::CreateEmbed, CreateReply};
4
+
use std::fmt::Write as _;
4
5
5
6
use crate::types::Context;
6
7
···
48
49
)
49
50
.await?;
50
51
51
-
embed_description.push_str(&format!(
52
-
"{}: {}\n",
52
+
let _ = writeln!(
53
+
embed_description,
54
+
"{}: {}",
53
55
branch,
54
56
if has_pull_request { "✅" } else { "❌" }
55
-
));
57
+
);
56
58
}
57
59
58
60
let embed = CreateReply::default().embed(
+1
-1
src/event_handler/code_expantion.rs
+1
-1
src/event_handler/code_expantion.rs
+18
-21
src/http_server.rs
+18
-21
src/http_server.rs
···
24
24
data: Arc<Data>,
25
25
port: u16,
26
26
) -> color_eyre::eyre::Result<()> {
27
-
let addr = format!("127.0.0.1:{}", port);
27
+
let addr = format!("127.0.0.1:{port}");
28
28
let listener = TcpListener::bind(&addr).await?;
29
-
30
-
println!("HTTP server listening on http://{}", addr);
31
-
29
+
30
+
println!("HTTP server listening on http://{addr}");
31
+
32
32
loop {
33
33
let (stream, _) = listener.accept().await?;
34
34
let ctx = Arc::clone(&ctx);
35
35
let data = Arc::clone(&data);
36
-
36
+
37
37
tokio::spawn(async move {
38
38
if let Err(e) = handle_connection(stream, ctx, data).await {
39
-
eprintln!("Error handling connection: {}", e);
39
+
eprintln!("Error handling connection: {e}");
40
40
}
41
41
});
42
42
}
···
48
48
_data: Arc<Data>,
49
49
) -> color_eyre::eyre::Result<()> {
50
50
let mut buffer = [0; 1024];
51
-
stream.read(&mut buffer).await?;
52
-
51
+
stream.read_exact(&mut buffer).await?;
52
+
53
53
let request = String::from_utf8_lossy(&buffer[..]);
54
54
let request_line = request.lines().next().unwrap_or("");
55
-
55
+
56
56
if request_line.starts_with("GET /members") {
57
57
let guild_id = extract_guild_id_from_request(request_line)
58
58
.unwrap_or(GuildId::new(1095080242219073606));
59
-
59
+
60
60
match get_guild_members(&ctx, guild_id).await {
61
61
Ok(response_body) => {
62
62
let response = format!(
···
67
67
stream.write_all(response.as_bytes()).await?;
68
68
}
69
69
Err(e) => {
70
-
let error_body = format!(r#"{{"error": "Failed to fetch members: {}"}}"#, e);
70
+
let error_body = format!(r#"{{"error": "Failed to fetch members: {e}"}}"#);
71
71
let response = format!(
72
72
"HTTP/1.1 500 Internal Server Error\r\nContent-Type: application/json\r\nContent-Length: {}\r\n\r\n{}",
73
73
error_body.len(),
···
85
85
);
86
86
stream.write_all(response.as_bytes()).await?;
87
87
}
88
-
88
+
89
89
Ok(())
90
90
}
91
91
···
99
99
Some((parts.next()?, parts.next()?))
100
100
})
101
101
.collect();
102
-
102
+
103
103
if let Some(guild_id_str) = params.get("guild_id") {
104
104
if let Ok(guild_id) = guild_id_str.parse::<u64>() {
105
105
return Some(GuildId::new(guild_id));
···
109
109
None
110
110
}
111
111
112
-
async fn get_guild_members(
113
-
ctx: &Context,
114
-
guild_id: GuildId,
115
-
) -> color_eyre::eyre::Result<String> {
112
+
async fn get_guild_members(ctx: &Context, guild_id: GuildId) -> color_eyre::eyre::Result<String> {
116
113
let members = guild_id.members(&ctx.http, None, None).await?;
117
-
114
+
118
115
let member_infos: Vec<MemberInfo> = members
119
116
.iter()
120
117
.map(|member| MemberInfo {
···
123
120
avatar_url: member.user.avatar_url(),
124
121
})
125
122
.collect();
126
-
123
+
127
124
let response = MembersResponse {
128
125
guild_id: guild_id.to_string(),
129
126
members: member_infos,
130
127
};
131
-
128
+
132
129
Ok(serde_json::to_string_pretty(&response)?)
133
-
}
130
+
}
+5
-3
src/main.rs
+5
-3
src/main.rs
···
62
62
63
63
poise::builtins::register_globally(ctx, &framework.options().commands).await?;
64
64
65
-
// h tee tee pee
65
+
// h tee tee pee
66
66
let ctx_clone = Arc::new(ctx.clone());
67
67
let data_clone = Arc::new(types::Data::new());
68
68
tokio::spawn(async move {
69
-
if let Err(e) = http_server::start_http_server(ctx_clone, data_clone, 3000).await {
70
-
eprintln!("HTTP server error: {}", e);
69
+
if let Err(e) =
70
+
http_server::start_http_server(ctx_clone, data_clone, 3000).await
71
+
{
72
+
eprintln!("HTTP server error: {e}");
71
73
}
72
74
});
73
75