Skip to content

Commit 49c2d74

Browse files
author
EazyFTW
committed
Fixed discord formatting... the issue all along...
1 parent c3b3913 commit 49c2d74

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/main/java/me/TechsCode/TechDiscordBot/module/cmds/PreorderCommand.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void onCommand(TextChannel channel, Message message, Member member, Strin
6161

6262
Member finalSelectedMember = selectedMember;
6363
Preorder preorder = TechDiscordBot.getStorage().getPreorders(getRoles().get(0).replace(" Preorder", ""), false).stream().filter(po -> po.getDiscordId() == finalSelectedMember.getUser().getIdLong()).findFirst().orElse(null);
64+
6465
if(preorder == null) {
6566
new TechEmbedBuilder("Preorder Cmd - Error")
6667
.error()
@@ -76,32 +77,33 @@ public void onCommand(TextChannel channel, Message message, Member member, Strin
7677

7778
new TechEmbedBuilder("Preorder - " + selectedMember.getEffectiveName() + "#" + selectedMember.getUser().getDiscriminator())
7879
.success()
79-
.addField("Email", showEmail ? preorder.getEmail() : obfuscateEmail(preorder.getEmail()), true)
80-
.addField("Transaction ID", showTransactionId ? preorder.getTransactionId() : obfuscateTransactionId(preorder.getTransactionId()), true)
80+
.addField("Email", (showEmail ? preorder.getEmail() : obfuscateEmail(preorder.getEmail())), true)
81+
.addField("Transaction ID", (showTransactionId ? preorder.getTransactionId() : obfuscateTransactionId(preorder.getTransactionId())), true)
8182
.addField("Plugin", (query.hasAny() ? query.first().getAsMention() + " " : "") + preorder.getPlugin(), true)
8283
.addField("Discord Name", preorder.getDiscordName() + " (" + selectedMember.getAsMention() + ")", true)
8384
.send(channel);
8485
}
8586

8687
public String obfuscateEmail(String email) {
87-
if(email.equals("notAvailable") || email.equals("ManuallyAdded") || email.equals("NONE") || email.equals("something")) return "Unknown";
88+
if(email.equals("notAvailable") || email.equals("ManuallyAdded")) return "Unknown";
8889

8990
int index = email.indexOf("@");
9091
if(index == -1) return email;
9192

9293
StringBuilder length = new StringBuilder();
93-
for(int i = 0; i < index; i++) length.append("*");
94+
for(int i = 0; i < index; i++) length.append("\\*");
9495

9596
StringBuilder sb = new StringBuilder(email);
9697
sb.replace(0, index, length.toString());
9798
return sb.toString();
9899
}
99100

100101
public String obfuscateTransactionId(String transactionId) {
102+
if(transactionId.equals("NONE") || transactionId.equals("something")) return "Unknown";
101103
StringBuilder sb = new StringBuilder(transactionId);
102104

103105
StringBuilder length = new StringBuilder();
104-
for(int i = 0; i < (int)(transactionId.length() / 1.5d); i++) length.append("*");
106+
for(int i = 0; i < (int)(transactionId.length() / 1.5d); i++) length.append("\\*");
105107

106108
sb.replace(0, (int)(transactionId.length() / 1.5d), length.toString());
107109
return sb.toString();

0 commit comments

Comments
 (0)