From 416798ffeeaa8e9402549941cd2eaccaa900338f Mon Sep 17 00:00:00 2001 From: David Vo Date: Mon, 31 Oct 2016 11:51:23 +1100 Subject: [PATCH] Skip GitHub noreply authors --- .../bithub/controllers/GithubController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/whispersystems/bithub/controllers/GithubController.java b/src/main/java/org/whispersystems/bithub/controllers/GithubController.java index a46a745..1f4bd06 100644 --- a/src/main/java/org/whispersystems/bithub/controllers/GithubController.java +++ b/src/main/java/org/whispersystems/bithub/controllers/GithubController.java @@ -65,6 +65,7 @@ public class GithubController { private static final String GITHUB_WEBOOK_CIDR = "192.30.252.0/22"; private static final String MASTER_REF = "refs/heads/master"; + private static final String NOREPLY_DOMAIN = "@users.noreply.github.com"; private final Logger logger = LoggerFactory.getLogger(GithubController.class); private final SubnetInfo trustedNetwork = new SubnetUtils(GITHUB_WEBOOK_CIDR).getInfo(); @@ -160,13 +161,19 @@ private List getQualifyingCommits(PushEvent event, String defaultMode) { Set emails = new HashSet<>(); for (Commit commit : event.getCommits()) { + String email = commit.getAuthor().getEmail(); + logger.info(commit.getUrl()); - if (!emails.contains(commit.getAuthor().getEmail())) { - logger.info("Unique author: "+ commit.getAuthor().getEmail()); + + if (email.endsWith(NOREPLY_DOMAIN)) { + logger.info("Skipping GitHub noreply author " + email); + } else if (!emails.contains(email)) { + logger.info("Unique author: " + email); + if (isViableMessage(commit.getMessage(), defaultMode)) { logger.info("Not a merge commit or freebie..."); - emails.add(commit.getAuthor().getEmail()); + emails.add(email); commits.add(commit); } }