Unpigable name are now cahnged to properly formatted name (derived from username) if fails it fallback to randomly generated username.

Author: Neil-Tomar

src/main/java/net/discordjug/javabot/listener/PingableNameListener.java

@@ -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());
@@ -60,17 +60,17 @@ public void onGuildMemberUpdate(GuildMemberUpdateEvent event) {
 	 */
 	private void checkNickname(Member member) {
 		if (!isPingable(member.getEffectiveName()) && !canBypassCheck(member)) {
-			changeName(member);
+					changeName(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 = makeNewName(member.getUser().getName());
 		member.modifyNickname(newName.substring(0, Math.min(31, newName.length()))).queue();
 		member.getUser().openPrivateChannel()
 				.flatMap(channel ->
@@ -99,6 +99,30 @@ private String generateRandomName() {
 		return StringUtils.capitalize(adjective) + StringUtils.capitalize(noun);
 	}
 
+	private String makeNewName(String username){
+		int startIndex = 0;
+		int endIndex = username.length()-1;
+		for(int i=0; i < username.length();i++){
+			char character = username.charAt(i);
+			if (character >= 'a' && character <= 'z' || character >= 'A' && character <= 'Z'){
+				startIndex = i;
+				break;
+			}
+		}
+		for(int i=username.length()-1; i >= 0;i--){
+			char character = username.charAt(i);
+			if (character >= 'a' && character <='z' || character >= 'A' && character <= 'Z'){
+				endIndex = i;
+				break;
+			}
+		}
+		String newUsername = StringUtils.capitalize(username.substring(startIndex,endIndex+1));
+		if(!isPingable(newUsername)){
+			newUsername = generateRandomName();
+		}
+		return newUsername;
+	}
+
 	/**
 	 * Reads strings from the given URL to a {@link List}, removes words with a dash.
 	 * @param url The URL to read.