@@ -61,6 +61,7 @@ public void onCommand(TextChannel channel, Message message, Member member, Strin
61
61
62
62
Member finalSelectedMember = selectedMember ;
63
63
Preorder preorder = TechDiscordBot .getStorage ().getPreorders (getRoles ().get (0 ).replace (" Preorder" , "" ), false ).stream ().filter (po -> po .getDiscordId () == finalSelectedMember .getUser ().getIdLong ()).findFirst ().orElse (null );
64
+
64
65
if (preorder == null ) {
65
66
new TechEmbedBuilder ("Preorder Cmd - Error" )
66
67
.error ()
@@ -76,32 +77,33 @@ public void onCommand(TextChannel channel, Message message, Member member, Strin
76
77
77
78
new TechEmbedBuilder ("Preorder - " + selectedMember .getEffectiveName () + "#" + selectedMember .getUser ().getDiscriminator ())
78
79
.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 )
81
82
.addField ("Plugin" , (query .hasAny () ? query .first ().getAsMention () + " " : "" ) + preorder .getPlugin (), true )
82
83
.addField ("Discord Name" , preorder .getDiscordName () + " (" + selectedMember .getAsMention () + ")" , true )
83
84
.send (channel );
84
85
}
85
86
86
87
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" ;
88
89
89
90
int index = email .indexOf ("@" );
90
91
if (index == -1 ) return email ;
91
92
92
93
StringBuilder length = new StringBuilder ();
93
- for (int i = 0 ; i < index ; i ++) length .append ("*" );
94
+ for (int i = 0 ; i < index ; i ++) length .append ("\\ *" );
94
95
95
96
StringBuilder sb = new StringBuilder (email );
96
97
sb .replace (0 , index , length .toString ());
97
98
return sb .toString ();
98
99
}
99
100
100
101
public String obfuscateTransactionId (String transactionId ) {
102
+ if (transactionId .equals ("NONE" ) || transactionId .equals ("something" )) return "Unknown" ;
101
103
StringBuilder sb = new StringBuilder (transactionId );
102
104
103
105
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 ("\\ *" );
105
107
106
108
sb .replace (0 , (int )(transactionId .length () / 1.5d ), length .toString ());
107
109
return sb .toString ();
0 commit comments