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

Gimme more #545

Merged
greg6775 merged 140 commits from master into hax-dev 2020-09-19 23:18:45 +02:00
Conversation 0 Commits 140 Files changed 71 +337 -322
55 changed files with 337 additions and 322 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 405e740de9 - Show all commits

2
example-config.json
View file

@ -1,7 +1,5 @@
{ {
"Owners": [ "Owners": [
], ],
"Database": { "Database": {
"IP": "", "IP": "",

23
pom.xml
View file

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>Hadder</groupId> <groupId>Hadder</groupId>
<artifactId>Hadder</artifactId> <artifactId>Hadder</artifactId>
<version>1.3.15</version> <version>1.3.16</version>
<name>Hadder</name> <name>Hadder</name>
<inceptionYear>2019</inceptionYear> <inceptionYear>2019</inceptionYear>
<description>Hadder is a multi-purpose Discord bot.</description> <description>Hadder is a multi-purpose Discord bot.</description>
@ -34,7 +35,8 @@
<url>https://bigbotnetwork.com/</url> <url>https://bigbotnetwork.com/</url>
<timezone>Europe/Berlin</timezone> <timezone>Europe/Berlin</timezone>
<properties> <properties>
<picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp</picUrl> <picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp
</picUrl>
</properties> </properties>
</developer> </developer>
<developer> <developer>
@ -44,7 +46,8 @@
<url>https://bigbotnetwork.com/</url> <url>https://bigbotnetwork.com/</url>
<timezone>Europe/Berlin</timezone> <timezone>Europe/Berlin</timezone>
<properties> <properties>
<picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif</picUrl> <picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif
</picUrl>
</properties> </properties>
</developer> </developer>
</developers> </developers>
@ -66,7 +69,7 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>4.1.1_165</version> <version>4.2.0_194</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
@ -86,12 +89,12 @@
<dependency> <dependency>
<groupId>club.minnced</groupId> <groupId>club.minnced</groupId>
<artifactId>discord-webhooks</artifactId> <artifactId>discord-webhooks</artifactId>
<version>0.3.1</version> <version>0.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kohsuke</groupId> <groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId> <artifactId>github-api</artifactId>
<version>1.114</version> <version>1.116</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sedmelluq</groupId> <groupId>com.sedmelluq</groupId>
@ -101,7 +104,7 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>2.11.0</version> <version>2.11.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -114,7 +117,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version> <version>3.2.0</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
@ -142,7 +145,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.9.0</version> <version>3.9.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>

13
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -17,15 +17,20 @@
package com.bbn.hadder; package com.bbn.hadder;
import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.fun.AvatarCommand;
import com.bbn.hadder.commands.fun.ClydeCommand;
import com.bbn.hadder.commands.fun.GifCommand;
import com.bbn.hadder.commands.fun.MemeCommand;
import com.bbn.hadder.commands.general.*; import com.bbn.hadder.commands.general.*;
import com.bbn.hadder.commands.misc.*; import com.bbn.hadder.commands.misc.*;
import com.bbn.hadder.commands.moderation.*; import com.bbn.hadder.commands.moderation.*;
import com.bbn.hadder.commands.music.*;
import com.bbn.hadder.commands.nsfw.*; import com.bbn.hadder.commands.nsfw.*;
import com.bbn.hadder.commands.owner.*; import com.bbn.hadder.commands.owner.*;
import com.bbn.hadder.commands.fun.*; import com.bbn.hadder.commands.settings.LanguageCommand;
import com.bbn.hadder.commands.settings.*; import com.bbn.hadder.commands.settings.UserPrefixCommand;
import com.bbn.hadder.commands.music.*; import com.bbn.hadder.core.CommandHandler;
import com.bbn.hadder.core.*; import com.bbn.hadder.core.Config;
import com.bbn.hadder.db.Rethink; import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.listener.*; import com.bbn.hadder.listener.*;
import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.OnlineStatus;

5
src/main/java/com/bbn/hadder/audio/AudioManager.java
View file

@ -18,7 +18,10 @@ package com.bbn.hadder.audio;
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.sedmelluq.discord.lavaplayer.player.*; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;

10
src/main/java/com/bbn/hadder/audio/TrackManager.java
View file

@ -24,7 +24,9 @@ import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.entities.VoiceChannel;
import java.util.*; import java.util.LinkedHashSet;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
public class TrackManager extends AudioEventAdapter { public class TrackManager extends AudioEventAdapter {
@ -91,13 +93,11 @@ public class TrackManager extends AudioEventAdapter {
queue.remove(entry); queue.remove(entry);
} }
public boolean isLoop() public boolean isLoop() {
{
return loop; return loop;
} }
public void setLoop(boolean repeating) public void setLoop(boolean repeating) {
{
this.loop = repeating; this.loop = repeating;
} }
} }

6
src/main/java/com/bbn/hadder/commands/CommandEvent.java
View file

@ -16,13 +16,13 @@
package com.bbn.hadder.commands; package com.bbn.hadder.commands;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.audio.AudioManager;
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.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
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 net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;

3
src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
View file

@ -66,7 +66,8 @@ public class ClydeCommand implements Command {
} }
webhook.delete().queue(); webhook.delete().queue();
e.getMessage().delete().queue(); e.getMessage().delete().queue();
} else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } else
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} else e.getHelpCommand().sendHelp(this, e); } else e.getHelpCommand().sendHelp(this, e);
} }

6
src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
View file

@ -54,10 +54,12 @@ public class GitHubCommand implements Command {
String website = "None"; String website = "None";
try { try {
bio = json.getString("bio"); bio = json.getString("bio");
} catch (JSONException ignored) {} } catch (JSONException ignored) {
}
try { try {
location = json.getString("location"); location = json.getString("location");
} catch (JSONException ignored) {} } catch (JSONException ignored) {
}
if (!json.getString("blog").equals("")) website = json.getString("blog"); if (!json.getString("blog").equals("")) website = json.getString("blog");

1
src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java
View file

@ -15,6 +15,7 @@
*/ */
package com.bbn.hadder.commands.misc; package com.bbn.hadder.commands.misc;
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.core.Perm; import com.bbn.hadder.core.Perm;

1
src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
View file

@ -21,7 +21,6 @@ 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 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;

3
src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
View file

@ -48,7 +48,8 @@ public class ServerStatsCommand implements Command {
.setImage(e.getGuild().getBannerUrl()); .setImage(e.getGuild().getBannerUrl());
if (e.getGuild().getDescription() != null) eb.addField("Description", e.getGuild().getDescription(), true); if (e.getGuild().getDescription() != null) eb.addField("Description", e.getGuild().getDescription(), true);
if (e.getGuild().getVanityCode() != null) eb.addField("Vanity Code", "[" + e.getGuild().getVanityCode() + "](https://discord.gg/" + e.getGuild().getVanityCode() + ")", true); if (e.getGuild().getVanityCode() != null)
eb.addField("Vanity Code", "[" + e.getGuild().getVanityCode() + "](https://discord.gg/" + e.getGuild().getVanityCode() + ")", true);
e.getTextChannel().sendMessage(eb.build()).queue(); e.getTextChannel().sendMessage(eb.build()).queue();
} }

3
src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java
View file

@ -31,7 +31,8 @@ public class RoleAssignmentCommand implements Command {
//TODO: THIS LOL //TODO: THIS LOL
if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
} else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } else
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} }
@Override @Override

2
src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class AnalCommand implements Command { public class AnalCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class BDSMCommand implements Command { public class BDSMCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class BlowjobCommand implements Command { public class BlowjobCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class BoobsCommand implements Command { public class BoobsCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class CumCommand implements Command { public class CumCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class EroticCommand implements Command { public class EroticCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class FeetCommand implements Command { public class FeetCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class FingeringCommand implements Command { public class FingeringCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class LickingCommand implements Command { public class LickingCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class PornCommand implements Command { public class PornCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class PussyCommand implements Command { public class PussyCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class RandomPornCommand implements Command { public class RandomPornCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class SoloCommand implements Command { public class SoloCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class SpankCommand implements Command { public class SpankCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
View file

@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
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.Http; import com.bbn.hadder.utils.Http;
import com.bbn.hadder.utils.MessageEditor;
public class TransCommand implements Command { public class TransCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
View file

@ -16,11 +16,11 @@
package com.bbn.hadder.commands.owner; package com.bbn.hadder.commands.owner;
import com.bbn.hadder.db.RethinkUser;
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.core.Perm; import com.bbn.hadder.core.Perm;
import com.bbn.hadder.core.Perms; import com.bbn.hadder.core.Perms;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;

6
src/main/java/com/bbn/hadder/core/CommandHandler.java
View file

@ -16,13 +16,13 @@
package com.bbn.hadder.core; package com.bbn.hadder.core;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.audio.AudioManager;
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.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
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 net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

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

@ -16,11 +16,11 @@
package com.bbn.hadder.listener; package com.bbn.hadder.listener;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.core.CommandHandler;
import com.bbn.hadder.db.Rethink; import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer; import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser; import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.core.CommandHandler;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;

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

@ -16,8 +16,8 @@
package com.bbn.hadder.listener; package com.bbn.hadder.listener;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.core.Config; import com.bbn.hadder.core.Config;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.BotList;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;

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

@ -5,11 +5,9 @@
package com.bbn.hadder.listener; package com.bbn.hadder.listener;
import com.bbn.hadder.core.Config; import com.bbn.hadder.core.Config;
import com.bbn.hadder.core.Perms;
import net.dv8tion.jda.api.entities.Emote; import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.json.JSONObject;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

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

@ -16,8 +16,8 @@
package com.bbn.hadder.listener; package com.bbn.hadder.listener;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.core.Config; import com.bbn.hadder.core.Config;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.BotList;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;

3
src/main/java/com/bbn/hadder/listener/RulesListener.java
View file

@ -60,7 +60,8 @@ public class RulesListener extends ListenerAdapter {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink);
if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRoleID()))) { if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRoleID()))) {
e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue();
} else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); } else
e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue();
} }
@Override @Override

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

@ -53,7 +53,8 @@ public class MessageEditor {
String language = (this.user != null) ? rethinkUser.getLanguage() : null; String language = (this.user != null) ? rethinkUser.getLanguage() : null;
EmbedBuilder eb = this.getDefaultSettings(type); EmbedBuilder eb = this.getDefaultSettings(type);
if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); if (!"".equals(description))
eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
return eb; return eb;
} }
@ -133,6 +134,7 @@ public class MessageEditor {
ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale); ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
if (resourceBundle.containsKey(string)) if (resourceBundle.containsKey(string))
return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two); return resourceBundle.getString(string).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 + "`"; else
return "This key doesn't exist. Please report this to the Bot Developers. Key: `" + string + "` Language_code: `" + language_code + "`";
} }
} }