From 88c0306d7dc41eb04809108a4e69d2944a324f7d Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Tue, 4 Apr 2023 12:57:43 +0100 Subject: [PATCH] Check for team membership, not org membership --- tools/danger/dangerfile.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js index eb9c066b57..a7e767f25a 100644 --- a/tools/danger/dangerfile.js +++ b/tools/danger/dangerfile.js @@ -105,19 +105,24 @@ function signoff_unneeded(reason) { if (allowList.includes(user)) { signoff_unneeded("allow-list") } else { - github.api.rest.orgs.checkMembershipForUser({ +// github.api.rest.orgs.checkMembershipForUser({ +// org: "vector-im", +// username: user, +// }).then((result) => { + github.api.rest.teams.getMembershipForUserInOrg({ org: "vector-im", + team_slug: "vector-core", username: user, }).then((result) => { - if (result.status == 204) { - signoff_unneeded("org-member") + if (result.status == 204 || result.status == 200) { + signoff_unneeded("team-member") } else { - signoff_needed("not-org-member") + signoff_needed("not-team-member") } }).catch((error) => { if (error.response.status == 404) { - signoff_needed("not-org-member"); + signoff_needed("not-team-member"); } else { console.log(error); signoff_needed("error") }