thmsdy/Biscuit
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed Spigot double logging and Kick message

Browse Source
This commit is contained in:
Ghoti
2020-07-16 19:36:49 -05:00
parent 5dc66effca
commit 7fbe35b83b
13 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/fpghoti/biscuit/user/PreUser.java
View File

@@ -75,7 +75,7 @@ public class PreUser {
public void setDone() {
this.done = true;
}
public int getTimeLeft() {
return timeLeft;
}
@@ -97,9 +97,20 @@ public class PreUser {
Member m = biscuit.getGuild().getMember(user);
biscuit.log(user.getName() + " " + user.getAsMention() + " waited too long to complete the captcha. Kicking...");
biscuit.captchaLog("``" + user.getName() +"`` " + user.getAsMention() + " waited too long to complete the captcha! Kicking...");
if(m != null && m.getRoles().size() == 1 && PermUtil.hasDefaultRole(m) && !PermUtil.hasRewardRole(m)) {
biscuit.getGuild().kick(user.getId()).queue();
if(biscuit.getProperties().dmBeforeKick()) {
String msg = "You did not complete the captcha in **"
+ " " + biscuit.getGuild().getName() + "**! If you believe this is a mistake, rejoin the server"
+ ", complete the captcha, and inform an administrator.";
String invite = biscuit.getProperties().getKickDMInvite().replace(" ", "");
if(!invite.equals("")) {
msg = msg + " " + invite;
}
final String fmsg = msg;
user.openPrivateChannel().flatMap(channel -> channel.sendMessage(fmsg)).complete();
}
biscuit.getGuild().kick(user.getId()).submit();
}
remove();