From b4e54c4b3018c894ee381e5d640383b6871b9b96 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 29 Nov 2019 18:13:29 +0100 Subject: [PATCH 1/4] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..8084d83 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,34 @@ +--- +name: Bug report +about: Create a report to help us improve +title: Bug report +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - Discord version: [e.g. Discord PTB] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + +**Additional context** +Add any other context about the problem here. -- 2.45.3 From 79abf99b15ec5f896537fb22f16b097ae5da01e0 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 29 Nov 2019 20:30:35 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 668a57d..a1f88e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -The Hadder Discord bot is a multi-purpose Discord Bot. +The Hadder Discord Bot is a multi-purpose Discord Bot. [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) -- 2.45.3 From 7f44c2358be9fbdb301de4538911febb0359451e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 30 Nov 2019 12:50:48 +0100 Subject: [PATCH 3/4] SelfMentionListener fix --- src/main/java/com/bbn/hadder/listener/MentionListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index f356a9a..39b64d2 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -21,14 +21,14 @@ public class MentionListener extends ListenerAdapter { public void onMessageReceived(@Nonnull MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT)) { if (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) { - EmbedBuilder builder = new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("Hello I'm Hadder.") .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false) .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) - .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false); - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).build()).queue(); + .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false) + .build()).queue(); } } } -- 2.45.3 From 7abbe283256809ac1395e26511de83e51791f2c9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 30 Nov 2019 12:52:36 +0100 Subject: [PATCH 4/4] PrivateMessageListener fix --- .../com/bbn/hadder/listener/GuildListener.java | 3 --- .../java/com/bbn/hadder/listener/LinkListener.java | 1 - .../hadder/listener/PrivateMessageListener.java | 14 +++++++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 6cbf2d7..920f10c 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -8,7 +8,6 @@ import com.bbn.hadder.Rethink; import com.bbn.hadder.core.Config; import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.events.guild.GuildLeaveEvent; @@ -37,7 +36,6 @@ public class GuildListener extends ListenerAdapter { }).start(); rethink.insertGuild(event.getGuild().getId()); - EmbedBuilder builder = new EmbedBuilder(); event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("Joined Server") .setThumbnail(event.getGuild().getIconUrl()) @@ -53,7 +51,6 @@ public class GuildListener extends ListenerAdapter { } public void onGuildLeave(GuildLeaveEvent event) { - EmbedBuilder builder = new EmbedBuilder(); event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("Left Server") .setThumbnail(event.getGuild().getIconUrl()) diff --git a/src/main/java/com/bbn/hadder/listener/LinkListener.java b/src/main/java/com/bbn/hadder/listener/LinkListener.java index cffe561..5c34a70 100644 --- a/src/main/java/com/bbn/hadder/listener/LinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/LinkListener.java @@ -3,7 +3,6 @@ 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.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index f542d21..da43ef8 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -22,14 +22,18 @@ public class PrivateMessageListener extends ListenerAdapter { PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); - EmbedBuilder message = new EmbedBuilder() + Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("New DM by " + event.getAuthor().getAsTag()) .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .setDescription(event.getMessage().getContentRaw()) - .setTimestamp(Instant.now()); - - Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).build()).queue(); - Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).build()).queue(); + .setTimestamp(Instant.now()) + .build()).queue(); + Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + .setTitle("New DM by " + event.getAuthor().getAsTag()) + .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) + .setDescription(event.getMessage().getContentRaw()) + .setTimestamp(Instant.now()) + .build()).queue(); } } } -- 2.45.3