greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Sync with master #685

Merged
greg6775 merged 13 commits from master into greg-dev 2021-07-21 23:20:14 +02:00
Conversation 0 Commits 13 Files changed 1 +21 -21
7 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8ea8225417 - Show all commits

6
CODE_OF_CONDUCT.md
View file

@ -57,7 +57,7 @@ If a community member engages in unacceptable behavior, the community organizers
## 7. Reporting Guidelines
If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bigbotnetwork.com.
If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bbn.one.
@ -65,7 +65,7 @@ Additionally, community organizers are available to help community members engag
## 8. Addressing Grievances
If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify BigBotNetwork with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify BBN with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
@ -77,7 +77,7 @@ This code of conduct and its related procedures also applies to unacceptable beh
## 10. Contact info
admin@bigbotnetwork.com
admin@bbn.one
## 11. License and attribution

2
crowdin.yml
View file

@ -1,4 +1,4 @@
base_url: 'https://bigbotnetwork.com'
base_url: 'https://bbn.one'
commit_message: 'New %language% translation'
files:
- source: /src/main/resources/Translations/Translations_en.properties

14
pom.xml
View file

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>Hadder</groupId>
<artifactId>Hadder</artifactId>
<version>1.3.24</version>
<version>1.3.25</version>
<name>Hadder</name>
<inceptionYear>2019</inceptionYear>
<description>Hadder is a multi-purpose Discord bot.</description>
@ -31,8 +31,8 @@
<developer>
<id>Hax#6775</id>
<name>Hax</name>
<email>hax@bigbotnetwork.com</email>
<url>https://bigbotnetwork.com/</url>
<email>hax@bbn.one</email>
<url>https://bbn.one/</url>
<timezone>Europe/Berlin</timezone>
<properties>
<picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp
@ -42,8 +42,8 @@
<developer>
<id>Skidder#6775</id>
<name>Greg</name>
<email>skidder@bigbotnetwork.com</email>
<url>https://bigbotnetwork.com/</url>
<email>skidder@bbn.one</email>
<url>https://bbn.one/</url>
<timezone>Europe/Berlin</timezone>
<properties>
<picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif
@ -69,7 +69,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_227</version>
<version>4.2.0_228</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -99,7 +99,7 @@
<dependency>
<groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId>
<version>1.3.66</version>
<version>1.3.67</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>

2
src/main/java/com/bbn/hadder/commands/general/AboutCommand.java
View file

@ -30,7 +30,7 @@ public class AboutCommand implements Command {
"commands.general.about.success.title",
"commands.general.about.success.description")
.addField(e.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), e.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + e.getAuthor().getId() + "). :smiley:", ""), true)
.setThumbnail("https://bigbotnetwork.com/images/Hadder.png")
.setThumbnail("https://bbn.one/images/Hadder.png")
.build()).queue();
}

4
src/main/java/com/bbn/hadder/listener/CommandListener.java
View file

@ -70,7 +70,7 @@ public class CommandListener extends ListenerAdapter {
.setTitle("No permission")
.setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now())
.build()).queue();
} catch (ErrorResponseException ex) {
@ -82,7 +82,7 @@ public class CommandListener extends ListenerAdapter {
.setTitle("No permission")
.setDescription("I need the `MESSAGE WRITE` permission in order to work!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now())
.build()).queue();
}

2
src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
View file

@ -60,7 +60,7 @@ public class PrivateMessageListener extends ListenerAdapter {
.setTitle("No DM support")
.setDescription("You have to execute your commands on a guild! For further support join our Discord server [here](https://discord.gg/nPwjaJk)")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now())
.build()).queue();
}

12
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -73,21 +73,21 @@ public class MessageEditor {
case INFO:
builder
.setColor(new Color(78, 156, 174))
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now());
break;
case ERROR:
builder
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now());
break;
case WARNING:
builder
.setColor(Color.ORANGE)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now());
break;
@ -96,7 +96,7 @@ public class MessageEditor {
.setTitle("⛔ No Permission ⛔")
.setDescription("You are not authorized to execute this command!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now());
break;
@ -105,7 +105,7 @@ public class MessageEditor {
.setTitle("⛔ No Permission ⛔")
.setDescription("Unfortunately, I do not have the required rights to perform this action!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now());
break;
@ -114,7 +114,7 @@ public class MessageEditor {
.setTitle("⛔ No NSFW ⛔")
.setDescription("You can only execute this command in NSFW channels!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setFooter("Hadder", "https://bbn.one/images/Hadder.png")
.setTimestamp(Instant.now());
break;
}