diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5d1924..bf337ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,7 @@ further defined and clarified by project maintainers. ### Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team on [Discord](https://discordapp.com/invite/58My2dM). All +reported by contacting the project team on [Discord](https://discordapp.com/invite/nPwjaJk). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/README.md b/README.md index 34413f0..0ae7adc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime. - + [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&utm_medium=referral&utm_content=BigBotNetwork/Hadder&utm_campaign=Badge_Grade) [![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder) @@ -11,12 +11,6 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime. [![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE) [![time tracker](https://wakatime.com/badge/github/BigBotNetwork/Hadder.svg)](https://wakatime.com/badge/github/BigBotNetwork/Hadder) -[![MBL](Https://Mythicalbots.Xyz/Bot/637002314162372639/Embed?Q=Dark/ )](Https://Mythicalbots.Xyz/Bot/637002314162372639) -[![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639) -[![Hadder's Widget](https://api.botlist.space/widget/637002314162372639/2 "Hadder's Widget")](https://botlist.space/bot/637002314162372639?utm_source=bls&utm_medium=widget&utm_campaign=637002314162372639) -[![Discord Bots](https://discordbotlist.com/bots/637002314162372639/widget)](https://discordbotlist.com/bots/637002314162372639) -[![Arcane Bot Center](https://arcane-botcenter.xyz/api/widget/637002314162372639.svg)](https://arcane-botcenter.xyz/bot/637002314162372639) - ## Hadder Team ### Developer Skidder#6775
diff --git a/pom.xml b/pom.xml index 185c8ee..0fae6af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 Hadder Hadder - 1.3.16 + 1.3.17 Hadder 2019 Hadder is a multi-purpose Discord bot. @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_204 + 4.2.0_207 org.json @@ -89,7 +89,7 @@ club.minnced discord-webhooks - 0.4.1 + 0.5.0 org.kohsuke @@ -104,7 +104,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.11.2 + 2.11.3 diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index 25f8295..361284b 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -70,7 +70,7 @@ public class AvatarCommand implements Command { } catch (NullPointerException ignore) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/users/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); + Request request = new Request.Builder().url("https://canary.discord.com/api/v8/users/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); try { Response response = client.newCall(request).execute(); diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 669b3f0..feabf9a 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -30,7 +30,7 @@ public class InviteCommand implements Command { "commands.general.invite.success.title", "", "commands.general.invite.success.description", - "(https://discordapp.com/oauth2/authorize?client_id=" + "(https://discord.com/oauth2/authorize?client_id=" + e.getJDA().getSelfUser().getId() + "&scope=bot&permissions=1043852663)") .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java index 9f22e89..443331c 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java @@ -31,7 +31,7 @@ public class CodeCommand implements Command { public void executed(String[] args, CommandEvent e) { if (args.length > 0) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/invite/" + args[0] + "?with_counts=true").addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); + Request request = new Request.Builder().url("https://canary.discord.com/api/v8/invite/" + args[0] + "?with_counts=true").addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); try { Response response = client.newCall(request).execute(); @@ -77,6 +77,6 @@ public class CodeCommand implements Command { @Override public String example() { - return "58My2dM"; + return "nPwjaJk"; } } diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index fd7a584..65cd24d 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -36,7 +36,7 @@ public class ScreenShareCommand implements Command { e.getChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + args[0] + "/").build()).queue(); + .setDescription("http://discord.com/channels/" + e.getGuild().getId() + "/" + args[0] + "/").build()).queue(); } else { e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue(); e.getHelpCommand().sendHelp(this, e); @@ -55,7 +55,7 @@ public class ScreenShareCommand implements Command { int i = Integer.parseInt(msge.getMessage().getContentRaw()); if (vcs.size() > i) { e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); + .setDescription("http://discord.com/channels/" + e.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); } else { e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue(); e.getHelpCommand().sendHelp(this, e); @@ -70,7 +70,7 @@ public class ScreenShareCommand implements Command { e.getHelpCommand().sendHelp(this, e); } else { e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); + .setDescription("http://discord.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); } } } else e.getHelpCommand().sendHelp(this, e); diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index 69dddfd..d0d8b13 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -20,6 +20,8 @@ import com.bbn.hadder.db.Rethink; import com.bbn.hadder.db.RethinkServer; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.ChannelType; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageUpdateEvent; @@ -41,21 +43,14 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent e) { - if (e.isFromType(ChannelType.TEXT)) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect())) { - checkInvite(e.getMessage(), "discord.gg/"); - } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { - checkInvite(e.getMessage(), "discordapp.com/invite/"); - } - } + scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember()); } public void checkInvite(Message message, String regex) { String split = message.getContentRaw().split(regex, 10)[1]; String invite = split.split(" ")[0]; OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/invites/" + invite).build(); + Request request = new Request.Builder().url("https://canary.discord.com/api/v8/invites/" + invite).build(); try { Response response = client.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); @@ -69,12 +64,18 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { - if (e.isFromType(ChannelType.TEXT)) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { - checkInvite(e.getMessage(), "discord.gg/"); - } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { - checkInvite(e.getMessage(), "discordapp.com/invite/"); + scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember()); + } + + public void scanMessage(boolean fromType, Guild guild, Message message, Member member) { + if (fromType) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink); + if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { + checkInvite(message, "discord.gg/"); + } else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { + checkInvite(message, "discord.com/invite/"); + } else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { + checkInvite(message, "discordapp.com/invite/"); } } } diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 16b2b19..25e9fc6 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -70,7 +70,7 @@ public class MentionListener extends ListenerAdapter { developer -> devs.append(developer.getId()).append(" - [Website](").append(developer.getUrl()).append("), [E-Mail](https://hax.bigbotnetwork.de/redirect.html?url=mailto:").append(developer.getEmail()).append(")\n") ); builder.addField("Developer", devs.toString(), false); - builder.addField("Join our Dev Server!", "[Click here!](https://discord.gg/58My2dM)", true); + builder.addField("Join our Dev Server!", "[Click here!](https://discord.gg/nPwjaJk)", true); builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false); builder.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false); e.getChannel().sendMessage(builder.build()).queue();