From 73a9eddf7f3346fa392fda204f602e33895e0356 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Fri, 6 Dec 2019 20:56:03 +0000 Subject: [PATCH] Fixed up Now doesn't accept special chars and added imgbot --- .../Slimefun/SlimefunPlugin.java | 8 ++--- .../Slimefun/guides/GuideSettings.java | 6 ++-- .../hooks/github/ContributionsConnector.java | 18 ++++++---- .../Slimefun/hooks/github/Contributor.java | 36 +++++++++++++------ 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 045166651..e072a5c22 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -310,14 +310,12 @@ public final class SlimefunPlugin extends JavaPlugin { getServer().getScheduler().runTaskTimerAsynchronously(this, () -> { utilities.connectors.forEach(GitHubConnector::pullFile); - + for (Contributor contributor: utilities.contributors.values()) { if (!contributor.hasTexture()) { - String name = contributor.getName(); - try { - Optional uuid = MinecraftAccount.getUUID(name); - + Optional uuid = MinecraftAccount.getUUID(contributor.getMinecraftName()); + if (uuid.isPresent()) { Optional skin = MinecraftAccount.getSkin(uuid.get()); contributor.setTexture(skin); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/guides/GuideSettings.java b/src/main/java/me/mrCookieSlime/Slimefun/guides/GuideSettings.java index e899244d1..64ccd4767 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/guides/GuideSettings.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/guides/GuideSettings.java @@ -185,11 +185,13 @@ public final class GuideSettings { try { skull = CustomSkull.getItem(contributor.getTexture()); } catch (Exception e) { - Slimefun.getLogger().log(Level.SEVERE, "An Error occured while inserting a Contributors head.", e); + Slimefun.getLogger().log(Level.SEVERE, "An Error occurred while inserting a Contributors head.", e); } SkullMeta meta = (SkullMeta) skull.getItemMeta(); - meta.setDisplayName(ChatColor.GRAY + contributor.getName()); + meta.setDisplayName(ChatColor.GRAY + contributor.getName() + + (!contributor.getName().equals(contributor.getMinecraftName()) ? " (MC: " + contributor.getMinecraftName() + ")" : "") + ); List lore = new LinkedList<>(); lore.add(""); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java b/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java index fd333d8c2..91af076b3 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java @@ -1,23 +1,29 @@ package me.mrCookieSlime.Slimefun.hooks.github; -import java.util.Collections; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import me.mrCookieSlime.Slimefun.SlimefunPlugin; -import org.bukkit.Bukkit; public class ContributionsConnector extends GitHubConnector { - + + private static final Pattern nameFormat = Pattern.compile("[\\w_]+"); + // All names including "bot" are automatically blacklisted. But, others can be too right here. // (includes "invalid-email-address" because it is an invalid contributor) - private static final List blacklist = Collections.singletonList( - "invalid-email-address" + private static final List blacklist = Arrays.asList( + "invalid-email-address", + "renovate-bot", + "ImgBotApp", + "TheBusyBot", + "imgbot" ); // Matches a GitHub name with a Minecraft name. @@ -66,7 +72,7 @@ public class ContributionsConnector extends GitHubConnector { int commits = object.get("contributions").getAsInt(); String profile = object.get("html_url").getAsString(); - if (!name.toLowerCase().contains("bot") && !blacklist.contains(name)) { + if (nameFormat.matcher(name).matches() && !blacklist.contains(name)) { Contributor contributor = SlimefunPlugin.getUtilities().contributors.computeIfAbsent( name, key -> new Contributor(aliases.getOrDefault(name, name), profile) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java b/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java index a4ccb51c1..4fc5b58c7 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java @@ -13,15 +13,17 @@ import java.util.concurrent.ConcurrentMap; public class Contributor { private static final String PLACEHOLDER_HEAD = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDZiYTYzMzQ0ZjQ5ZGQxYzRmNTQ4OGU5MjZiZjNkOWUyYjI5OTE2YTZjNTBkNjEwYmI0MGE1MjczZGM4YzgyIn19fQ=="; - - private String name; - private String profile; - private Optional headTexture = Optional.empty(); + + private final String ghName; + private final String mcName; + private String profileLink; + private Optional headTexture; private final ConcurrentMap contributions = new ConcurrentHashMap<>(); public Contributor(String name, String profile) { - this.name = name; - this.profile = profile; + this.ghName = profile.substring(profile.lastIndexOf('/') + 1); + this.mcName = name; + this.profileLink = profile; } public void setContribution(String role, int commits) { @@ -35,7 +37,16 @@ public class Contributor { * @since 4.1.13 */ public String getName() { - return this.name; + return this.ghName; + } + + /** + * Returns the MC name of the contributor. This may be the same as {@link #getName()}. + * + * @return The MC username of this contributor. + */ + public String getMinecraftName() { + return this.mcName; } /** @@ -45,7 +56,7 @@ public class Contributor { * @since 4.1.13 */ public String getProfile() { - return this.profile; + return this.profileLink; } public Map getContributions() { @@ -57,11 +68,16 @@ public class Contributor { * @return A Base64-Head Texture */ public String getTexture() { - return headTexture.orElse(PLACEHOLDER_HEAD); + if (headTexture == null || !headTexture.isPresent()) { + return PLACEHOLDER_HEAD; + } + else { + return headTexture.get(); + } } public boolean hasTexture() { - return headTexture.isPresent(); + return headTexture != null; } public void setTexture(Optional skin) {