diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index 2e6b6c3..34434c8 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -187,6 +187,10 @@ if(member==null || member.getGuild()==null) return false; + // ignore broken guilds + if(member.getGuild().getSelfMember()==null || member.getGuild().getOwner()==null) + return false; + // ignore bots if(member.getUser().isBot()) return false; diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java index 825c583..803e570 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -218,7 +218,7 @@ OffsetDateTime now = OffsetDateTime.now(); long seconds = event.getUser().getCreationTime().until(now, ChronoUnit.SECONDS); log(now, tc, "\uD83D\uDCE5", FormatUtil.formatFullUser(event.getUser())+" joined the server. " - +(seconds<16*60 ? "NEW" : "") + +(seconds<16*60 ? "\uD83C\uDD95" : "") +"\nCreation: "+event.getUser().getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)", null); }