Commit 735fce9
committed
Unpigable name are now cahnged to properly formatted name (derived from username) if fails it fallback to randomly generated username.
1 parent b11ead7 commit 735fce9
1 file changed
Lines changed: 28 additions & 4 deletions
Lines changed: 28 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -48,7 +48,7 @@ public PingableNameListener(NotificationService notificationService) { | |||
| 48 | 48 | public void onGuildMemberJoin(GuildMemberJoinEvent event) { | |
| 49 | 49 | checkNickname(event.getMember()); | |
| 50 | 50 | } | |
| 51 | - | ||
| 51 | + | ||
| 52 | 52 | @Override | |
| 53 | 53 | public void onGuildMemberUpdate(GuildMemberUpdateEvent event) { | |
| 54 | 54 | checkNickname(event.getMember()); | |
@@ -60,17 +60,17 @@ public void onGuildMemberUpdate(GuildMemberUpdateEvent event) { | |||
| 60 | 60 | */ | |
| 61 | 61 | private void checkNickname(Member member) { | |
| 62 | 62 | if (!isPingable(member.getEffectiveName()) && !canBypassCheck(member)) { | |
| 63 | - changeName(member); | ||
| 63 | + changeName(member); | ||
| 64 | 64 | } | |
| 65 | 65 | } | |
| 66 | 66 | ||
| 67 | 67 | /** | |
| 68 | - * Changes the given {@link Member}s name to a randomly generated one. | ||
| 68 | + * Changes the given {@link Member}s name to properly formatted name if fails then use random generated one. | ||
| 69 | 69 | * @param member The Member whose name should be changed. | |
| 70 | 70 | */ | |
| 71 | 71 | private void changeName(Member member) { | |
| 72 | 72 | String oldName = member.getEffectiveName(); | |
| 73 | - String newName = generateRandomName(); | ||
| 73 | + String newName = makeNewName(member.getUser().getName()); | ||
| 74 | 74 | member.modifyNickname(newName.substring(0, Math.min(31, newName.length()))).queue(); | |
| 75 | 75 | member.getUser().openPrivateChannel() | |
| 76 | 76 | .flatMap(channel -> | |
@@ -99,6 +99,30 @@ private String generateRandomName() { | |||
| 99 | 99 | return StringUtils.capitalize(adjective) + StringUtils.capitalize(noun); | |
| 100 | 100 | } | |
| 101 | 101 | ||
| 102 | + private String makeNewName(String username){ | ||
| 103 | + int startIndex = 0; | ||
| 104 | + int endIndex = username.length()-1; | ||
| 105 | + for(int i=0; i < username.length();i++){ | ||
| 106 | + char character = username.charAt(i); | ||
| 107 | + if (character >= 'a' && character <= 'z' || character >= 'A' && character <= 'Z'){ | ||
| 108 | + startIndex = i; | ||
| 109 | + break; | ||
| 110 | + } | ||
| 111 | + } | ||
| 112 | + for(int i=username.length()-1; i >= 0;i--){ | ||
| 113 | + char character = username.charAt(i); | ||
| 114 | + if (character >= 'a' && character <='z' || character >= 'A' && character <= 'Z'){ | ||
| 115 | + endIndex = i; | ||
| 116 | + break; | ||
| 117 | + } | ||
| 118 | + } | ||
| 119 | + String newUsername = StringUtils.capitalize(username.substring(startIndex,endIndex+1)); | ||
| 120 | + if(!isPingable(newUsername)){ | ||
| 121 | + newUsername = generateRandomName(); | ||
| 122 | + } | ||
| 123 | + return newUsername; | ||
| 124 | + } | ||
| 125 | + | ||
| 102 | 126 | /** | |
| 103 | 127 | * Reads strings from the given URL to a {@link List}, removes words with a dash. | |
| 104 | 128 | * @param url The URL to read. | |
0 commit comments