Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 23:58:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change discriminator seperator and default width

Browse Source
This commit is contained in:
Ravi Khadiwala
2022-09-13 17:10:34 -05:00
committed by ravi-signal
parent 65dbcb3e5f
commit d0a8899daf
7 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/UsernameConfiguration.java
View File

@@ -13,7 +13,7 @@ public class UsernameConfiguration {
@JsonProperty
@Min(1)
private int discriminatorInitialWidth = 4;
private int discriminatorInitialWidth = 2;
@JsonProperty
@Min(1)

4
service/src/main/java/org/whispersystems/textsecuregcm/util/UsernameGenerator.java
View File

@@ -34,7 +34,7 @@ public class UsernameGenerator {
* Usernames typically consist of a nickname and an integer discriminator
*/
public static final Pattern NICKNAME_PATTERN = Pattern.compile("^[_a-z][_a-z0-9]{2,31}$");
public static final String SEPARATOR = "#";
public static final String SEPARATOR = ".";
private static final Counter USERNAME_NOT_AVAILABLE_COUNTER = Metrics.counter(name(UsernameGenerator.class, "usernameNotAvailable"));
private static final DistributionSummary DISCRIMINATOR_ATTEMPT_COUNTER = Metrics.summary(name(UsernameGenerator.class, "discriminatorAttempts"));
@@ -112,7 +112,7 @@ public class UsernameGenerator {
throw new IllegalArgumentException("Invalid nickname " + nickname);
}
// zero pad discriminators less than the discriminator initial width
return String.format("%s#%0" + initialWidth + "d", nickname, discriminator);
return String.format("%s%s%0" + initialWidth + "d", nickname, SEPARATOR, discriminator);
}
public Duration getReservationTtl() {