Skip to content

Commit 60dfbf3

Browse files
faab007nlfaab007nl
committed
Merge remote-tracking branch 'origin/master'
2 parents d219dd9 + 7f10567 commit 60dfbf3

21 files changed

+1164
-1531
lines changed

‎build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ dependencies {
2626
implementation 'org.apache.commons:commons-lang3:3.12.0'
2727
implementation 'mysql:mysql-connector-java:8.0.25'
2828
implementation "com.googlecode.json-simple:json-simple:1.1.1"
29-
implementation 'net.sourceforge.htmlunit:htmlunit:2.53.0'
30-
implementation 'com.google.code.gson:gson:2.8.8'
31-
implementation 'org.kohsuke:github-api:1.133'
29+
implementation 'net.sourceforge.htmlunit:htmlunit:2.54.0'
30+
implementation 'com.google.code.gson:gson:2.8.9'
31+
implementation 'org.kohsuke:github-api:1.135'
3232
implementation 'com.mattmalec:Pterodactyl4J:2.BETA_78'
3333
}
3434

‎src/main/java/me/TechsCode/TechDiscordBot/module/cmds/OverviewCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void showVerify() {
107107

108108
public void showInfo() {
109109
new TechEmbedBuilder("Tech's Plugin Support")
110-
.text("Welcome to **Tech's Plugin Support**. Here, not only can you get support for Tech's Plugins. You can talk and socialize with people too! You can also get help with other plugins!\n\nIf you're new here and need help with one or more of Tech's Plugins, you can verify in <#695493411117072425> to get support. Once you do, you will get access to the specified support channels.\n\nIf you are already verified and you have bought another plugin, simply wait for the bot to give you the role *(could take up to 15 minutes, possibly longer)*.")
110+
.text("Welcome to **Tech's Plugin Support**. Here, not only can you get support for Tech's Plugins. You can talk and socialize with people too! You can also get help with other plugins!\n\nIf you're new here and need help with one or more of Tech's Plugins, you can verify in <#695493411117072425> to get support. Once you do, you will get access to the specified support channels.")
111111
.thumbnail("https://i.imgur.com/SfFEnoU.png")
112112
.queue(OVERVIEW_CHANNEL.query().first());
113113
}

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

Lines changed: 140 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,140 @@
1-
package me.TechsCode.TechDiscordBot.module.cmds;
2-
3-
import me.TechsCode.TechDiscordBot.TechDiscordBot;
4-
import me.TechsCode.TechDiscordBot.module.CommandModule;
5-
import me.TechsCode.TechDiscordBot.mysql.storage.Preorder;
6-
import me.TechsCode.TechDiscordBot.objects.Query;
7-
import me.TechsCode.TechDiscordBot.util.TechEmbedBuilder;
8-
import net.dv8tion.jda.api.entities.Emote;
9-
import net.dv8tion.jda.api.entities.Member;
10-
import net.dv8tion.jda.api.entities.Role;
11-
import net.dv8tion.jda.api.entities.TextChannel;
12-
import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
13-
import net.dv8tion.jda.api.interactions.commands.OptionType;
14-
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
15-
import net.dv8tion.jda.api.interactions.commands.privileges.CommandPrivilege;
16-
17-
import java.util.List;
18-
import java.util.stream.Collectors;
19-
import java.util.stream.IntStream;
20-
21-
public class PreorderCommand extends CommandModule {
22-
23-
public PreorderCommand(TechDiscordBot bot) {
24-
super(bot);
25-
}
26-
27-
@Override
28-
public String getName() {
29-
return "preorder";
30-
}
31-
32-
@Override
33-
public String getDescription() {
34-
return "Show a member's preorder.";
35-
}
36-
37-
@Override
38-
public CommandPrivilege[] getCommandPrivileges() {
39-
return new CommandPrivilege[0];
40-
}
41-
42-
@Override
43-
public OptionData[] getOptions() {
44-
return new OptionData[] {
45-
new OptionData(OptionType.USER, "member", "View this member's preorder. (Default: You)"),
46-
new OptionData(OptionType.BOOLEAN, "show-email", "Show the member's email? (Default: False)"),
47-
new OptionData(OptionType.BOOLEAN, "show-transaction-id", "Show the transaction id? (Default: False)")
48-
};
49-
}
50-
51-
@Override
52-
public int getCooldown() {
53-
return 3;
54-
}
55-
56-
@Override
57-
public void onCommand(TextChannel channel, Member m, SlashCommandEvent e) {
58-
boolean preOrdersExist = getRoles().size() > 0;
59-
60-
if(!preOrdersExist) {
61-
e.replyEmbeds(
62-
new TechEmbedBuilder("Preorder Command - Error")
63-
.error()
64-
.text("Looks like there are currently no pre orders!")
65-
.build()
66-
).setEphemeral(true).queue();
67-
return;
68-
}
69-
70-
Member member = e.getOption("member") == null ? null : e.getOption("member").getAsMember();
71-
if(member == null) member = m;
72-
73-
Member finalSelectedMember = member;
74-
Preorder preorder = TechDiscordBot.getStorage().getPreorders(getRoles().get(0).replace(" Preorder", ""), false).stream().filter(po -> po.getDiscordId() == finalSelectedMember.getUser().getIdLong()).findFirst().orElse(null);
75-
76-
if(preorder == null) {
77-
e.replyEmbeds(
78-
new TechEmbedBuilder("Preorder Command - Error")
79-
.error()
80-
.text("Could not find a preorder that belongs to " + member.getAsMention() + "!")
81-
.build()
82-
).setEphemeral(true).queue();
83-
return;
84-
}
85-
86-
boolean showEmail = (e.getOption("show-email") != null && e.getOption("show-email").getAsBoolean()) && (preorder.getDiscordId() == member.getUser().getIdLong() || isStaff(member));
87-
boolean showTransactionId = (e.getOption("show-transaction-id") != null && e.getOption("show-transaction-id").getAsBoolean()) && (preorder.getDiscordId() == member.getUser().getIdLong() || isStaff(member));
88-
89-
Query<Emote> query = bot.getEmotes(preorder.getPlugin().replace(" ", ""));
90-
91-
e.replyEmbeds(
92-
new TechEmbedBuilder("Preorder - " + member.getEffectiveName() + "#" + member.getUser().getDiscriminator())
93-
.success()
94-
.field("Email", (showEmail ? preorder.getEmail() : obfuscateEmail(preorder.getEmail())), true)
95-
.field("Transaction ID", (showTransactionId ? preorder.getTransactionId() : obfuscateTransactionId(preorder.getTransactionId())), true)
96-
.field("Plugin", (query.hasAny() ? query.first().getAsMention() + " " : "") + preorder.getPlugin(), true)
97-
.field("Discord Name", preorder.getDiscordName() + " (" + member.getAsMention() + ")", true)
98-
.build()
99-
).queue();
100-
}
101-
102-
public String obfuscateEmail(String email) {
103-
if(email.equals("notAvailable") || email.equals("ManuallyAdded"))
104-
return "Unknown";
105-
106-
int index = email.indexOf("@");
107-
if(index == -1)
108-
return email;
109-
110-
StringBuilder length = new StringBuilder();
111-
for(int i = 0; i < index; i++)
112-
length.append("\\*");
113-
114-
StringBuilder sb = new StringBuilder(email);
115-
sb.replace(0, index, length.toString());
116-
117-
return sb.toString();
118-
}
119-
120-
public String obfuscateTransactionId(String transactionId) {
121-
if(transactionId.equals("NONE") || transactionId.equals("something"))
122-
return "Unknown";
123-
124-
StringBuilder sb = new StringBuilder(transactionId);
125-
126-
String length = IntStream.range(0, (int) (transactionId.length() / 1.5d)).mapToObj(i -> "\\*").collect(Collectors.joining());
127-
128-
sb.replace(0, (int)(transactionId.length() / 1.5d), length);
129-
130-
return sb.toString();
131-
}
132-
133-
public List<String> getRoles() {
134-
return TechDiscordBot.getJDA().getRoles().stream().map(Role::getName).filter(name -> name.endsWith(" Preorder")).collect(Collectors.toList());
135-
}
136-
137-
public boolean isStaff(Member member) {
138-
return member.getRoles().stream().anyMatch(role -> role.getName().equals("Staff"));
139-
}
140-
}
1+
//package me.TechsCode.TechDiscordBot.module.cmds;
2+
//
3+
//import me.TechsCode.TechDiscordBot.TechDiscordBot;
4+
//import me.TechsCode.TechDiscordBot.module.CommandModule;
5+
//import me.TechsCode.TechDiscordBot.mysql.storage.Preorder;
6+
//import me.TechsCode.TechDiscordBot.objects.Query;
7+
//import me.TechsCode.TechDiscordBot.util.TechEmbedBuilder;
8+
//import net.dv8tion.jda.api.entities.Emote;
9+
//import net.dv8tion.jda.api.entities.Member;
10+
//import net.dv8tion.jda.api.entities.Role;
11+
//import net.dv8tion.jda.api.entities.TextChannel;
12+
//import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
13+
//import net.dv8tion.jda.api.interactions.commands.OptionType;
14+
//import net.dv8tion.jda.api.interactions.commands.build.OptionData;
15+
//import net.dv8tion.jda.api.interactions.commands.privileges.CommandPrivilege;
16+
//
17+
//import java.util.List;
18+
//import java.util.stream.Collectors;
19+
//import java.util.stream.IntStream;
20+
//
21+
//public class PreorderCommand extends CommandModule {
22+
//
23+
// public PreorderCommand(TechDiscordBot bot) {
24+
// super(bot);
25+
// }
26+
//
27+
// @Override
28+
// public String getName() {
29+
// return "preorder";
30+
// }
31+
//
32+
// @Override
33+
// public String getDescription() {
34+
// return "Show a member's preorder.";
35+
// }
36+
//
37+
// @Override
38+
// public CommandPrivilege[] getCommandPrivileges() {
39+
// return new CommandPrivilege[0];
40+
// }
41+
//
42+
// @Override
43+
// public OptionData[] getOptions() {
44+
// return new OptionData[] {
45+
// new OptionData(OptionType.USER, "member", "View this member's preorder. (Default: You)"),
46+
// new OptionData(OptionType.BOOLEAN, "show-email", "Show the member's email? (Default: False)"),
47+
// new OptionData(OptionType.BOOLEAN, "show-transaction-id", "Show the transaction id? (Default: False)")
48+
// };
49+
// }
50+
//
51+
// @Override
52+
// public int getCooldown() {
53+
// return 3;
54+
// }
55+
//
56+
// @Override
57+
// public void onCommand(TextChannel channel, Member m, SlashCommandEvent e) {
58+
// boolean preOrdersExist = getRoles().size() > 0;
59+
//
60+
// if(!preOrdersExist) {
61+
// e.replyEmbeds(
62+
// new TechEmbedBuilder("Preorder Command - Error")
63+
// .error()
64+
// .text("Looks like there are currently no pre orders!")
65+
// .build()
66+
// ).setEphemeral(true).queue();
67+
// return;
68+
// }
69+
//
70+
// Member member = e.getOption("member") == null ? null : e.getOption("member").getAsMember();
71+
// if(member == null) member = m;
72+
//
73+
// Member finalSelectedMember = member;
74+
// Preorder preorder = TechDiscordBot.getStorage().getPreorders(getRoles().get(0).replace(" Preorder", ""), false).stream().filter(po -> po.getDiscordId() == finalSelectedMember.getUser().getIdLong()).findFirst().orElse(null);
75+
//
76+
// if(preorder == null) {
77+
// e.replyEmbeds(
78+
// new TechEmbedBuilder("Preorder Command - Error")
79+
// .error()
80+
// .text("Could not find a preorder that belongs to " + member.getAsMention() + "!")
81+
// .build()
82+
// ).setEphemeral(true).queue();
83+
// return;
84+
// }
85+
//
86+
// boolean showEmail = (e.getOption("show-email") != null && e.getOption("show-email").getAsBoolean()) && (preorder.getDiscordId() == member.getUser().getIdLong() || isStaff(member));
87+
// boolean showTransactionId = (e.getOption("show-transaction-id") != null && e.getOption("show-transaction-id").getAsBoolean()) && (preorder.getDiscordId() == member.getUser().getIdLong() || isStaff(member));
88+
//
89+
// Query<Emote> query = bot.getEmotes(preorder.getPlugin().replace(" ", ""));
90+
//
91+
// e.replyEmbeds(
92+
// new TechEmbedBuilder("Preorder - " + member.getEffectiveName() + "#" + member.getUser().getDiscriminator())
93+
// .success()
94+
// .field("Email", (showEmail ? preorder.getEmail() : obfuscateEmail(preorder.getEmail())), true)
95+
// .field("Transaction ID", (showTransactionId ? preorder.getTransactionId() : obfuscateTransactionId(preorder.getTransactionId())), true)
96+
// .field("Plugin", (query.hasAny() ? query.first().getAsMention() + " " : "") + preorder.getPlugin(), true)
97+
// .field("Discord Name", preorder.getDiscordName() + " (" + member.getAsMention() + ")", true)
98+
// .build()
99+
// ).queue();
100+
// }
101+
//
102+
// public String obfuscateEmail(String email) {
103+
// if(email.equals("notAvailable") || email.equals("ManuallyAdded"))
104+
// return "Unknown";
105+
//
106+
// int index = email.indexOf("@");
107+
// if(index == -1)
108+
// return email;
109+
//
110+
// StringBuilder length = new StringBuilder();
111+
// for(int i = 0; i < index; i++)
112+
// length.append("\\*");
113+
//
114+
// StringBuilder sb = new StringBuilder(email);
115+
// sb.replace(0, index, length.toString());
116+
//
117+
// return sb.toString();
118+
// }
119+
//
120+
// public String obfuscateTransactionId(String transactionId) {
121+
// if(transactionId.equals("NONE") || transactionId.equals("something"))
122+
// return "Unknown";
123+
//
124+
// StringBuilder sb = new StringBuilder(transactionId);
125+
//
126+
// String length = IntStream.range(0, (int) (transactionId.length() / 1.5d)).mapToObj(i -> "\\*").collect(Collectors.joining());
127+
//
128+
// sb.replace(0, (int)(transactionId.length() / 1.5d), length);
129+
//
130+
// return sb.toString();
131+
// }
132+
//
133+
// public List<String> getRoles() {
134+
// return TechDiscordBot.getJDA().getRoles().stream().map(Role::getName).filter(name -> name.endsWith(" Preorder")).collect(Collectors.toList());
135+
// }
136+
//
137+
// public boolean isStaff(Member member) {
138+
// return member.getRoles().stream().anyMatch(role -> role.getName().equals("Staff"));
139+
// }
140+
//}

‎src/main/java/me/TechsCode/TechDiscordBot/module/cmds/PruneCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ public void onCommand(TextChannel channel, Member m, SlashCommandEvent e) {
7171

7272
@SubscribeEvent
7373
public void onButtonClick(ButtonClickEvent event) {
74-
if(!event.getComponentId().contains(":")) return;
7574
String[] id = event.getComponentId().split(":");
7675

7776
String authorId = id[0];

0 commit comments

Comments
 (0)