From 406e92ff1c1564727a3f29666a1f656e6ea7d705 Mon Sep 17 00:00:00 2001 From: Greg Date: Mon, 5 Apr 2021 13:28:36 +0200 Subject: [PATCH 1/9] Update GitHub --- pom.xml | 2 +- src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 26b7ba3..0fcb619 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ Hadder 2019 Hadder is a multi-purpose Discord bot. - https://github.com/BigBotNetwork/Hadder + https://github.com/BBN-Holding/Hadder diff --git a/src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java index 849f526..289ae88 100644 --- a/src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java @@ -47,7 +47,7 @@ public class FeedbackCommand implements Command { String description = e2.getMessage().getContentDisplay(); try { GitHub connection = GitHub.connectUsingOAuth(e.getConfig().getGitHubToken()); - GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder"); + GHRepository Hadder = connection.getOrganization("BBN-Holding").getRepository("Hadder"); GHIssue issue = Hadder.createIssue(title).body("Feedback by " + e.getAuthor().getAsTag() + "
" + description).label("feedback").create(); issue.addLabels("feedback"); e.getTextChannel().sendMessage( From 2740c546e6f70a4657402732d105127c13ee665e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 13:19:47 +0000 Subject: [PATCH 2/9] Bump maven-model from 3.6.3 to 3.8.1 Bumps [maven-model](https://github.com/apache/maven) from 3.6.3 to 3.8.1. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.8.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fcb619..1c66f12 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ org.apache.maven maven-model - 3.6.3 + 3.8.1 net.dv8tion From 96426febde7d9e71c283c73054f53cf794422dec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 6 Apr 2021 13:36:34 +0000 Subject: [PATCH 3/9] Bump mongodb-driver-sync from 4.2.2 to 4.2.3 Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.2.2 to 4.2.3. - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.2.2...r4.2.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fcb619..86044f7 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ org.mongodb mongodb-driver-sync - 4.2.2 + 4.2.3 From 5c23a810d0170a90fffaedc74fc44b817c78c762 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 9 Apr 2021 13:36:52 +0000 Subject: [PATCH 4/9] Bump github-api from 1.125 to 1.127 Bumps [github-api](https://github.com/hub4j/github-api) from 1.125 to 1.127. - [Release notes](https://github.com/hub4j/github-api/releases) - [Changelog](https://github.com/hub4j/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/hub4j/github-api/compare/github-api-1.125...github-api-1.127) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d77915..273b1a4 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ org.kohsuke github-api - 1.125 + 1.127 com.sedmelluq From 0427689f5dde92b3bf898ddc8b257312d6406b57 Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 11 Apr 2021 02:08:58 +0200 Subject: [PATCH 5/9] Catch no permission exception --- .../bbn/hadder/listener/CommandListener.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/one/bbn/hadder/listener/CommandListener.java b/src/main/java/one/bbn/hadder/listener/CommandListener.java index 2dca246..93e2c0f 100644 --- a/src/main/java/one/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/one/bbn/hadder/listener/CommandListener.java @@ -78,13 +78,16 @@ public class CommandListener extends ListenerAdapter { } } } else { - e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() - .setTitle("No permission") - .setDescription("I need the `MESSAGE WRITE` permission in order to work!") - .setColor(Color.RED) - .setFooter("Hadder", "https://bbn.one/images/Hadder.png") - .setTimestamp(Instant.now()) - .build()).queue(); + try { + e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() + .setTitle("No permission") + .setDescription("I need the `MESSAGE WRITE` permission in order to work!") + .setColor(Color.RED) + .setFooter("Hadder", "https://bbn.one/images/Hadder.png") + .setTimestamp(Instant.now()) + .build()).queue(); + } catch (ErrorResponseException ignore) {} + } } } From 01aae9ac17b97573a967787492ef484bc38b04d1 Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 11 Apr 2021 02:09:39 +0200 Subject: [PATCH 6/9] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 273b1a4..bed6552 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 Hadder Hadder - 2.0.1 + 2.0.2 Hadder 2019 Hadder is a multi-purpose Discord bot. From 229b2dc89fc0636ae13e6b0ea69fa37ee04b9336 Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 11 Apr 2021 02:14:55 +0200 Subject: [PATCH 7/9] Remove old org name --- .github/ISSUE_TEMPLATE/config.yml | 2 +- README.md | 10 +++++----- .../java/one/bbn/hadder/listener/MentionListener.java | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 25d5ad5..548eafd 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - - name: BigBotNetwork Discord Support + - name: BBN Holding Discord Support url: https://discord.gg/nPwjaJk about: Please ask questions here. diff --git a/README.md b/README.md index a3aad5d..4a60d71 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ 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) +[![Build Status](https://github.com/BBN-Holding/Hadder/workflows/Hadder/badge.svg)](https://github.com/BBN-Holding/Hadder) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BBN-Holding/Hadder?utm_source=github.com&utm_medium=referral&utm_content=BBN-Holding/Hadder&utm_campaign=Badge_Grade) [![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder) [![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder) -[![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues) -[![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) +[![GitHub issues](https://img.shields.io/github/issues/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/issues) +[![GitHub license](https://img.shields.io/github/license/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/blob/master/LICENSE) +[![time tracker](https://wakatime.com/badge/github/BBN-Holding/Hadder.svg)](https://wakatime.com/badge/github/BBN-Holding/Hadder) ## Hadder Team ### Developer diff --git a/src/main/java/one/bbn/hadder/listener/MentionListener.java b/src/main/java/one/bbn/hadder/listener/MentionListener.java index 830eef8..7250e4c 100644 --- a/src/main/java/one/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/one/bbn/hadder/listener/MentionListener.java @@ -53,7 +53,7 @@ public class MentionListener extends ListenerAdapter { try { GitHub connection = GitHub.connectUsingOAuth(config.getGitHubToken()); - GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder"); + GHRepository Hadder = connection.getOrganization("BBN-Holding").getRepository("Hadder"); version = Hadder.getLatestRelease().getTagName(); } catch (IOException ioException) { ioException.printStackTrace(); @@ -65,8 +65,7 @@ public class MentionListener extends ListenerAdapter { .addField("User-Prefix", mongoUser.getPrefix(), true) .addField("Guild-Prefix", mongoServer.getPrefix(), true) .addField("Join our Dev Server!", "[Click here!](https://discord.gg/nPwjaJk)", true) - .addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false) - .addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false); + .addField("Github", "[Click here!](https://github.com/BBN-Holding/Hadder)", false) e.getChannel().sendMessage(builder.build()).queue(); } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { int member = new Random().nextInt(e.getGuild().getMembers().size() - 1); From 3d6e8cc082c228ea25d31f35cefe03f6bdb0f240 Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 11 Apr 2021 02:16:30 +0200 Subject: [PATCH 8/9] Lil fix --- src/main/java/one/bbn/hadder/listener/MentionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/one/bbn/hadder/listener/MentionListener.java b/src/main/java/one/bbn/hadder/listener/MentionListener.java index 7250e4c..0f53d55 100644 --- a/src/main/java/one/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/one/bbn/hadder/listener/MentionListener.java @@ -65,7 +65,7 @@ public class MentionListener extends ListenerAdapter { .addField("User-Prefix", mongoUser.getPrefix(), true) .addField("Guild-Prefix", mongoServer.getPrefix(), true) .addField("Join our Dev Server!", "[Click here!](https://discord.gg/nPwjaJk)", true) - .addField("Github", "[Click here!](https://github.com/BBN-Holding/Hadder)", false) + .addField("Github", "[Click here!](https://github.com/BBN-Holding/Hadder)", false); e.getChannel().sendMessage(builder.build()).queue(); } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { int member = new Random().nextInt(e.getGuild().getMembers().size() - 1); From 419bbfed933d9c65e3e1d6c0a17a10aae1ce5b3d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 13:35:24 +0000 Subject: [PATCH 9/9] Bump jackson-annotations from 2.12.2 to 2.12.3 Bumps [jackson-annotations](https://github.com/FasterXML/jackson) from 2.12.2 to 2.12.3. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bed6552..14344c1 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 org.mongodb