diff --git a/src/main/java/net/wagstrom/research/github/Utils.java b/src/main/java/net/wagstrom/research/github/Utils.java index 5dc3e28..dd0c410 100644 --- a/src/main/java/net/wagstrom/research/github/Utils.java +++ b/src/main/java/net/wagstrom/research/github/Utils.java @@ -28,6 +28,7 @@ public final class Utils { private static final Logger log = LoggerFactory.getLogger(Utils.class); // NOPMD private static final Pattern GRAVATAR_PATTERN = Pattern.compile("([a-f0-9]{32})"); + private static final Pattern GITHUB_AVATAR_PATTERN = Pattern.compile("/([0-9]+)\\??"); /** * All methods of this class are static. Do not initialize it. @@ -70,7 +71,11 @@ public static String gravatarIdExtract(final String gravatarId) { String hash = null; Matcher matcher = GRAVATAR_PATTERN.matcher(gravatarId); if (matcher.find()) { - hash = matcher.group(0); + return matcher.group(0); + } + matcher = GITHUB_AVATAR_PATTERN.matcher(gravatarId); + if (matcher.find()) { + return matcher.group(1); } return hash; }