Skip to content
This repository was archived by the owner on Mar 5, 2023. It is now read-only.

Commit a0af1a9

Browse files
greg6775greg6775
authored
Merge pull request #96 from BigBotNetwork/greg-dev
Greg dev
2 parents f51f470 + c0d25b7 commit a0af1a9

14 files changed

Lines changed: 223 additions & 122 deletions

‎src/main/java/com/bbn/hadder/Hadder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private static void startBot() {
5252
new GifCommand(),
5353
new ClearCommand(),
5454
new GitHubCommand(),
55-
new ScreenshareCommand(),
55+
new ScreenShareCommand(),
5656
new RebootCommand(),
5757
new EqualsCommand(),
5858
new InviteCommand(),
@@ -71,6 +71,7 @@ private static void startBot() {
7171
new RulesCommand(),
7272
new FeedbackCommand(),
7373
new AvatarCommand(),
74+
new EvalCommand(),
7475
new LinkCommand()), config, helpCommand);
7576

7677
builder.addEventListeners(

‎src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ public void executed(String[] args, CommandEvent event) {
6868
}
6969
}
7070
} else {
71-
event.getTextChannel().sendMessage("SOON").queue();
71+
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder()
72+
.setTitle("Connect you GH account"))
73+
.setDescription("[Please connect your GitHub account here](https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")
74+
.build()).queue();
7275
}
7376
}
7477

‎src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ public class InviteCommand implements Command {
1515
@Override
1616
public void executed(String[] args, CommandEvent event) {
1717
EmbedBuilder builder = new EmbedBuilder();
18-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)").build()).queue();
18+
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder)
19+
.setTitle("Invite me!")
20+
.setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)")
21+
.build()).queue();
1922
}
2023

2124
@Override

src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java renamed to src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
import java.util.List;
1111

12-
public class ScreenshareCommand implements Command {
12+
public class ScreenShareCommand implements Command {
13+
1314
@Override
1415
public void executed(String[] args, CommandEvent event) {
1516
if (args.length>0) {

‎src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public void executed(String[] args, CommandEvent event) {
3636
EmbedBuilder builder = new EmbedBuilder();
3737
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).queue();
3838
} catch (NumberFormatException e) {
39-
EmbedBuilder builder = new EmbedBuilder();
40-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to specify a number!").build()).queue();
4139
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
4240
}
4341
} else {
@@ -49,8 +47,6 @@ public void executed(String[] args, CommandEvent event) {
4947
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue();
5048
}
5149
} else {
52-
EmbedBuilder builder = new EmbedBuilder();
53-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to specify a number!").build()).queue();
5450
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
5551
}
5652
}

‎src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public void executed(String[] args, CommandEvent event) {
2424
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue();
2525
}
2626
} else {
27-
EmbedBuilder builder = new EmbedBuilder();
28-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to set a prefix.").build()).queue();
2927
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
3028
}
3129
} else {

‎src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ public void executed(String[] args, CommandEvent event) {
3838
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You can't kick yourself.").build()).queue();
3939
}
4040
} else if (event.getMessage().getMentionedMembers().size() == 0) {
41-
EmbedBuilder builder = new EmbedBuilder();
42-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue();
4341
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
4442
} else if (event.getMessage().getMentionedMembers().size() > 1) {
4543
for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {

‎src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public void executed(String[] args, CommandEvent event) {
3131
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue();
3232
}
3333
} else {
34-
EmbedBuilder builder = new EmbedBuilder();
35-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setTitle("Missing arguments").setDescription("You have to specify a new nickname for the user(s).").build()).queue();
3634
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
3735
}
3836
} else {
@@ -51,8 +49,6 @@ public void executed(String[] args, CommandEvent event) {
5149
}
5250
}
5351
} else if (event.getMessage().getMentionedMembers().size() == 0) {
54-
EmbedBuilder builder = new EmbedBuilder();
55-
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue();
5652
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
5753
} else {
5854
for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {

0 commit comments

Comments
 (0)