greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Some code improvements again

Browse source
This commit is contained in:
GregTCLTK 2020-01-01 16:49:08 +01:00
parent 51b3e76fb8
commit 0d0b8affbc
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
8 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
example-config.json
View file

@ -19,7 +19,8 @@
"DiscordExtremeList": "",
"DiscordBotReviews": "",
"DiscordBots": "",
"BotListSpace": ""
"BotListSpace": "",
"DiscordBots2": ""
},
"Clyde": ""
}

2
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -92,7 +92,7 @@ public class Hadder {
new LanguageCommand(),
new ClydeCommand(),
new PlayCommand(),
new StarBoardCommand(),
new StarboardCommand(),
new QueueCommand(),
new InfoCommand(),
new SkipCommand(),

4
src/main/java/com/bbn/hadder/Rethink.java
View file

@ -144,11 +144,11 @@ public class Rethink {
return (String) this.get("user", "id", id, "blacklisted");
}
public void setNeededstars(String stars, String guild_id) {
public void setNeededStars(String stars, String guild_id) {
this.update("server", guild_id, "neededstars", stars);
}
public String getNeededstars(String guild_id) {
public String getNeededStars(String guild_id) {
return (String) this.get("server", "id", guild_id, "neededstars");
}

4
src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java → src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
View file

@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.TextChannel;
public class StarBoardCommand implements Command {
public class StarboardCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
@ -29,7 +29,7 @@ public class StarBoardCommand implements Command {
}
if (args.length==2) {
event.getRethink().setNeededstars(args[1], event.getGuild().getId());
event.getRethink().setNeededStars(args[1], event.getGuild().getId());
}
}

14
src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
View file

@ -31,7 +31,7 @@ public class BlacklistCommand implements Command {
Member member = event.getMessage().getMentionedMembers().get(0);
String blacklisted = event.getRethink().getBlackListed(member.getId());
List<String> commands = new ArrayList<>();
if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
commands.addAll(Arrays.asList(args[1].split(",")));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
@ -45,12 +45,13 @@ public class BlacklistCommand implements Command {
.build()).queue();
}
break;
case "remove":
if (args.length == 3) {
Member member = event.getMessage().getMentionedMembers().get(0);
String blacklisted = event.getRethink().getBlackListed(member.getId());
List<String> commands = new ArrayList<>();
if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
commands.removeAll(Arrays.asList(args[1].split(",")));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
@ -64,12 +65,13 @@ public class BlacklistCommand implements Command {
.build()).queue();
}
break;
case "list":
StringBuilder stringBuilder = new StringBuilder();
for (User user : event.getJDA().getUsers()) {
if (!user.getId().equals(event.getJDA().getSelfUser().getId())) {
String blacklisted = event.getRethink().getBlackListed(user.getId());
if (!blacklisted.equals("none")) {
if (!"none".equals(blacklisted)) {
stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
}
}
@ -80,6 +82,10 @@ public class BlacklistCommand implements Command {
.setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users")
.build()).queue();
break;
default:
event.getHelpCommand().sendHelp(this, event);
break;
}
}
}
@ -101,6 +107,6 @@ public class BlacklistCommand implements Command {
@Override
public String example() {
return "add porn @Skidder";
return "add solo @Skidder";
}
}

2
src/main/java/com/bbn/hadder/core/CommandHandler.java
View file

@ -50,7 +50,7 @@ public class CommandHandler {
boolean run = true;
String blacklisted = rethink.getBlackListed(event.getAuthor().getId());
if (!blacklisted.equals("none")) {
if (!"none".equals(blacklisted)) {
for (String blacklistedlabel : blacklisted.split(",")) {
if (Arrays.asList(cmd.labels()).contains(blacklistedlabel)) {
run = false;

4
src/main/java/com/bbn/hadder/listener/StarboardListener.java
View file

@ -43,7 +43,7 @@ public class StarboardListener extends ListenerAdapter {
}
}
if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) {
if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) {
event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
.sendMessage(new MessageBuilder()
.setContent("⭐ 1" + " " + event.getTextChannel().getAsMention())
@ -77,7 +77,7 @@ public class StarboardListener extends ListenerAdapter {
.retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue(
msg2 -> {
if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) {
if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) {
msg2.editMessage(new MessageBuilder()
.setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention())
.setEmbed(

4
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -36,8 +36,8 @@ public class MessageEditor {
String description, String description_extra, String description_extra_two) {
String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
EmbedBuilder eb = this.getDefaultSettings(type);
if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
return eb;
}