Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public PingableNameListener(NotificationService notificationService) {
public void onGuildMemberJoin(GuildMemberJoinEvent event) {
checkNickname(event.getMember());
}

@Override
public void onGuildMemberUpdate(GuildMemberUpdateEvent event) {
checkNickname(event.getMember());
Expand All @@ -65,12 +65,12 @@ private void checkNickname(Member member) {
}

/**
* Changes the given {@link Member}s name to a randomly generated one.
* Changes the given {@link Member}s name to properly formatted name if fails then use random generated one.
* @param member The Member whose name should be changed.
*/
private void changeName(Member member) {
String oldName = member.getEffectiveName();
String newName = generateRandomName();
String newName = generateNewName(member.getUser().getName());
member.modifyNickname(newName.substring(0, Math.min(31, newName.length()))).queue();
member.getUser().openPrivateChannel()
.flatMap(channel ->
Expand Down Expand Up @@ -99,6 +99,14 @@ private String generateRandomName() {
return StringUtils.capitalize(adjective) + StringUtils.capitalize(noun);
}

private String generateNewName(String username){
String newName = StringUtils.capitalize(username.replaceAll("(?u)(?:^[^A-Za-z]++|[^A-Za-z]++$)",""));
if(!isPingable(newName)){
newName = generateRandomName();
}
return newName;
}

/**
* Reads strings from the given URL to a {@link List}, removes words with a dash.
* @param url The URL to read.
Expand Down