From 29c2548f12a2949271f1e88909d3713f6a6d6f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Thu, 5 Dec 2024 17:51:10 +0100 Subject: [PATCH] Fix issue processing email invitations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- clowarden-core/src/services/github/state.rs | 10 +++++----- clowarden-server/src/main.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clowarden-core/src/services/github/state.rs b/clowarden-core/src/services/github/state.rs index 6372204..f415756 100644 --- a/clowarden-core/src/services/github/state.rs +++ b/clowarden-core/src/services/github/state.rs @@ -20,7 +20,6 @@ use octorust::types::{ use regex::Regex; use serde::{Deserialize, Serialize}; use serde_json::json; -use tracing::trace; use crate::{ cfg::Legacy, @@ -148,15 +147,16 @@ impl State { for team in stream::iter(svc.list_teams(ctx).await?) .map(|team| async { // Get maintainers and members (including pending invitations) - trace!(team = %team.slug, "getting team maintainers"); let mut maintainers: Vec = svc.list_team_maintainers(ctx, &team.slug).await?.into_iter().map(|u| u.login).collect(); - trace!(team = %team.slug, "getting team members"); let mut members: Vec = svc.list_team_members(ctx, &team.slug).await?.into_iter().map(|u| u.login).collect(); - trace!(team = %team.slug, "getting team invitations"); for invitation in svc.list_team_invitations(ctx, &team.slug).await? { - trace!(team = %team.slug, login = %invitation.login, "getting team membership"); + // Skip invitations without login (e.g. email invitations) + if invitation.login.is_empty() { + continue; + } + let membership = svc.get_team_membership(ctx, &team.slug, &invitation.login).await?; if membership.state == OrgMembershipState::Pending { match membership.role { diff --git a/clowarden-server/src/main.rs b/clowarden-server/src/main.rs index 36de320..f745b4f 100644 --- a/clowarden-server/src/main.rs +++ b/clowarden-server/src/main.rs @@ -48,7 +48,7 @@ async fn main() -> Result<()> { // Setup logging if std::env::var_os("RUST_LOG").is_none() { - std::env::set_var("RUST_LOG", "clowarden=trace"); + std::env::set_var("RUST_LOG", "clowarden=debug"); } let ts = tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()); match cfg.log.format {