diff --git a/site/src/api.rs b/site/src/api.rs index 3b6e080d1..840e57dcc 100644 --- a/site/src/api.rs +++ b/site/src/api.rs @@ -602,7 +602,6 @@ pub mod github { #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Push { pub r#ref: String, - pub sender: Sender, pub head_commit: HeadCommit, pub before: String, pub commits: Vec, @@ -626,11 +625,6 @@ pub mod github { pub message: String, } - #[derive(Debug, Clone, Serialize, Deserialize)] - pub struct Sender { - pub login: String, - } - #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Response; } diff --git a/site/src/request_handlers.rs b/site/src/request_handlers.rs index 740999333..6a37d2e22 100644 --- a/site/src/request_handlers.rs +++ b/site/src/request_handlers.rs @@ -7,7 +7,7 @@ mod status_page; pub use bootstrap::handle_bootstrap; pub use dashboard::handle_dashboard; -pub use github::handle_github; +pub use github::handle_github_webhook; pub use graph::{ handle_compile_detail_graphs, handle_compile_detail_sections, handle_graphs, handle_runtime_detail_graphs, diff --git a/site/src/request_handlers/github.rs b/site/src/request_handlers/github.rs index 46815beda..54efa709d 100644 --- a/site/src/request_handlers/github.rs +++ b/site/src/request_handlers/github.rs @@ -12,7 +12,7 @@ use database::{ use hashbrown::HashMap; use std::sync::Arc; -pub async fn handle_github( +pub async fn handle_github_webhook( request: github::Request, ctxt: Arc, ) -> ServerResult { @@ -25,9 +25,7 @@ pub async fn handle_github( async fn handle_push(ctxt: Arc, push: github::Push) -> ServerResult { let gh_client = client::Client::from_ctxt(&ctxt, RUST_REPO_GITHUB_API_URL.to_owned()); - if push.r#ref != format!("refs/heads/{}", push.repository.default_branch) - || push.sender.login != "bors" - { + if push.r#ref != format!("refs/heads/{}", push.repository.default_branch) { return Ok(github::Response); } let rollup_pr_number = match rollup_pr_number(&gh_client, &push.head_commit.message).await? { diff --git a/site/src/server.rs b/site/src/server.rs index 442f88746..8db763377 100644 --- a/site/src/server.rs +++ b/site/src/server.rs @@ -392,7 +392,11 @@ async fn serve_req(server: Server, req: Request) -> Result Ok(to_response( - request_handlers::handle_github(check!(parse_body(&body)), ctxt.clone()).await, + request_handlers::handle_github_webhook( + check!(parse_body(&body)), + ctxt.clone(), + ) + .await, &compression, )), _ => Ok(http::Response::builder()