commit
7c2c6faeef
60 changed files with 886 additions and 742 deletions
6
pom.xml
6
pom.xml
|
|
@ -25,7 +25,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.dv8tion</groupId>
|
<groupId>net.dv8tion</groupId>
|
||||||
<artifactId>JDA</artifactId>
|
<artifactId>JDA</artifactId>
|
||||||
<version>4.0.0_73</version>
|
<version>4.0.0_79</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.json</groupId>
|
<groupId>org.json</groupId>
|
||||||
|
|
@ -45,12 +45,12 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>1.7.29</version>
|
<version>1.7.30</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-simple</artifactId>
|
<artifactId>slf4j-simple</artifactId>
|
||||||
<version>1.7.29</version>
|
<version>1.7.30</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>club.minnced</groupId>
|
<groupId>club.minnced</groupId>
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,6 @@ public class Hadder {
|
||||||
new GifCommand(),
|
new GifCommand(),
|
||||||
new ClearCommand(),
|
new ClearCommand(),
|
||||||
new GitHubCommand(),
|
new GitHubCommand(),
|
||||||
new ScreenShareCommand(),
|
|
||||||
new RebootCommand(),
|
new RebootCommand(),
|
||||||
new EqualsCommand(),
|
new EqualsCommand(),
|
||||||
new InviteCommand(),
|
new InviteCommand(),
|
||||||
|
|
@ -88,17 +87,17 @@ public class Hadder {
|
||||||
new RegionChangeCommand(),
|
new RegionChangeCommand(),
|
||||||
new AboutCommand(),
|
new AboutCommand(),
|
||||||
new LanguageCommand(),
|
new LanguageCommand(),
|
||||||
new LinkCommand()), config, helpCommand);
|
new SetStarBoardCommand()), config, helpCommand);
|
||||||
|
|
||||||
builder.addEventListeners(
|
builder.addEventListeners(
|
||||||
new MentionListener(rethink),
|
new MentionListener(rethink),
|
||||||
new PrivateMessageListener(),
|
new PrivateMessageListener(rethink),
|
||||||
new CommandListener(rethink, commandHandler),
|
new CommandListener(rethink, commandHandler),
|
||||||
new GuildListener(rethink, config),
|
new GuildListener(rethink, config),
|
||||||
new ReadyListener(rethink, config),
|
new ReadyListener(rethink, config),
|
||||||
// new LinkListener(rethink),
|
|
||||||
new InviteLinkListener(rethink),
|
new InviteLinkListener(rethink),
|
||||||
new RulesListener(rethink));
|
new RulesListener(rethink),
|
||||||
|
new StarboardListener(rethink));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
shardManager = builder.build();
|
shardManager = builder.build();
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,12 @@ public class Rethink {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object get(String table, String where, String value, String column) {
|
public Object get(String table, String where, String value, String column) {
|
||||||
return this.getAsArray(table, where, value).getJSONObject(0).get(column);
|
JSONArray array = this.getAsArray(table, where, value);
|
||||||
|
if (array.length()>0)
|
||||||
|
if (array.getJSONObject(0).has(column))
|
||||||
|
return array.getJSONObject(0).get(column);
|
||||||
|
else return null;
|
||||||
|
else return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String update(String table, String wherevalue, String what, String whatvalue) {
|
public String update(String table, String wherevalue, String what, String whatvalue) {
|
||||||
|
|
@ -92,7 +97,11 @@ public class Rethink {
|
||||||
} catch (ReqlOpFailedError e) {
|
} catch (ReqlOpFailedError e) {
|
||||||
System.out.println(e.getMessage());
|
System.out.println(e.getMessage());
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
r.tableCreate("stars").run(conn);
|
||||||
|
} catch (ReqlOpFailedError e) {
|
||||||
|
System.out.println(e.getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUserPrefix(String prefix, String userid) {
|
public void setUserPrefix(String prefix, String userid) {
|
||||||
|
|
@ -111,45 +120,53 @@ public class Rethink {
|
||||||
return (String) this.get("server", "id", id, "prefix");
|
return (String) this.get("server", "id", id, "prefix");
|
||||||
}
|
}
|
||||||
|
|
||||||
public JSONArray getLinks(String id) {
|
|
||||||
return new JSONArray((String) this.get("server", "id", id, "links"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addLinkedGuild(String guildid, String linkid) {
|
|
||||||
JSONArray links = getLinks(guildid);
|
|
||||||
for (int i = 0; links.length()>i; i++) {
|
|
||||||
if (links.getString(i).equals(linkid)) return;
|
|
||||||
}
|
|
||||||
this.update("server", guildid, "links", this.getLinks(guildid).put(linkid).toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
public String removeLinkedGuild(String guildid, String linkid) {
|
|
||||||
JSONArray linkedguildslist = this.getLinks(guildid);
|
|
||||||
for (int i = 0; linkedguildslist.length()>i; i++) {
|
|
||||||
if (linkedguildslist.getString(i).equals(linkid)) {
|
|
||||||
linkedguildslist.remove(i);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return this.update("server", guildid, "links", linkedguildslist.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLinkChannel(String guildid, String channelid) {
|
|
||||||
this.update("server", guildid, "linkchannel", channelid);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getLinkChannel(String guildid) {
|
|
||||||
return (String) this.get("server", "id", guildid, "linkchannel");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void insertGuild(String id) {
|
public void insertGuild(String id) {
|
||||||
this.insert("server", r.hashMap("id", id).with("prefix", "h.").with("links", "[]").with("linkchannel", "").with("message_id", "").with("role_id", "").with("invite_detect", false));
|
this.insert("server", r.hashMap("id", id)
|
||||||
|
.with("prefix", "h.")
|
||||||
|
.with("message_id", "")
|
||||||
|
.with("role_id", "")
|
||||||
|
.with("invite_detect", false)
|
||||||
|
.with("starboard", "")
|
||||||
|
.with("neededstars", "4")
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void insertUser(String id) {
|
public void insertUser(String id) {
|
||||||
this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en"));
|
this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setNeededstars(String stars, String guildid) {
|
||||||
|
this.update("server", guildid, "neededstars", stars);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNeededstars(String guildid) {
|
||||||
|
return (String) this.get("server", "id", guildid, "neededstars");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStarboardChannel(String guildid, String channelid) {
|
||||||
|
this.update("server", guildid, "starboard", channelid);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStarboardChannel(String guildid) {
|
||||||
|
return (String) this.get("server", "id", guildid, "starboard");
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasStarboardChannel(String guildid) {
|
||||||
|
return !this.get("server", "id", guildid, "starboard").equals("");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void insertStarboardMessage(String messageid, String guildid, String starboardmessageid) {
|
||||||
|
this.insert("stars", r.hashMap("msg", messageid).with("guild", guildid).with("starboardmsg", starboardmessageid));
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStarboardMessage(String messageid) {
|
||||||
|
return (String) this.get("stars", "msg", messageid, "starboardmsg");
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasStarboardMessage(String messageid) {
|
||||||
|
return this.get("stars", "msg", messageid, "guild") != null;
|
||||||
|
}
|
||||||
|
|
||||||
public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) {
|
public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) {
|
||||||
this.update("server", guild_id, "message_id", message_id);
|
this.update("server", guild_id, "message_id", message_id);
|
||||||
this.update("server", guild_id, "role_id", role_id);
|
this.update("server", guild_id, "role_id", role_id);
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import com.bbn.hadder.Rethink;
|
||||||
import com.bbn.hadder.commands.general.HelpCommand;
|
import com.bbn.hadder.commands.general.HelpCommand;
|
||||||
import com.bbn.hadder.core.CommandHandler;
|
import com.bbn.hadder.core.CommandHandler;
|
||||||
import com.bbn.hadder.core.Config;
|
import com.bbn.hadder.core.Config;
|
||||||
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
import net.dv8tion.jda.api.JDA;
|
import net.dv8tion.jda.api.JDA;
|
||||||
import net.dv8tion.jda.api.entities.Message;
|
import net.dv8tion.jda.api.entities.Message;
|
||||||
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
||||||
|
|
@ -16,21 +17,15 @@ public class CommandEvent extends MessageReceivedEvent {
|
||||||
private Config config;
|
private Config config;
|
||||||
private CommandHandler commandHandler;
|
private CommandHandler commandHandler;
|
||||||
private HelpCommand helpCommand;
|
private HelpCommand helpCommand;
|
||||||
|
private MessageEditor messageEditor;
|
||||||
|
|
||||||
public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Config config, Rethink rethink, CommandHandler commandHandler, HelpCommand helpCommand) {
|
public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor) {
|
||||||
super(api, responseNumber, message);
|
super(api, responseNumber, message);
|
||||||
this.config = config;
|
|
||||||
this.rethink = rethink;
|
|
||||||
this.commandHandler = commandHandler;
|
|
||||||
this.helpCommand = helpCommand;
|
|
||||||
}
|
|
||||||
|
|
||||||
public CommandEvent(@Nonnull MessageReceivedEvent event, Config config, Rethink rethink, CommandHandler commandHandler, HelpCommand helpCommand) {
|
|
||||||
super(event.getJDA(), event.getResponseNumber(), event.getMessage());
|
|
||||||
this.config = config;
|
|
||||||
this.rethink = rethink;
|
this.rethink = rethink;
|
||||||
|
this.config = config;
|
||||||
this.commandHandler = commandHandler;
|
this.commandHandler = commandHandler;
|
||||||
this.helpCommand = helpCommand;
|
this.helpCommand = helpCommand;
|
||||||
|
this.messageEditor = messageEditor;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Rethink getRethink() {
|
public Rethink getRethink() {
|
||||||
|
|
@ -48,4 +43,8 @@ public class CommandEvent extends MessageReceivedEvent {
|
||||||
public CommandHandler getCommandHandler() {
|
public CommandHandler getCommandHandler() {
|
||||||
return commandHandler;
|
return commandHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MessageEditor getMessageEditor() {
|
||||||
|
return messageEditor;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,22 +15,35 @@ public class AvatarCommand implements Command {
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
Member member = event.getMember();
|
Member member = event.getMember();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag()))
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.fun.avatar.success.title",
|
||||||
|
member.getUser().getAsTag())
|
||||||
.setImage(member.getUser().getAvatarUrl())
|
.setImage(member.getUser().getAvatarUrl())
|
||||||
.setFooter(member.getUser().getAsTag())
|
.setFooter(member.getUser().getAsTag())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} else if (event.getMessage().getMentionedMembers().size() == 1) {
|
} else if (event.getMessage().getMentionedMembers().size() == 1) {
|
||||||
Member member = event.getMessage().getMentionedMembers().get(0);
|
Member member = event.getMessage().getMentionedMembers().get(0);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag()))
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.fun.avatar.success.title",
|
||||||
|
member.getUser().getAsTag(),
|
||||||
|
"",
|
||||||
|
"")
|
||||||
.setImage(member.getUser().getAvatarUrl())
|
.setImage(member.getUser().getAvatarUrl())
|
||||||
.setFooter(member.getUser().getAsTag())
|
.setFooter(member.getUser().getAsTag())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} else if (args[0].length() == 18){
|
} else if (args[0].length() == 18){
|
||||||
Member member = event.getGuild().getMemberById(args[0]);
|
Member member = event.getGuild().getMemberById(args[0]);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag()))
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.fun.avatar.success.title",
|
||||||
|
member.getUser().getAsTag(),
|
||||||
|
"",
|
||||||
|
"")
|
||||||
.setImage(member.getUser().getAvatarUrl())
|
.setImage(member.getUser().getAvatarUrl())
|
||||||
.setFooter(member.getUser().getAsTag())
|
.setFooter(member.getUser().getAsTag())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -46,7 +59,7 @@ public class AvatarCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.fun.avatar.help.description");
|
return "commands.fun.avatar.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,11 @@ public class GifCommand implements Command {
|
||||||
String url = array.getJSONObject(gifIndex).get("url").toString();
|
String url = array.getJSONObject(gifIndex).get("url").toString();
|
||||||
event.getTextChannel().sendMessage(url).queue();
|
event.getTextChannel().sendMessage(url).queue();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.gif.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.ERROR,
|
||||||
|
"error",
|
||||||
|
"commands.fun.gif.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else event.getHelpCommand().sendHelp(this, event);
|
} else event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
|
|
@ -49,7 +53,7 @@ public class GifCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.fun.gif.help.description");
|
return "commands.fun.gif.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -27,15 +27,18 @@ public class MemeCommand implements Command {
|
||||||
Response response = client.newCall(request).execute();
|
Response response = client.newCall(request).execute();
|
||||||
JSONObject json = new JSONObject(response.body().string());
|
JSONObject json = new JSONObject(response.body().string());
|
||||||
String url = json.get("image").toString();
|
String url = json.get("image").toString();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.success.title"))
|
event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
|
||||||
|
"commands.fun.meme.success.title", "")
|
||||||
.setImage(url)
|
.setImage(url)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.api.error"))
|
MessageEditor.MessageType.ERROR,
|
||||||
|
"error",
|
||||||
|
"commands.fun.meme.api.error")
|
||||||
.setColor(Color.RED)
|
.setColor(Color.RED)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
@ -48,7 +51,7 @@ public class MemeCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.fun.meme.help.description");
|
return "commands.fun.meme.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,12 @@ public class AboutCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.description"))
|
MessageEditor.MessageType.INFO,
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.title"), MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:"), true)
|
"commands.general.about.success.title",
|
||||||
|
"commands.general.about.success.description")
|
||||||
|
.addField(event.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), event.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", ""), true)
|
||||||
.setThumbnail("https://bigbotnetwork.com/images/Hadder.png")
|
.setThumbnail("https://bigbotnetwork.com/images/Hadder.png")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
@ -27,7 +29,7 @@ public class AboutCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.general.about.help.description");
|
return "commands.general.about.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -14,24 +14,25 @@ public class EqualsCommand implements Command {
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
event.getChannel().sendMessage(
|
event.getChannel().sendMessage(
|
||||||
new MessageEditor()
|
event.getMessageEditor().getMessage(
|
||||||
.setDefaultSettings(MessageEditor.MessageType.INFO)
|
MessageEditor.MessageType.INFO,
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first.request"))
|
"commands.general.equals.string.first.request", "")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(msgevent -> {
|
new EventWaiter().newOnMessageEventWaiter(msgevent -> {
|
||||||
String firstString = msgevent.getMessage().getContentRaw();
|
String firstString = msgevent.getMessage().getContentRaw();
|
||||||
event.getChannel().sendMessage(
|
event.getChannel().sendMessage(
|
||||||
new MessageEditor()
|
event.getMessageEditor().getMessage(
|
||||||
.setDefaultSettings(
|
MessageEditor.MessageType.INFO,
|
||||||
MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second.request")).build()).queue();
|
"commands.general.equals.string.second.request",
|
||||||
|
"").build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(msgevent2 -> {
|
new EventWaiter().newOnMessageEventWaiter(msgevent2 -> {
|
||||||
String secondString = msgevent2.getMessage().getContentRaw();
|
String secondString = msgevent2.getMessage().getContentRaw();
|
||||||
event.getChannel().sendMessage(
|
event.getChannel().sendMessage(
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle((firstString.equals(secondString)) ? MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.true") : MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.false"))
|
.setTitle((firstString.equals(secondString)) ? event.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : event.getMessageEditor().getTerm( "commands.general.equals.string.equals.false"))
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first"), firstString, false)
|
.addField(event.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second"), secondString, false)
|
.addField(event.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
|
.addField(event.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
|
|
@ -44,7 +45,7 @@ public class EqualsCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.general.equals.help.description");
|
return "commands.general.equals.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,8 @@ public class HelpCommand implements Command {
|
||||||
}
|
}
|
||||||
EmbedBuilder eb = new EmbedBuilder();
|
EmbedBuilder eb = new EmbedBuilder();
|
||||||
for (Map.Entry<String, ArrayList<Command>> entry : hashMap.entrySet()) {
|
for (Map.Entry<String, ArrayList<Command>> entry : hashMap.entrySet()) {
|
||||||
if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
|
if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") ||
|
||||||
|
event.getAuthor().getId().equals("261083609148948488")))) {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
for (int i = 0; i < entry.getValue().size(); i++) {
|
for (int i = 0; i < entry.getValue().size(); i++) {
|
||||||
Command cmd = entry.getValue().get(i);
|
Command cmd = entry.getValue().get(i);
|
||||||
|
|
@ -39,7 +40,7 @@ public class HelpCommand implements Command {
|
||||||
eb.addField(ps[ps.length - 1], sb.toString(), false);
|
eb.addField(ps[ps.length - 1], sb.toString(), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO);
|
event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO);
|
||||||
event.getChannel().sendMessage(eb.build()).queue();
|
event.getChannel().sendMessage(eb.build()).queue();
|
||||||
} else {
|
} else {
|
||||||
for (Command cmd : event.getCommandHandler().getCommandList()) {
|
for (Command cmd : event.getCommandHandler().getCommandList()) {
|
||||||
|
|
@ -51,19 +52,21 @@ public class HelpCommand implements Command {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.error.description")).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getTerm("commands.general.help.error.description")).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendHelp(Command cmd, CommandEvent event) {
|
public void sendHelp(Command cmd, CommandEvent event) {
|
||||||
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
|
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
|
||||||
(event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
|
(event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
|
||||||
EmbedBuilder eb = new EmbedBuilder();
|
|
||||||
String name = cmd.labels()[0];
|
String name = cmd.labels()[0];
|
||||||
eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase()));
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
eb.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.field.usage"), event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false);
|
MessageEditor.MessageType.INFO, "", cmd.description())
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO);
|
.setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase()))
|
||||||
event.getChannel().sendMessage(eb.build()).queue();
|
.addField(MessageEditor.getTerm(event, "commands.general.help.field.usage", "", ""),
|
||||||
|
event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + event.getMessageEditor().getTerm(cmd.usage()), false)
|
||||||
|
.build()).queue();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -74,11 +77,11 @@ public class HelpCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.general.help.help.description");
|
return "commands.general.help.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "commands.general.help.help.label");
|
return "commands.general.help.help.label";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,15 @@ public class InviteCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.description", "(https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.general.invite.success.title",
|
||||||
|
"",
|
||||||
|
"commands.general.invite.success.description",
|
||||||
|
"(https://discordapp.com/oauth2/authorize?client_id="
|
||||||
|
+ Hadder.shardManager.getGuilds().get(0).getSelfMember().getId()
|
||||||
|
+ "&scope=bot&permissions=470133879)")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -26,7 +32,7 @@ public class InviteCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.general.invite.help.description");
|
return "commands.general.invite.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ public class PingCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(new MessageEditor()
|
event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(event.getMessageEditor()
|
||||||
.setDefaultSettings(MessageEditor.MessageType.INFO)
|
.getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Ping")
|
.setTitle("Ping")
|
||||||
.setDescription(String.valueOf(ping))
|
.setDescription(String.valueOf(ping))
|
||||||
.build()).queue());
|
.build()).queue());
|
||||||
|
|
@ -26,7 +26,7 @@ public class PingCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.general.ping.help.description");
|
return "commands.general.ping.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -18,15 +18,18 @@ public class FeedbackCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.description"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.misc.feedback.title.request.title",
|
||||||
|
"commands.misc.feedback.title.request.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event1 -> {
|
new EventWaiter().newOnMessageEventWaiter(event1 -> {
|
||||||
String title = event1.getMessage().getContentDisplay();
|
String title = event1.getMessage().getContentDisplay();
|
||||||
event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event1.getChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.title"))
|
MessageEditor.MessageType.INFO,
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.description"))
|
"commands.misc.feedback.description.request.title",
|
||||||
|
"commands.misc.feedback.description.request.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event2 -> {
|
new EventWaiter().newOnMessageEventWaiter(event2 -> {
|
||||||
String description = event2.getMessage().getContentDisplay();
|
String description = event2.getMessage().getContentDisplay();
|
||||||
|
|
@ -34,8 +37,11 @@ public class FeedbackCommand implements Command {
|
||||||
GitHub connection = GitHub.connectUsingOAuth(event.getConfig().getGitHubToken());
|
GitHub connection = GitHub.connectUsingOAuth(event.getConfig().getGitHubToken());
|
||||||
GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder");
|
GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder");
|
||||||
GHIssue issue = Hadder.createIssue(title).body("<strong>Feedback by " + event.getAuthor().getAsTag() + "</strong><br>" + description).label("feedback").create();
|
GHIssue issue = Hadder.createIssue(title).body("<strong>Feedback by " + event.getAuthor().getAsTag() + "</strong><br>" + description).label("feedback").create();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.misc.feedback.success.title",
|
||||||
|
"")
|
||||||
.setDescription(issue.getHtmlUrl().toString())
|
.setDescription(issue.getHtmlUrl().toString())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
|
@ -53,7 +59,7 @@ public class FeedbackCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.misc.feedback.help.description");
|
return "commands.misc.feedback.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,14 @@ public class GitHubCommand implements Command {
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
if (args.length > 0) {
|
if (args.length > 0) {
|
||||||
if (args[0].equals("link")) {
|
if (args[0].equals("link")) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.link.title")).setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.misc.github.link.title",
|
||||||
|
"")
|
||||||
|
.setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942")
|
||||||
|
.build()
|
||||||
|
).queue();
|
||||||
} else {
|
} else {
|
||||||
Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build();
|
Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build();
|
||||||
try {
|
try {
|
||||||
|
|
@ -44,28 +51,38 @@ public class GitHubCommand implements Command {
|
||||||
|
|
||||||
if (!json.getString("blog").equals("")) website = json.getString("blog");
|
if (!json.getString("blog").equals("")) website = json.getString("blog");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.title", nickname + " (" + args[0] + ")"), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
|
.setAuthor(event.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
|
||||||
.setThumbnail(json.getString("avatar_url"))
|
.setThumbnail(json.getString("avatar_url"))
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.bio"), bio, false)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.location"), location, true)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.website"), website, true)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
|
.addField(event.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
||||||
} catch (IOException | NullPointerException e) {
|
} catch (IOException | NullPointerException e) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.api.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.ERROR,
|
||||||
|
"",
|
||||||
|
"commands.misc.github.api.error.description")
|
||||||
|
.build()
|
||||||
|
).queue();
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.user.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "","commands.misc.github.user.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.description", "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.misc.github.connect.title",
|
||||||
|
"",
|
||||||
|
"commands.misc.github.connect.description",
|
||||||
|
"(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -77,11 +94,11 @@ public class GitHubCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.misc.github.help.description");
|
return "commands.misc.github.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "username");
|
return "username";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ import com.bbn.hadder.commands.Command;
|
||||||
import com.bbn.hadder.commands.CommandEvent;
|
import com.bbn.hadder.commands.CommandEvent;
|
||||||
import com.bbn.hadder.utils.EventWaiter;
|
import com.bbn.hadder.utils.EventWaiter;
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
|
import com.bbn.hadder.utils.MessageEditor.MessageType;
|
||||||
|
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.entities.VoiceChannel;
|
import net.dv8tion.jda.api.entities.VoiceChannel;
|
||||||
|
|
||||||
|
|
@ -18,15 +20,14 @@ public class ScreenShareCommand implements Command {
|
||||||
for (VoiceChannel vc : event.getGuild().getVoiceChannels()) {
|
for (VoiceChannel vc : event.getGuild().getVoiceChannels()) {
|
||||||
try {
|
try {
|
||||||
if (vc.getIdLong() == Long.parseLong(args[0])) {
|
if (vc.getIdLong() == Long.parseLong(args[0])) {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.misc.screenshare.success.title", "")
|
||||||
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue();
|
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue();
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title"))
|
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.description")).build()).queue();
|
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -34,42 +35,33 @@ public class ScreenShareCommand implements Command {
|
||||||
} else {
|
} else {
|
||||||
List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
|
List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
|
||||||
if (vcs.size() > 1) {
|
if (vcs.size() > 1) {
|
||||||
EmbedBuilder eb = new EmbedBuilder()
|
EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.ERROR, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.title"))
|
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.description"));
|
|
||||||
for (int i = 0; i < vcs.size(); i++) {
|
for (int i = 0; i < vcs.size(); i++) {
|
||||||
VoiceChannel voiceChannel = vcs.get(i);
|
VoiceChannel voiceChannel = vcs.get(i);
|
||||||
eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
|
eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
|
||||||
}
|
}
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).build()).queue();
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(msgevent -> {
|
new EventWaiter().newOnMessageEventWaiter(msgevent -> {
|
||||||
try {
|
try {
|
||||||
int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
|
int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
|
||||||
if (vcs.size() > i) {
|
if (vcs.size() > i) {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title"))
|
|
||||||
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
|
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue();
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.title")).build()).queue();
|
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue();
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title"))
|
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.description")).build()).queue();
|
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
} else if (vcs.size()==0) {
|
} else if (vcs.size()==0) {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.error"))
|
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.description")).build()).queue();
|
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
} else {
|
} else {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title"))
|
|
||||||
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
|
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -85,11 +77,11 @@ public class ScreenShareCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.misc.screenshare.help.description");
|
return "commands.misc.screenshare.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "vc-name/id");
|
return "vc-name/id";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,15 +21,29 @@ public class BanCommand implements Command {
|
||||||
if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
|
if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
|
||||||
if (event.getGuild().getSelfMember().canInteract(victim)) {
|
if (event.getGuild().getSelfMember().canInteract(victim)) {
|
||||||
event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.title"), "✅").setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.description", victim.getUser().getName() + ".")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.ban.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.ban.success.description",
|
||||||
|
victim.getUser().getName() + ".").build()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.myself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.ban.error.title",
|
||||||
|
"commands.moderation.ban.myself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.yourself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage
|
||||||
|
(event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.ban.error.title",
|
||||||
|
"commands.moderation.ban.yourself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else if (event.getMessage().getMentionedMembers().size() == 0) {
|
} else if (event.getMessage().getMentionedMembers().size() == 0) {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
|
|
@ -41,19 +55,30 @@ public class BanCommand implements Command {
|
||||||
if (event.getGuild().getSelfMember().canInteract(member)) {
|
if (event.getGuild().getSelfMember().canInteract(member)) {
|
||||||
event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.myself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.ban.error.title",
|
||||||
|
"commands.moderation.ban.myself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.yourself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.ban.error.title",
|
||||||
|
"commands.moderation.ban.yourself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.massban.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.ban.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.ban.massban.success.description",
|
||||||
|
String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -64,7 +89,7 @@ public class BanCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.ban.help.description");
|
return "commands.moderation.ban.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,15 @@ public class ClearCommand implements Command {
|
||||||
for (Message message : msg) {
|
for (Message message : msg) {
|
||||||
message.delete().queue();
|
message.delete().queue();
|
||||||
}
|
}
|
||||||
Message message = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.lear.all.success.title"))
|
MessageEditor.MessageType.INFO,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.lear.all.success.description", String.valueOf(msg.size())))
|
"commands.moderation.lear.all.success.title",
|
||||||
|
"",
|
||||||
|
"commands.moderation.lear.all.success.description",
|
||||||
|
String.valueOf(msg.size()))
|
||||||
.build()).complete();
|
.build()).complete();
|
||||||
try {
|
try {
|
||||||
TimeUnit.SECONDS.sleep(2);
|
TimeUnit.SECONDS.sleep(3);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
@ -41,12 +44,12 @@ public class ClearCommand implements Command {
|
||||||
try {
|
try {
|
||||||
int nbToDelete = Integer.parseInt(args[0]);
|
int nbToDelete = Integer.parseInt(args[0]);
|
||||||
if (nbToDelete < 1 || nbToDelete > 99) {
|
if (nbToDelete < 1 || nbToDelete > 99) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.number.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "", "commands.moderation.clear.number.error.description").build()).queue();
|
||||||
} else {
|
} else {
|
||||||
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
|
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
|
||||||
List<Message> msgToDelete = new ArrayList<>(history);
|
List<Message> msgToDelete = new ArrayList<>(history);
|
||||||
event.getTextChannel().deleteMessages(msgToDelete).queue();
|
event.getTextChannel().deleteMessages(msgToDelete).queue();
|
||||||
Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.success.description", String.valueOf(nbToDelete))).build()).complete();
|
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "", "", "commands.moderation.clear.success.description", String.valueOf(nbToDelete)).build()).complete();
|
||||||
try {
|
try {
|
||||||
TimeUnit.SECONDS.sleep(2);
|
TimeUnit.SECONDS.sleep(2);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
|
|
@ -57,17 +60,15 @@ public class ClearCommand implements Command {
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.message.error.title"))
|
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.message.error.description"))
|
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
|
|
@ -81,11 +82,11 @@ public class ClearCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.clear.help.description");
|
return "commands.moderation.clear.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "number");
|
return "number";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,15 +14,25 @@ public class GuildPrefixCommand implements Command {
|
||||||
if (!args[0].contains("\"")) {
|
if (!args[0].contains("\"")) {
|
||||||
|
|
||||||
event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
|
event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.success.title"), "✅").setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.success.description", args[0])).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.prefix.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.prefix.success.description",
|
||||||
|
args[0]).build()
|
||||||
|
).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"",
|
||||||
|
"commands.moderation.prefix.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -33,11 +43,11 @@ public class GuildPrefixCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.prefix.help.description");
|
return "commands.moderation.prefix.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "guildprefix");
|
return "guildprefix";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,14 +20,17 @@ public class InviteDetectCommand implements Command {
|
||||||
case "on":
|
case "on":
|
||||||
if (!event.getRethink().getInviteDetection(event.getGuild().getId())) {
|
if (!event.getRethink().getInviteDetection(event.getGuild().getId())) {
|
||||||
event.getRethink().setInviteDetection(event.getGuild().getId(), true);
|
event.getRethink().setInviteDetection(event.getGuild().getId(), true);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.success.description"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.invitedetect.activate.success.title",
|
||||||
|
"commands.moderation.invitedetect.activate.success.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.error.title"))
|
MessageEditor.MessageType.WARNING,
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.error.description"))
|
"commands.moderation.invitedetect.activate.error.title",
|
||||||
|
"commands.moderation.invitedetect.activate.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -35,20 +38,22 @@ public class InviteDetectCommand implements Command {
|
||||||
case "off":
|
case "off":
|
||||||
if (event.getRethink().getInviteDetection(event.getGuild().getId())) {
|
if (event.getRethink().getInviteDetection(event.getGuild().getId())) {
|
||||||
event.getRethink().setInviteDetection(event.getGuild().getId(), false);
|
event.getRethink().setInviteDetection(event.getGuild().getId(), false);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.success.title"))
|
MessageEditor.MessageType.INFO,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.success.description"))
|
"commands.moderation.invitedetect.deactivate.success.title",
|
||||||
|
"commands.moderation.invitedetect.deactivate.success.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.error.title"))
|
MessageEditor.MessageType.WARNING,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.error.description"))
|
"commands.moderation.invitedetect.deactivate.error.title",
|
||||||
|
"commands.moderation.invitedetect.deactivate.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
|
|
@ -62,7 +67,7 @@ public class InviteDetectCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.invitedetect.help.description");
|
return "commands.moderation.invitedetect.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -22,15 +22,25 @@ public class KickCommand implements Command {
|
||||||
if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
|
if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
|
||||||
if (event.getGuild().getSelfMember().canInteract(victim)) {
|
if (event.getGuild().getSelfMember().canInteract(victim)) {
|
||||||
event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.description", victim.getUser().getName())).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.kick.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.kick.success.description",
|
||||||
|
victim.getUser().getName()).build()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.myself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.kick.error.title",
|
||||||
|
"commands.moderation.kick.myself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.yourself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else if (event.getMessage().getMentionedMembers().size() == 0) {
|
} else if (event.getMessage().getMentionedMembers().size() == 0) {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
|
|
@ -42,16 +52,16 @@ public class KickCommand implements Command {
|
||||||
if (event.getGuild().getSelfMember().canInteract(member)) {
|
if (event.getGuild().getSelfMember().canInteract(member)) {
|
||||||
event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.myself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title","commands.moderation.kick.myself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.yourself.error.description")).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,"commands.moderation.kick.success.title", "✅","commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -63,7 +73,7 @@ public class KickCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.kick.help.description");
|
return "commands.moderation.kick.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
package com.bbn.hadder.commands.moderation;
|
|
||||||
|
|
||||||
import com.bbn.hadder.commands.Command;
|
|
||||||
import com.bbn.hadder.commands.CommandEvent;
|
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
|
||||||
import net.dv8tion.jda.api.entities.Guild;
|
|
||||||
|
|
||||||
public class LinkCommand implements Command {
|
|
||||||
@Override
|
|
||||||
public void executed(String[] args, CommandEvent event) {
|
|
||||||
if (args.length == 0) event.getHelpCommand().sendHelp(this, event);
|
|
||||||
switch (args[0].toLowerCase()) {
|
|
||||||
case "add":
|
|
||||||
if (args.length != 2) return;
|
|
||||||
String linkid = args[1];
|
|
||||||
|
|
||||||
// Check if guild exists
|
|
||||||
boolean found = false;
|
|
||||||
Guild linkguild = null;
|
|
||||||
for (Guild g : event.getJDA().getGuilds()) {
|
|
||||||
if (g.getId().equals(linkid)) {
|
|
||||||
found = true;
|
|
||||||
linkguild = g;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!found) {
|
|
||||||
event.getChannel().sendMessage(
|
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.success.description"))
|
|
||||||
.build()).queue();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if the guild is the same
|
|
||||||
if (event.getGuild().getId().equals(args[1])) {
|
|
||||||
event.getChannel().sendMessage(
|
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.error.description")).build()).queue();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send poll to all connected guilds
|
|
||||||
Guild finalLinkguild = linkguild;
|
|
||||||
new Thread(() -> {
|
|
||||||
if (event.getRethink().getLinkChannel(linkid).isEmpty()) {
|
|
||||||
event.getRethink().setLinkChannel(linkid, finalLinkguild.createTextChannel("linkchannel").complete().getId());
|
|
||||||
}
|
|
||||||
// Send Request to link Guild
|
|
||||||
event.getJDA().getTextChannelById(event.getRethink().getLinkChannel(linkid)).sendMessage(
|
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
|
||||||
.setTitle(event.getGuild().getName() + " (" + event.getGuild().getId() + MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.accept.title"))
|
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.accept.description")).build()
|
|
||||||
).queue(
|
|
||||||
msg -> {
|
|
||||||
msg.addReaction("✅").queue();
|
|
||||||
msg.addReaction("❌").queue();
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}).start();
|
|
||||||
|
|
||||||
|
|
||||||
event.getChannel().sendMessage(
|
|
||||||
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.success.description"))
|
|
||||||
.build()).queue();
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "channel":
|
|
||||||
if (args.length == 2) {
|
|
||||||
event.getRethink().setLinkChannel(event.getGuild().getId(), args[1]);
|
|
||||||
event.getChannel().sendMessage(new EmbedBuilder().setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.set.title")).build()).queue();
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] labels() {
|
|
||||||
return new String[]{"link"};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String description() {
|
|
||||||
return MessageEditor.handle("en", "commands.moderation.link.help.description");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String usage() {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -22,24 +22,49 @@ public class NickCommand implements Command {
|
||||||
if (args.length > 1) {
|
if (args.length > 1) {
|
||||||
if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
|
if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
|
||||||
event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag())).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.nick.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.nick.success.description",
|
||||||
|
event.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
|
||||||
|
).build()).queue();
|
||||||
} else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
|
} else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
|
||||||
event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag())).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.nick.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
|
||||||
|
).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
|
if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
|
||||||
event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.nick.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.nick.myself.success.description",
|
||||||
|
"").build()).queue();
|
||||||
} else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
|
} else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
|
||||||
event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description")).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.nick.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.nick.myself.success.description", ""
|
||||||
|
).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (event.getMessage().getMentionedMembers().size() == 0) {
|
} else if (event.getMessage().getMentionedMembers().size() == 0) {
|
||||||
|
|
@ -53,13 +78,19 @@ public class NickCommand implements Command {
|
||||||
event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue();
|
event.getTextChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.nick.success.title",
|
||||||
|
"✅",
|
||||||
|
"commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())
|
||||||
|
).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -70,11 +101,11 @@ public class NickCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.nick.help.description");
|
return "commands.moderation.nick.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "user+nickname");
|
return "user+nickname";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,25 +73,33 @@ public class RegionChangeCommand implements Command {
|
||||||
setRegion(Region.US_SOUTH, "US South", event);
|
setRegion(Region.US_SOUTH, "US South", event);
|
||||||
break;
|
break;
|
||||||
case "list":
|
case "list":
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.regions.title"))
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.regionchange.regions.title",
|
||||||
|
"")
|
||||||
.setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`")
|
.setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
} else event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
} else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
} else event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
} else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
} else event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.regions.title"))
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.regionchange.regions.title",
|
||||||
|
"")
|
||||||
.setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`")
|
.setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRegion (Region region, String region_name, CommandEvent event) {
|
public void setRegion (Region region, String region_name, CommandEvent event) {
|
||||||
event.getGuild().getManager().setRegion(region).reason("Region changed by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().getManager().setRegion(region).reason("Region changed by " + event.getAuthor().getAsTag()).queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.description", region_name))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.regionchange.success.title", "",
|
||||||
|
"commands.moderation.regionchange.success.description", region_name)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,11 +110,11 @@ public class RegionChangeCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.regionchange.help.description");
|
return "commands.moderation.regionchange.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "region");
|
return "region";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,16 +24,22 @@ public class RoleCommand implements Command {
|
||||||
if (event.getGuild().getSelfMember().canInteract(role)) {
|
if (event.getGuild().getSelfMember().canInteract(role)) {
|
||||||
event.getGuild().addRoleToMember(member, role).reason("Role added by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().addRoleToMember(member, role).reason("Role added by " + event.getAuthor().getAsTag()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.add.success.title", "✅"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.add.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedMembers().size())))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.role.add.success.title",
|
||||||
|
"✅",
|
||||||
|
"",
|
||||||
|
"commands.moderation.role.add.success.description",
|
||||||
|
String.valueOf(event.getMessage().getMentionedRoles().size()),
|
||||||
|
String.valueOf(event.getMessage().getMentionedMembers().size()))
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -46,25 +52,31 @@ public class RoleCommand implements Command {
|
||||||
if (event.getGuild().getSelfMember().canInteract(role)) {
|
if (event.getGuild().getSelfMember().canInteract(role)) {
|
||||||
event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue();
|
event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.remove.success.title", "✅"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.remove.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedMembers().size())))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.role.remove.success.title",
|
||||||
|
"✅",
|
||||||
|
"",
|
||||||
|
"commands.moderation.role.remove.success.description",
|
||||||
|
String.valueOf(event.getMessage().getMentionedRoles().size()),
|
||||||
|
String.valueOf(event.getMessage().getMentionedMembers().size()))
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
|
|
@ -78,7 +90,7 @@ public class RoleCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.role.help.description");
|
return "commands.moderation.role.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,11 @@ public class RulesCommand implements Command {
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
|
if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
|
||||||
if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
|
if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.setup.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.setup.description"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.setup.title",
|
||||||
|
"commands.moderation.rules.setup.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event1 -> {
|
new EventWaiter().newOnMessageEventWaiter(event1 -> {
|
||||||
if (event1.getMessage().getMentionedChannels().size() == 1) {
|
if (event1.getMessage().getMentionedChannels().size() == 1) {
|
||||||
|
|
@ -31,9 +33,9 @@ public class RulesCommand implements Command {
|
||||||
TextChannel channel = event1.getMessage().getMentionedChannels().get(0);
|
TextChannel channel = event1.getMessage().getMentionedChannels().get(0);
|
||||||
createRules(event, event1, channel);
|
createRules(event, event1, channel);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.title"))
|
"commands.moderation.rules.channel.error.title",
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.description"))
|
"commands.moderation.rules.channel.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -41,33 +43,41 @@ public class RulesCommand implements Command {
|
||||||
TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0);
|
TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0);
|
||||||
createRules(event, event1, channel);
|
createRules(event, event1, channel);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.description"))
|
MessageEditor.MessageType.ERROR,
|
||||||
|
"commands.moderation.rules.channel.error.title",
|
||||||
|
"commands.moderation.rules.channel.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) {
|
public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) {
|
||||||
if (channel.getGuild().getId().equals(event1.getGuild().getId())) {
|
if (channel.getGuild().getId().equals(event1.getGuild().getId())) {
|
||||||
if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) {
|
if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) {
|
||||||
event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event1.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.description", channel.getName()))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.rules.title",
|
||||||
|
"",
|
||||||
|
"commands.moderation.rules.rules.description",
|
||||||
|
channel.getName())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event2 -> {
|
new EventWaiter().newOnMessageEventWaiter(event2 -> {
|
||||||
String message = event2.getMessage().getContentRaw();
|
String message = event2.getMessage().getContentRaw();
|
||||||
event2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event2.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.description"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.role.title",
|
||||||
|
"commands.moderation.rules.role.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event3 -> {
|
new EventWaiter().newOnMessageEventWaiter(event3 -> {
|
||||||
if (event3.getMessage().getMentionedRoles().size() == 1) {
|
if (event3.getMessage().getMentionedRoles().size() == 1) {
|
||||||
|
|
@ -77,106 +87,133 @@ public class RulesCommand implements Command {
|
||||||
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
|
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
|
||||||
setRole(event, channel, message, event3, role);
|
setRole(event, channel, message, event3, role);
|
||||||
} else {
|
} else {
|
||||||
event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event3.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.error.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.error.description"))
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.rules.role.error.title",
|
||||||
|
"commands.moderation.rules.role.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.guild.error.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.guild.error.description"))
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.rules.guild.error.title",
|
||||||
|
"commands.moderation.rules.guild.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) {
|
public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) {
|
||||||
if (event3.getGuild().getSelfMember().canInteract(role)) {
|
if (event3.getGuild().getSelfMember().canInteract(role)) {
|
||||||
event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event3.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.accept.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.accept.description", role.getName()))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.emote.accept.title",
|
||||||
|
"",
|
||||||
|
"commands.moderation.rules.emote.accept.description", role.getName())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event4 -> {
|
new EventWaiter().newOnMessageEventWaiter(event4 -> {
|
||||||
if (event4.getMessage().getEmotes().size() == 1) {
|
if (event4.getMessage().getEmotes().size() == 1) {
|
||||||
Emote aemote = event4.getMessage().getEmotes().get(0);
|
Emote aemote = event4.getMessage().getEmotes().get(0);
|
||||||
event4.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event4.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title", String.valueOf(aemote)))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.emote.decline.title", "",
|
||||||
|
"commands.moderation.rules.emote.decline.title", String.valueOf(aemote))
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event5 -> {
|
new EventWaiter().newOnMessageEventWaiter(event5 -> {
|
||||||
Emote demote = event5.getMessage().getEmotes().get(0);
|
Emote demote = event5.getMessage().getEmotes().get(0);
|
||||||
if (!aemote.equals(demote)) {
|
if (!aemote.equals(demote)) {
|
||||||
Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Rules")
|
.setTitle("Rules")
|
||||||
.setDescription(message)
|
.setDescription(message)
|
||||||
.build()).complete();
|
.build()).complete();
|
||||||
try {
|
try {
|
||||||
rules.addReaction(aemote).queue();
|
rules.addReaction(aemote).queue();
|
||||||
rules.addReaction(demote).queue();
|
rules.addReaction(demote).queue();
|
||||||
event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event5.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.description", channel.getAsMention()))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.success.title",
|
||||||
|
"",
|
||||||
|
"commands.moderation.rules.success.description",
|
||||||
|
channel.getAsMention())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event5.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.access.description"))
|
MessageEditor.MessageType.ERROR,
|
||||||
|
"error",
|
||||||
|
"commands.moderation.rules.emote.error.access.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
|
event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.description"))
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.rules.emote.error.equal.title",
|
||||||
|
"commands.moderation.rules.emote.error.equal.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
} else {
|
} else {
|
||||||
String aemote = event4.getMessage().getContentRaw();
|
String aemote = event4.getMessage().getContentRaw();
|
||||||
event4.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event4.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emoji.decline.description"))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.emote.decline.title",
|
||||||
|
"commands.moderation.rules.emoji.decline.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
new EventWaiter().newOnMessageEventWaiter(event5 -> {
|
new EventWaiter().newOnMessageEventWaiter(event5 -> {
|
||||||
String demote = event5.getMessage().getContentRaw();
|
String demote = event5.getMessage().getContentRaw();
|
||||||
if (!aemote.equals(demote)) {
|
if (!aemote.equals(demote)) {
|
||||||
Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Rules")
|
.setTitle("Rules")
|
||||||
.setDescription(message)
|
.setDescription(message)
|
||||||
.build()).complete();
|
.build()).complete();
|
||||||
try {
|
try {
|
||||||
rules.addReaction(aemote).queue();
|
rules.addReaction(aemote).queue();
|
||||||
rules.addReaction(demote).queue();
|
rules.addReaction(demote).queue();
|
||||||
event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event5.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.description", channel.getAsMention()))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.rules.success.title",
|
||||||
|
"",
|
||||||
|
"commands.moderation.rules.success.description",
|
||||||
|
channel.getAsMention())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
|
event5.getChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emoji.error.description"))
|
MessageEditor.MessageType.ERROR,
|
||||||
|
"error",
|
||||||
|
"commands.moderation.rules.emoji.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
|
event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.description"))
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.moderation.rules.emote.error.equal.title",
|
||||||
|
"commands.moderation.rules.emote.error.equal.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
}
|
}
|
||||||
}, event.getJDA(), event.getAuthor());
|
}, event.getJDA(), event.getAuthor());
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -187,7 +224,7 @@ public class RulesCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.moderation.rules.help.description");
|
return "commands.moderation.rules.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
package com.bbn.hadder.commands.moderation;
|
||||||
|
|
||||||
|
import com.bbn.hadder.commands.Command;
|
||||||
|
import com.bbn.hadder.commands.CommandEvent;
|
||||||
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
|
import net.dv8tion.jda.api.entities.TextChannel;
|
||||||
|
|
||||||
|
public class SetStarBoardCommand implements Command {
|
||||||
|
@Override
|
||||||
|
public void executed(String[] args, CommandEvent event) {
|
||||||
|
if (event.getMessage().getMentionedChannels().size()==1) {
|
||||||
|
event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId());
|
||||||
|
event.getChannel().sendMessage(
|
||||||
|
event.getMessageEditor().getMessage(
|
||||||
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.moderation.starboard.successchannel","")
|
||||||
|
.build())
|
||||||
|
.queue();
|
||||||
|
} else {
|
||||||
|
if (args.length>0) {
|
||||||
|
TextChannel channel = event.getGuild().getTextChannelById(args[0]);
|
||||||
|
if (channel!=null) {
|
||||||
|
event.getRethink().setStarboardChannel(event.getGuild().getId(), channel.getId());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.length==2) {
|
||||||
|
event.getRethink().setNeededstars(args[1], event.getGuild().getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String[] labels() {
|
||||||
|
return new String[]{"setstarboard"};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String description() {
|
||||||
|
return "Sets the starboard channel";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String usage() {
|
||||||
|
return "<Channel id or channel mention> [Needed stars]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -22,33 +22,44 @@ public class JoinCommand implements Command {
|
||||||
if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
|
if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
|
||||||
if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
|
if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
|
||||||
event.getGuild().getAudioManager().openAudioConnection(vc);
|
event.getGuild().getAudioManager().openAudioConnection(vc);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.description", vc.getName()))
|
MessageEditor.MessageType.INFO,
|
||||||
|
"commands.music.join.success.title",
|
||||||
|
"",
|
||||||
|
"commands.music.join.success.description",
|
||||||
|
vc.getName())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.already.title"))
|
event.getMessageEditor().getMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.already.description"))
|
MessageEditor.MessageType.WARNING,
|
||||||
|
"commands.music.join.error.connecting.already.title",
|
||||||
|
"commands.music.join.error.connecting.already.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getGuild().getAudioManager().openAudioConnection(vc);
|
event.getGuild().getAudioManager().openAudioConnection(vc);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.title"))
|
MessageEditor.MessageType.INFO,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.description", vc.getName()))
|
"commands.music.join.success.title",
|
||||||
|
"",
|
||||||
|
"commands.music.join.success.description",
|
||||||
|
vc.getName())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.trying.title"))
|
MessageEditor.MessageType.WARNING,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.trying.description"))
|
"commands.music.join.error.connecting.trying.title",
|
||||||
|
"commands.music.join.error.connecting.trying.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.channel.title"))
|
MessageEditor.MessageType.WARNING,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.channel.description"))
|
"commands.music.join.error.channel.title",
|
||||||
|
"commands.music.join.error.channel.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -60,7 +71,7 @@ public class JoinCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.music.join.help.description");
|
return "commands.music.join.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,16 @@ public class LeaveCommand implements Command {
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
|
if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
|
||||||
event.getGuild().getAudioManager().closeAudioConnection();
|
event.getGuild().getAudioManager().closeAudioConnection();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.success.title"))
|
MessageEditor.MessageType.INFO,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.success.description"))
|
"commands.music.leave.success.title",
|
||||||
|
"commands.music.leave.success.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.error.tile"))
|
MessageEditor.MessageType.WARNING,
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.error.description"))
|
"commands.music.leave.error.tile",
|
||||||
|
"commands.music.leave.error.description")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -33,7 +35,7 @@ public class LeaveCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.music.leave.help.description");
|
return "commands.music.leave.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class AnalCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Anal")
|
.setFooter("Anal")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class AnalCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class AnalCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.anal.help.description");
|
return "commands.nsfw.anal.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class BDSMCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("BDSM")
|
.setFooter("BDSM")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,18 +42,18 @@ public class BDSMCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"bdsm"};
|
return new String[] { "bdsm" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.bdsm.help.description");
|
return "commands.nsfw.bdsm.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ public class BlowjobCommand implements Command {
|
||||||
Response response = caller.newCall(request).execute();
|
Response response = caller.newCall(request).execute();
|
||||||
String url = response.body().string().replace("{\"url\":\"", "");
|
String url = response.body().string().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Blowjob")
|
.setFooter("Blowjob")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -38,7 +38,7 @@ public class BlowjobCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -49,7 +49,7 @@ public class BlowjobCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.blowjob.help.description");
|
return "commands.nsfw.blowjob.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class BoobsCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Boobs")
|
.setFooter("Boobs")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class BoobsCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class BoobsCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.boobs.help.description");
|
return "commands.nsfw.boobs.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class CumCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Cum")
|
.setFooter("Cum")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class CumCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class CumCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.cum.help.description");
|
return "commands.nsfw.cum.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ public class EroticCommand implements Command {
|
||||||
Response response = caller.newCall(request).execute();
|
Response response = caller.newCall(request).execute();
|
||||||
String url = response.body().string().replace("{\"url\":\"", "");
|
String url = response.body().string().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Erotic")
|
.setFooter("Erotic")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -38,7 +38,7 @@ public class EroticCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -49,7 +49,7 @@ public class EroticCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.erotic.help.description");
|
return "commands.nsfw.erotic.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class FeetCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Feet")
|
.setFooter("Feet")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class FeetCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class FeetCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.feet.help.description");
|
return "commands.nsfw.feet.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class FingeringCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Fingering")
|
.setFooter("Fingering")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class FingeringCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class FingeringCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.fingering.help.description");
|
return "commands.nsfw.fingering.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class LickingCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Licking")
|
.setFooter("Licking")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class LickingCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class LickingCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.linking.help.description");
|
return "commands.nsfw.linking.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class PornCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Porn")
|
.setFooter("Porn")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class PornCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class PornCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.porn.help.description");
|
return "commands.nsfw.porn.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ public class PussyCommand implements Command {
|
||||||
Response response = caller.newCall(request).execute();
|
Response response = caller.newCall(request).execute();
|
||||||
String url = response.body().string().replace("{\"url\":\"", "");
|
String url = response.body().string().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Pussy")
|
.setFooter("Pussy")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -38,7 +38,7 @@ public class PussyCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -49,7 +49,7 @@ public class PussyCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.pussy.help.description");
|
return "commands.nsfw.pussy.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,8 @@ public class RandomPornCommand implements Command {
|
||||||
if (event.getTextChannel().isNSFW()) {
|
if (event.getTextChannel().isNSFW()) {
|
||||||
|
|
||||||
OkHttpClient caller = new OkHttpClient();
|
OkHttpClient caller = new OkHttpClient();
|
||||||
Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/").build();
|
Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/")
|
||||||
|
.build();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
@ -31,29 +32,32 @@ public class RandomPornCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel()
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setImage(url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
|
||||||
.setFooter("Random Porn")
|
url.replace("\"}", ""))
|
||||||
.build()).queue();
|
.setImage(url.replace("\"}", "")).setFooter("Random Porn").build())
|
||||||
|
.queue();
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel()
|
||||||
|
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
|
||||||
|
.queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"randomporn", "pornrandom"};
|
return new String[] { "randomporn", "pornrandom" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.randomporn.help.description");
|
return "commands.nsfw.randomporn.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class SoloCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
||||||
.setImage(url.replace("\"}", ""))
|
.setImage(url.replace("\"}", ""))
|
||||||
.setFooter("Solo")
|
.setFooter("Solo")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
@ -42,7 +42,7 @@ public class SoloCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class SoloCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.solo.help.description");
|
return "commands.nsfw.solo.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,29 +31,30 @@ public class SpankCommand implements Command {
|
||||||
JSONObject response1 = data.getJSONObject("response");
|
JSONObject response1 = data.getJSONObject("response");
|
||||||
String url = response1.toString().replace("{\"url\":\"", "");
|
String url = response1.toString().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
|
||||||
.setImage(url.replace("\"}", ""))
|
url.replace("\"}", ""))
|
||||||
.setFooter("Spank")
|
.setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue();
|
||||||
.build()).queue();
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel()
|
||||||
|
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
|
||||||
|
.queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"spank", "beat", "hit"};
|
return new String[] { "spank", "beat", "hit" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.spank.help.description");
|
return "commands.nsfw.spank.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -27,29 +27,30 @@ public class TransCommand implements Command {
|
||||||
Response response = caller.newCall(request).execute();
|
Response response = caller.newCall(request).execute();
|
||||||
String url = response.body().string().replace("{\"url\":\"", "");
|
String url = response.body().string().replace("{\"url\":\"", "");
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", ""))
|
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
|
||||||
.setImage(url.replace("\"}", ""))
|
url.replace("\"}", ""))
|
||||||
.setFooter("Trans")
|
.setImage(url.replace("\"}", "")).setFooter("Trans").build()).queue();
|
||||||
.build()).queue();
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue();
|
event.getTextChannel()
|
||||||
|
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
|
||||||
|
.queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"trans"};
|
return new String[] { "trans" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.nsfw.trans.help.description");
|
return "commands.nsfw.trans.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ public class EvalCommand implements Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
engine.put("msg", event.getMessage());
|
engine.put("msg", event.getMessage());
|
||||||
engine.put("shradmanager", Hadder.shardManager);
|
engine.put("shardmanager", Hadder.shardManager);
|
||||||
engine.put("rethink", event.getRethink());
|
engine.put("rethink", event.getRethink());
|
||||||
engine.put("event", event);
|
engine.put("event", event);
|
||||||
engine.put("jda", event.getJDA());
|
engine.put("jda", event.getJDA());
|
||||||
|
|
@ -53,21 +53,26 @@ public class EvalCommand implements Command {
|
||||||
String script = "";
|
String script = "";
|
||||||
for (int i = 0; i < args.length; i++) {
|
for (int i = 0; i < args.length; i++) {
|
||||||
args[i] = args[i].replace("```java", "").replace("```", "");
|
args[i] = args[i].replace("```java", "").replace("```", "");
|
||||||
script += i == args.length-1 ? args[i]:args[i]+" ";
|
script += i == args.length - 1 ? args[i] : args[i] + " ";
|
||||||
}
|
}
|
||||||
out = engine.eval(script);
|
out = engine.eval(script);
|
||||||
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor()
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title"))
|
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.input"), "```java\n\n" + script + "```", false)
|
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.input"),
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.output"), "```java\n\n" + out.toString() + "```", false)
|
"```java\n\n" + script + "```", false)
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false)
|
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.output"),
|
||||||
|
"```java\n\n" + out.toString() + "```", false)
|
||||||
|
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
|
||||||
|
System.currentTimeMillis() - startExec + " milliseconds", false)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel().sendMessage(event.getMessageEditor()
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title"))
|
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"), "```java\n\n" + ex.getMessage() + "```", false)
|
.addField(event.getMessageEditor().getTerm("error"),
|
||||||
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false)
|
"```java\n\n" + ex.getMessage() + "```", false)
|
||||||
|
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
|
||||||
|
System.currentTimeMillis() - startExec + " milliseconds", false)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -80,22 +85,24 @@ public class EvalCommand implements Command {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel()
|
||||||
|
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
|
||||||
|
.queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"eval"};
|
return new String[] { "eval" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.owner.eval.help.description");
|
return "commands.owner.eval.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "commands.owner.eval.help.usage");
|
return "commands.owner.eval.help.usage";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,30 +17,34 @@ public class GuildLeaveCommand implements Command {
|
||||||
if (args.length > 0) {
|
if (args.length > 0) {
|
||||||
Guild guild = event.getJDA().getGuildById(args[0]);
|
Guild guild = event.getJDA().getGuildById(args[0]);
|
||||||
guild.leave().queue();
|
guild.leave().queue();
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel()
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.title"))
|
.sendMessage(event.getMessageEditor()
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.description", guild.getName()))
|
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title",
|
||||||
.build()).queue();
|
"", "commands.owner.guildleave.success.description", guild.getName())
|
||||||
|
.build())
|
||||||
|
.queue();
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel()
|
||||||
|
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
|
||||||
|
.queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"guildleave"};
|
return new String[] { "guildleave" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.owner.guildleave.help.description");
|
return "commands.owner.guildleave.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "guildid");
|
return "guildid";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ public class RebootCommand implements Command {
|
||||||
if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
|
if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
|
||||||
Runtime.getRuntime().exit(69);
|
Runtime.getRuntime().exit(69);
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -27,7 +27,7 @@ public class RebootCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.owner.reboot.help.description");
|
return "commands.owner.reboot.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,12 @@ public class ShutdownCommand implements Command {
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
|
if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
|
||||||
event.getJDA().getShardManager().shutdown();
|
event.getJDA().getShardManager().shutdown();
|
||||||
System.out.println("Bot shut down via Command...");
|
System.out.println("Bot shut down via Command...");
|
||||||
Runtime.getRuntime().exit(69);
|
Runtime.getRuntime().exit(69);
|
||||||
} else {
|
} else {
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -29,7 +29,7 @@ public class ShutdownCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.owner.shutdown.help.description");
|
return "commands.owner.shutdown.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package com.bbn.hadder.commands.owner;
|
||||||
import com.bbn.hadder.commands.Command;
|
import com.bbn.hadder.commands.Command;
|
||||||
import com.bbn.hadder.commands.CommandEvent;
|
import com.bbn.hadder.commands.CommandEvent;
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
|
import com.bbn.hadder.utils.MessageEditor.MessageType;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @author Skidder / GregTCLTK
|
* @author Skidder / GregTCLTK
|
||||||
|
|
@ -12,7 +13,7 @@ public class TestCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.test.success")).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -22,7 +23,7 @@ public class TestCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.owner.test.help.description");
|
return "commands.owner.test.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -41,26 +41,29 @@ public class LanguageCommand implements Command {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLanguage(String language_code, String language , CommandEvent event) {
|
public void setLanguage(String language_code, String language, CommandEvent event) {
|
||||||
event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
|
event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel()
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.title"))
|
.sendMessage(
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.description", language))
|
event.getMessageEditor()
|
||||||
.build()).queue();
|
.getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title",
|
||||||
|
"", "commands.settings.language.success.description", language)
|
||||||
|
.build())
|
||||||
|
.queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"language"};
|
return new String[] { "language" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.settings.language.help.description");
|
return "commands.settings.language.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "commands.settings.language.help.usage");
|
return "commands.settings.language.help.usage";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,16 +8,17 @@ import com.bbn.hadder.commands.Command;
|
||||||
import com.bbn.hadder.commands.CommandEvent;
|
import com.bbn.hadder.commands.CommandEvent;
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
|
|
||||||
|
|
||||||
public class PrefixCommand implements Command {
|
public class PrefixCommand implements Command {
|
||||||
|
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
|
event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getTextChannel()
|
||||||
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.title"))
|
.sendMessage(event.getMessageEditor()
|
||||||
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.description", args[0]))
|
.getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "",
|
||||||
.build()).queue();
|
"commands.settings.prefix.success.description", args[0])
|
||||||
|
.build())
|
||||||
|
.queue();
|
||||||
} else {
|
} else {
|
||||||
event.getHelpCommand().sendHelp(this, event);
|
event.getHelpCommand().sendHelp(this, event);
|
||||||
}
|
}
|
||||||
|
|
@ -25,16 +26,16 @@ public class PrefixCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"prefix"};
|
return new String[] { "prefix" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return MessageEditor.handle("en", "commands.settings.prefix.help.description");
|
return "commands.settings.prefix.help.description";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String usage() {
|
public String usage() {
|
||||||
return MessageEditor.handle("en", "prefix");
|
return "prefix";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import com.bbn.hadder.Rethink;
|
||||||
import com.bbn.hadder.commands.Command;
|
import com.bbn.hadder.commands.Command;
|
||||||
import com.bbn.hadder.commands.CommandEvent;
|
import com.bbn.hadder.commands.CommandEvent;
|
||||||
import com.bbn.hadder.commands.general.HelpCommand;
|
import com.bbn.hadder.commands.general.HelpCommand;
|
||||||
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -30,7 +31,10 @@ public class CommandHandler {
|
||||||
if (argString.startsWith(" ")) argString = argString.replaceFirst(" ", "");
|
if (argString.startsWith(" ")) argString = argString.replaceFirst(" ", "");
|
||||||
String[] args = argString.split(" ");
|
String[] args = argString.split(" ");
|
||||||
if (args.length>0&&args[0].equals("")) args = new String[0];
|
if (args.length>0&&args[0].equals("")) args = new String[0];
|
||||||
cmd.executed(args, new CommandEvent(event, config, rethink, this, helpCommand));
|
cmd.executed(args,
|
||||||
|
new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
|
||||||
|
config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()))
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,95 +0,0 @@
|
||||||
package com.bbn.hadder.core;
|
|
||||||
|
|
||||||
import club.minnced.discord.webhook.WebhookClient;
|
|
||||||
import club.minnced.discord.webhook.WebhookClientBuilder;
|
|
||||||
import club.minnced.discord.webhook.send.WebhookEmbed;
|
|
||||||
import club.minnced.discord.webhook.send.WebhookMessageBuilder;
|
|
||||||
import com.bbn.hadder.Rethink;
|
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
|
||||||
import net.dv8tion.jda.api.JDA;
|
|
||||||
import net.dv8tion.jda.api.Permission;
|
|
||||||
import net.dv8tion.jda.api.entities.*;
|
|
||||||
import org.json.JSONArray;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class LinkUtils {
|
|
||||||
|
|
||||||
public void sendAll(JSONArray jsonArray, JDA jda, Message message, User user, List<String> reactions, Rethink rethink, boolean usedmessagebuilder) {
|
|
||||||
for (int i = 0; jsonArray.length() > i; i++) {
|
|
||||||
this.send(message, jda.getTextChannelById(rethink.getLinkChannel(jsonArray.getString(i))), user, reactions, usedmessagebuilder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void send(Message message, TextChannel channel, User user, List<String> reactions, boolean usedmessagebuilder) {
|
|
||||||
if (!channel.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
|
|
||||||
channel.sendMessage(new EmbedBuilder().setTitle("Wait a sec").setDescription("Please contact the owner of the server to give me the Manage Webhooks permission").build()).queue();
|
|
||||||
} else {
|
|
||||||
channel.retrieveWebhooks().queue(
|
|
||||||
webhooks -> {
|
|
||||||
Webhook webhook = null;
|
|
||||||
for (Webhook webhooktemp : webhooks) {
|
|
||||||
if (webhooktemp.getOwner().equals(channel.getGuild().getSelfMember())) {
|
|
||||||
webhook = webhooktemp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (webhook == null) {
|
|
||||||
channel.createWebhook("Hadder GuildLink").queue(
|
|
||||||
webhook1 -> sendMessage(webhook1, channel, user, message, reactions, usedmessagebuilder)
|
|
||||||
);
|
|
||||||
} else sendMessage(webhook, channel, user, message, reactions, usedmessagebuilder);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendMessage(Webhook webhook, TextChannel channel, User user, Message message, List<String> reactions, boolean usedmessagebuilder) {
|
|
||||||
WebhookClientBuilder builder = new WebhookClientBuilder(webhook.getUrl());
|
|
||||||
WebhookClient client = builder.build();
|
|
||||||
WebhookMessageBuilder mb = new WebhookMessageBuilder();
|
|
||||||
mb.setUsername(user.getName())
|
|
||||||
.setAvatarUrl((user.getAvatarUrl()!=null) ? user.getAvatarUrl() : user.getDefaultAvatarUrl())
|
|
||||||
.setContent(message.getContentRaw());
|
|
||||||
if (!usedmessagebuilder) {
|
|
||||||
for (Message.Attachment attachment : message.getAttachments()) {
|
|
||||||
try {
|
|
||||||
mb.addFile(attachment.getFileName(), attachment.retrieveInputStream().get());
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (MessageEmbed embed : message.getEmbeds()) {
|
|
||||||
List<WebhookEmbed.EmbedField> fields = new ArrayList<>();
|
|
||||||
for (MessageEmbed.Field field : embed.getFields()) {
|
|
||||||
fields.add(new WebhookEmbed.EmbedField(field.isInline(), field.getName(), field.getValue()));
|
|
||||||
}
|
|
||||||
mb.addEmbeds(new WebhookEmbed(
|
|
||||||
embed.getTimestamp(), embed.getColorRaw(), embed.getDescription(),
|
|
||||||
(embed.getThumbnail()!=null) ? embed.getThumbnail().getUrl() : "", (embed.getImage()!=null) ? embed.getImage().getUrl() : "",
|
|
||||||
new WebhookEmbed.EmbedFooter((embed.getFooter()!=null) ? (embed.getFooter().getText()!=null) ? embed.getFooter().getText() : "" : "",
|
|
||||||
(embed.getFooter()!=null) ? embed.getFooter().getIconUrl():""),
|
|
||||||
new WebhookEmbed.EmbedTitle((embed.getTitle()!=null) ? embed.getTitle() : "", embed.getUrl()),
|
|
||||||
new WebhookEmbed.EmbedAuthor((embed.getAuthor()!=null) ? (embed.getAuthor().getName() != null) ? embed.getAuthor().getName() : "" : "",
|
|
||||||
(embed.getAuthor()!=null) ? (embed.getAuthor().getIconUrl()!=null) ? embed.getAuthor().getIconUrl(): "" : "",
|
|
||||||
(embed.getAuthor()!=null) ? embed.getAuthor().getUrl() : ""), fields));
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
long msgid = client.send(mb.build()).get().getId();
|
|
||||||
channel.retrieveMessageById(msgid).queue(
|
|
||||||
msg -> {
|
|
||||||
for (String reaction: reactions) {
|
|
||||||
msg.addReaction(reaction).queue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -36,7 +36,7 @@ public class GuildListener extends ListenerAdapter {
|
||||||
}).start();
|
}).start();
|
||||||
|
|
||||||
rethink.insertGuild(event.getGuild().getId());
|
rethink.insertGuild(event.getGuild().getId());
|
||||||
event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Joined Server")
|
.setTitle("Joined Server")
|
||||||
.setThumbnail(event.getGuild().getIconUrl())
|
.setThumbnail(event.getGuild().getIconUrl())
|
||||||
.addField("Name", event.getGuild().getName(), true)
|
.addField("Name", event.getGuild().getName(), true)
|
||||||
|
|
@ -51,7 +51,7 @@ public class GuildListener extends ListenerAdapter {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onGuildLeave(GuildLeaveEvent event) {
|
public void onGuildLeave(GuildLeaveEvent event) {
|
||||||
event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Left Server")
|
.setTitle("Left Server")
|
||||||
.setThumbnail(event.getGuild().getIconUrl())
|
.setThumbnail(event.getGuild().getIconUrl())
|
||||||
.addField("Name", event.getGuild().getName(), true)
|
.addField("Name", event.getGuild().getName(), true)
|
||||||
|
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
package com.bbn.hadder.listener;
|
|
||||||
|
|
||||||
import com.bbn.hadder.Rethink;
|
|
||||||
import com.bbn.hadder.core.LinkUtils;
|
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
|
||||||
import net.dv8tion.jda.api.Permission;
|
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
|
||||||
import net.dv8tion.jda.api.entities.MessageEmbed;
|
|
||||||
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
|
||||||
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
|
|
||||||
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
public class LinkListener extends ListenerAdapter {
|
|
||||||
|
|
||||||
private Rethink rethink;
|
|
||||||
|
|
||||||
public LinkListener(Rethink rethink) {
|
|
||||||
this.rethink = rethink;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) {
|
|
||||||
event.getChannel().retrieveMessageById(event.getMessageId()).queue(
|
|
||||||
msg -> {
|
|
||||||
if (!event.getMember().getUser().equals(event.getJDA().getSelfUser()) && msg.getAuthor().equals(event.getJDA().getSelfUser()) && msg.getEmbeds().size() == 1 && msg.getEmbeds().get(0).getFooter() == null && msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) {
|
|
||||||
if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) {
|
|
||||||
String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", "");
|
|
||||||
String requestguildid = null;
|
|
||||||
for (int i = requestguild.length() - 1; i >= 0; i--) {
|
|
||||||
if (String.valueOf(requestguild.charAt(i)).equals("(")) {
|
|
||||||
requestguildid = requestguild.substring(i + 1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (requestguildid != null) {
|
|
||||||
if (event.getReactionEmote().getName().equals("✅")) {
|
|
||||||
rethink.addLinkedGuild(event.getGuild().getId(), requestguildid);
|
|
||||||
rethink.addLinkedGuild(requestguildid, event.getGuild().getId());
|
|
||||||
|
|
||||||
msg.delete().queue();
|
|
||||||
|
|
||||||
MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
|
||||||
.setTitle("Guilds linked!").setDescription("The Guild allowed the link. Have fun!").build();
|
|
||||||
event.getChannel().sendMessage(msgembed).queue();
|
|
||||||
event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
|
|
||||||
} else if (event.getReactionEmote().getName().equals("❌")) {
|
|
||||||
msg.delete().queue();
|
|
||||||
|
|
||||||
MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
|
||||||
.setTitle("Guild linking denied.").setDescription("The Guild denied the linking. :(").build();
|
|
||||||
event.getChannel().sendMessage(msgembed).queue();
|
|
||||||
event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
|
|
||||||
if (!event.isWebhookMessage() && event.getChannel().getId().equals(rethink.getLinkChannel(event.getGuild().getId())) && event.isFromType(ChannelType.TEXT)) {
|
|
||||||
new LinkUtils().sendAll(rethink.getLinks(event.getGuild().getId()), event.getJDA(), event.getMessage(), event.getAuthor(), new ArrayList<>() {
|
|
||||||
}, rethink, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -13,6 +13,7 @@ public class MentionListener extends ListenerAdapter {
|
||||||
|
|
||||||
private Rethink rethink;
|
private Rethink rethink;
|
||||||
|
|
||||||
|
|
||||||
public MentionListener(Rethink rethink) {
|
public MentionListener(Rethink rethink) {
|
||||||
this.rethink = rethink;
|
this.rethink = rethink;
|
||||||
}
|
}
|
||||||
|
|
@ -21,7 +22,7 @@ public class MentionListener extends ListenerAdapter {
|
||||||
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
|
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
|
||||||
if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())||
|
if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())||
|
||||||
event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) {
|
event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) {
|
||||||
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
event.getChannel().sendMessage(new MessageEditor(rethink, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Hello I'm Hadder.")
|
.setTitle("Hello I'm Hadder.")
|
||||||
.setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
|
.setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
|
||||||
.addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
|
.addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ package com.bbn.hadder.listener;
|
||||||
* @author Skidder / GregTCLTK
|
* @author Skidder / GregTCLTK
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import com.bbn.hadder.Rethink;
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
import com.bbn.hadder.utils.MessageEditor;
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
import net.dv8tion.jda.api.entities.ChannelType;
|
||||||
import net.dv8tion.jda.api.entities.PrivateChannel;
|
import net.dv8tion.jda.api.entities.PrivateChannel;
|
||||||
|
|
@ -14,18 +15,24 @@ import java.time.Instant;
|
||||||
|
|
||||||
public class PrivateMessageListener extends ListenerAdapter {
|
public class PrivateMessageListener extends ListenerAdapter {
|
||||||
|
|
||||||
|
private Rethink rethink;
|
||||||
|
|
||||||
|
public PrivateMessageListener(Rethink rethink) {
|
||||||
|
this.rethink = rethink;
|
||||||
|
}
|
||||||
|
|
||||||
public void onMessageReceived(MessageReceivedEvent event) {
|
public void onMessageReceived(MessageReceivedEvent event) {
|
||||||
if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
|
if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
|
||||||
PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
|
PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
|
||||||
PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
|
PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
|
||||||
|
|
||||||
Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
Skidder.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("New DM by " + event.getAuthor().getAsTag())
|
.setTitle("New DM by " + event.getAuthor().getAsTag())
|
||||||
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
|
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
|
||||||
.setDescription(event.getMessage().getContentRaw())
|
.setDescription(event.getMessage().getContentRaw())
|
||||||
.setTimestamp(Instant.now())
|
.setTimestamp(Instant.now())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
|
Hax.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("New DM by " + event.getAuthor().getAsTag())
|
.setTitle("New DM by " + event.getAuthor().getAsTag())
|
||||||
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
|
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
|
||||||
.setDescription(event.getMessage().getContentRaw())
|
.setDescription(event.getMessage().getContentRaw())
|
||||||
|
|
|
||||||
67
src/main/java/com/bbn/hadder/listener/StarboardListener.java
Normal file
67
src/main/java/com/bbn/hadder/listener/StarboardListener.java
Normal file
|
|
@ -0,0 +1,67 @@
|
||||||
|
package com.bbn.hadder.listener;
|
||||||
|
|
||||||
|
import com.bbn.hadder.Rethink;
|
||||||
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
|
import net.dv8tion.jda.api.MessageBuilder;
|
||||||
|
import net.dv8tion.jda.api.events.message.react.GenericMessageReactionEvent;
|
||||||
|
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
|
||||||
|
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
|
||||||
|
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
|
||||||
|
public class StarboardListener extends ListenerAdapter {
|
||||||
|
|
||||||
|
private Rethink rethink;
|
||||||
|
|
||||||
|
public StarboardListener(Rethink rethink) {
|
||||||
|
this.rethink = rethink;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) {
|
||||||
|
update(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent event) {
|
||||||
|
update(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void update(GenericMessageReactionEvent event) {
|
||||||
|
if (event.getReaction().getReactionEmote().getName().equals("⭐")) {
|
||||||
|
if (!rethink.hasStarboardMessage(event.getMessageId())) {
|
||||||
|
if (rethink.hasStarboardChannel(event.getGuild().getId())) {
|
||||||
|
event.getChannel().retrieveMessageById(event.getMessageId()).queue(msg -> {
|
||||||
|
event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
|
||||||
|
.sendMessage(new MessageBuilder()
|
||||||
|
.setContent("⭐1" + " " + event.getTextChannel().getAsMention())
|
||||||
|
.setEmbed(
|
||||||
|
new EmbedBuilder()
|
||||||
|
.setAuthor(event.getUser().getAsTag())
|
||||||
|
.setDescription(msg.getContentRaw())
|
||||||
|
.setTimestamp(msg.getTimeCreated()).build()).build()).queue(
|
||||||
|
starboardmsg -> {
|
||||||
|
rethink.insertStarboardMessage(msg.getId(), event.getGuild().getId(), starboardmsg.getId());
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
|
||||||
|
.retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue(
|
||||||
|
msg -> {
|
||||||
|
msg.editMessage(new MessageBuilder()
|
||||||
|
.setContent("⭐" + event.getReaction().getCount() + " " + event.getTextChannel().getAsMention())
|
||||||
|
.setEmbed(
|
||||||
|
new EmbedBuilder()
|
||||||
|
.setAuthor(event.getUser().getAsTag())
|
||||||
|
.setDescription(msg.getContentRaw())
|
||||||
|
.setTimestamp(msg.getTimeCreated()).build()).build()).queue();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
package com.bbn.hadder.utils;
|
package com.bbn.hadder.utils;
|
||||||
|
|
||||||
|
import com.bbn.hadder.Rethink;
|
||||||
|
import com.bbn.hadder.commands.CommandEvent;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
|
import net.dv8tion.jda.api.entities.User;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
|
|
@ -9,7 +12,46 @@ import java.util.ResourceBundle;
|
||||||
|
|
||||||
public class MessageEditor {
|
public class MessageEditor {
|
||||||
|
|
||||||
public EmbedBuilder setDefaultSettings(MessageType type) {
|
private Rethink rethink;
|
||||||
|
private User user;
|
||||||
|
|
||||||
|
public MessageEditor(Rethink rethink, User user) {
|
||||||
|
this.rethink = rethink;
|
||||||
|
this.user = user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbedBuilder getMessage(MessageType type) {
|
||||||
|
return this.getMessage(type, "", "", "", "", "", "");
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbedBuilder getMessage(MessageType type, String title_language_string, String description_language_string) {
|
||||||
|
return this.getMessage(type, title_language_string, "", "", description_language_string, "", "");
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra,
|
||||||
|
String description_language_string, String description_extra) {
|
||||||
|
return this.getMessage(type, title_language_string, title_extra, "", description_language_string, description_extra, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two,
|
||||||
|
String description_language_string, String description_extra, String description_extra_two) {
|
||||||
|
String language = rethink.getLanguage(this.user.getId());
|
||||||
|
EmbedBuilder eb = this.getDefaultSettings(type);
|
||||||
|
if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two));
|
||||||
|
if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two));
|
||||||
|
return eb;
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum MessageType {
|
||||||
|
ERROR,
|
||||||
|
WARNING,
|
||||||
|
INFO,
|
||||||
|
NO_PERMISSION,
|
||||||
|
NO_SELF_PERMISSION,
|
||||||
|
NO_NSFW
|
||||||
|
}
|
||||||
|
|
||||||
|
private EmbedBuilder getDefaultSettings(MessageType type) {
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
EmbedBuilder builder = new EmbedBuilder();
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case INFO:
|
case INFO:
|
||||||
|
|
@ -63,27 +105,24 @@ public class MessageEditor {
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum MessageType {
|
public String getTerm(String string) {
|
||||||
ERROR,
|
return this.handle(rethink.getLanguage(user.getId()), string, "", "");
|
||||||
WARNING,
|
|
||||||
INFO,
|
|
||||||
NO_PERMISSION,
|
|
||||||
NO_SELF_PERMISSION,
|
|
||||||
NO_NSFW
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String handle(String language_code, String string) {
|
public String getTerm(String string, String extra, String extra_two) {
|
||||||
Locale locale = new Locale(language_code);
|
return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two);
|
||||||
return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String handle(String language_code, String string, String extra) {
|
public static String getTerm(CommandEvent event, String string, String extra, String extra_two) {
|
||||||
Locale locale = new Locale(language_code);
|
return new MessageEditor(null, null)
|
||||||
return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra);
|
.handle(event.getRethink().getLanguage(event.getAuthor().getId()), string, extra, extra_two);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String handle(String language_code, String string, String extra, String extra_two) {
|
private String handle(String language_code, String string, String extra, String extra_two) {
|
||||||
Locale locale = new Locale(language_code);
|
Locale locale = new Locale(language_code);
|
||||||
return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
|
ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
|
||||||
|
if (resourceBundle.containsKey(string))
|
||||||
|
return resourceBundle.getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
|
||||||
|
else return "This key doesn't exist. Please report this to the Bot Developers. Key: "+string+" Language_code: "+language_code;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -117,3 +117,4 @@ commands.moderation.nick.success.description=I successfully nicked
|
||||||
commands.moderation.nick.myself.success.description=I successfully changed my nickname.
|
commands.moderation.nick.myself.success.description=I successfully changed my nickname.
|
||||||
commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\!
|
commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\!
|
||||||
commands.moderation.nick.help.description=Rename a one or more user.
|
commands.moderation.nick.help.description=Rename a one or more user.
|
||||||
|
commands.moderation.starboard.successchannel=
|
||||||
|
|
|
||||||
|
|
@ -163,6 +163,7 @@ commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote
|
||||||
commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote.
|
commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote.
|
||||||
commands.moderation.rules.emoji.error.description = The given emote can't be used.
|
commands.moderation.rules.emoji.error.description = The given emote can't be used.
|
||||||
commands.moderation.rules.help.description = Setup the rules on your Discord server
|
commands.moderation.rules.help.description = Setup the rules on your Discord server
|
||||||
|
commands.moderation.starboard.successchannel=Successfully set the Channel!
|
||||||
|
|
||||||
commands.music.join.success.title = Successfully connected
|
commands.music.join.success.title = Successfully connected
|
||||||
commands.music.join.success.description = I successfully connected to %extra%.
|
commands.music.join.success.description = I successfully connected to %extra%.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue