Gimme more #545
55 changed files with 337 additions and 322 deletions
|
|
@ -1,10 +1,8 @@
|
||||||
{
|
{
|
||||||
"Owners": [
|
"Owners": [
|
||||||
|
|
||||||
|
|
||||||
],
|
],
|
||||||
"Database": {
|
"Database": {
|
||||||
"IP":"",
|
"IP": "",
|
||||||
"Port": 6775,
|
"Port": 6775,
|
||||||
"DBName": "",
|
"DBName": "",
|
||||||
"Username": "",
|
"Username": "",
|
||||||
|
|
|
||||||
23
pom.xml
23
pom.xml
|
|
@ -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>
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,10 @@ public class EqualsCommand implements Command {
|
||||||
String secondString = msge2.getMessage().getContentRaw();
|
String secondString = msge2.getMessage().getContentRaw();
|
||||||
e.getChannel().sendMessage(
|
e.getChannel().sendMessage(
|
||||||
e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle((firstString.equals(secondString)) ? e.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : e.getMessageEditor().getTerm( "commands.general.equals.string.equals.false"))
|
.setTitle((firstString.equals(secondString)) ? e.getMessageEditor().getTerm("commands.general.equals.string.equals.true") : e.getMessageEditor().getTerm("commands.general.equals.string.equals.false"))
|
||||||
.addField(e.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false)
|
.addField(e.getMessageEditor().getTerm("commands.general.equals.string.first"), firstString, false)
|
||||||
.addField(e.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false)
|
.addField(e.getMessageEditor().getTerm("commands.general.equals.string.second"), secondString, false)
|
||||||
.addField(e.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
|
.addField(e.getMessageEditor().getTerm("commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}, e.getJDA(), e.getAuthor());
|
}, e.getJDA(), e.getAuthor());
|
||||||
}, e.getJDA(), e.getAuthor());
|
}, e.getJDA(), e.getAuthor());
|
||||||
|
|
|
||||||
|
|
@ -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");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
|
@ -31,8 +30,8 @@ public class ScreenShareCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent e) {
|
public void executed(String[] args, CommandEvent e) {
|
||||||
if (args.length>0) {
|
if (args.length > 0) {
|
||||||
if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) {
|
if (args[0].matches("[0-9]*") && args.length == 1 && args[0].length() == 18) {
|
||||||
if (e.getGuild().getVoiceChannelById(args[0]) != null) {
|
if (e.getGuild().getVoiceChannelById(args[0]) != null) {
|
||||||
e.getChannel().sendMessage(e.getMessageEditor().getMessage(
|
e.getChannel().sendMessage(e.getMessageEditor().getMessage(
|
||||||
MessageEditor.MessageType.INFO,
|
MessageEditor.MessageType.INFO,
|
||||||
|
|
@ -66,7 +65,7 @@ public class ScreenShareCommand implements Command {
|
||||||
e.getHelpCommand().sendHelp(this, e);
|
e.getHelpCommand().sendHelp(this, e);
|
||||||
}
|
}
|
||||||
}, e.getJDA(), e.getAuthor());
|
}, e.getJDA(), e.getAuthor());
|
||||||
} else if (vcs.size()==0) {
|
} else if (vcs.size() == 0) {
|
||||||
e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
|
e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
|
||||||
e.getHelpCommand().sendHelp(this, e);
|
e.getHelpCommand().sendHelp(this, e);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ public class RegionChangeCommand implements Command {
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRegion (Region region, String region_name, CommandEvent e) {
|
public void setRegion(Region region, String region_name, CommandEvent e) {
|
||||||
e.getGuild().getManager().setRegion(region).reason("Region changed by " + e.getAuthor().getAsTag()).queue();
|
e.getGuild().getManager().setRegion(region).reason("Region changed by " + e.getAuthor().getAsTag()).queue();
|
||||||
e.getTextChannel().sendMessage(
|
e.getTextChannel().sendMessage(
|
||||||
e.getMessageEditor().getMessage(
|
e.getMessageEditor().getMessage(
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -25,18 +25,18 @@ public class StarboardCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent e) {
|
public void executed(String[] args, CommandEvent e) {
|
||||||
if (e.getMessage().getMentionedChannels().size()==1) {
|
if (e.getMessage().getMentionedChannels().size() == 1) {
|
||||||
e.getRethinkServer().setStarboard(e.getMessage().getMentionedChannels().get(0).getId());
|
e.getRethinkServer().setStarboard(e.getMessage().getMentionedChannels().get(0).getId());
|
||||||
e.getChannel().sendMessage(
|
e.getChannel().sendMessage(
|
||||||
e.getMessageEditor().getMessage(
|
e.getMessageEditor().getMessage(
|
||||||
MessageEditor.MessageType.INFO,
|
MessageEditor.MessageType.INFO,
|
||||||
"commands.moderation.starboard.success.title","")
|
"commands.moderation.starboard.success.title", "")
|
||||||
.build())
|
.build())
|
||||||
.queue();
|
.queue();
|
||||||
} else {
|
} else {
|
||||||
if (args.length>0) {
|
if (args.length > 0) {
|
||||||
TextChannel channel = e.getGuild().getTextChannelById(args[0]);
|
TextChannel channel = e.getGuild().getTextChannelById(args[0]);
|
||||||
if (channel!=null) {
|
if (channel != null) {
|
||||||
e.getRethinkServer().setStarboard(channel.getId());
|
e.getRethinkServer().setStarboard(channel.getId());
|
||||||
}
|
}
|
||||||
} else e.getHelpCommand().sendHelp(this, e);
|
} else e.getHelpCommand().sendHelp(this, e);
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@ import com.bbn.hadder.utils.MessageEditor;
|
||||||
import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory;
|
import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory;
|
||||||
|
|
||||||
public class BassCommand implements Command {
|
public class BassCommand implements Command {
|
||||||
private static final float[] BASS_BOOST = { 0.2f, 0.15f, 0.1f, 0.05f, 0.0f, -0.05f, -0.1f, -0.1f, -0.1f, -0.1f, -0.1f,
|
private static final float[] BASS_BOOST = {0.2f, 0.15f, 0.1f, 0.05f, 0.0f, -0.05f, -0.1f, -0.1f, -0.1f, -0.1f, -0.1f,
|
||||||
-0.1f, -0.1f, -0.1f, -0.1f };
|
-0.1f, -0.1f, -0.1f, -0.1f};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent e) {
|
public void executed(String[] args, CommandEvent e) {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ public class JoinCommand implements Command {
|
||||||
public void executed(String[] args, CommandEvent e) {
|
public void executed(String[] args, CommandEvent e) {
|
||||||
if (e.getMember().getVoiceState().inVoiceChannel()) {
|
if (e.getMember().getVoiceState().inVoiceChannel()) {
|
||||||
AudioManager audioManager = e.getGuild().getAudioManager();
|
AudioManager audioManager = e.getGuild().getAudioManager();
|
||||||
if(!audioManager.isAttemptingToConnect()) {
|
if (!audioManager.isAttemptingToConnect()) {
|
||||||
VoiceChannel vc = e.getMember().getVoiceState().getChannel();
|
VoiceChannel vc = e.getMember().getVoiceState().getChannel();
|
||||||
if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
|
if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
|
||||||
if (!e.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
|
if (!e.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,10 @@ public class QueueCommand implements Command {
|
||||||
long queuelength = 0;
|
long queuelength = 0;
|
||||||
for (AudioInfo g : queue) {
|
for (AudioInfo g : queue) {
|
||||||
queuelength = queuelength + g.getTrack().getInfo().length;
|
queuelength = queuelength + g.getTrack().getInfo().length;
|
||||||
builder.append("("+e.getAudioManager().getTimestamp(g.getTrack().getInfo().length)+") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
|
builder.append("(" + e.getAudioManager().getTimestamp(g.getTrack().getInfo().length) + ") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
|
||||||
}
|
}
|
||||||
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
|
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
|
||||||
"commands.music.queue.success.title", "("+String.valueOf(e.getAudioManager().getTimestamp(queuelength))+")",
|
"commands.music.queue.success.title", "(" + String.valueOf(e.getAudioManager().getTimestamp(queuelength)) + ")",
|
||||||
"commands.music.queue.success.description", builder.toString())
|
"commands.music.queue.success.description", builder.toString())
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ public class RecordCommand implements Command {
|
||||||
audioManager.openAudioConnection(event.getMember().getVoiceState().getChannel());
|
audioManager.openAudioConnection(event.getMember().getVoiceState().getChannel());
|
||||||
} else {
|
} else {
|
||||||
for (Map.Entry<String, Queue<byte[]>> key : queue.entrySet()) {
|
for (Map.Entry<String, Queue<byte[]>> key : queue.entrySet()) {
|
||||||
File file = new File("./"+event.getJDA().getUserById(key.getKey())+".wav");
|
File file = new File("./" + event.getJDA().getUserById(key.getKey()) + ".wav");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ public class BDSMCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[] { "bdsm" };
|
return new String[]{"bdsm"};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
@ -44,7 +44,7 @@ public class RandomPornCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[] { "randomporn", "pornrandom" };
|
return new String[]{"randomporn", "pornrandom"};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ public class SpankCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[] { "spank", "beat", "hit" };
|
return new String[]{"spank", "beat", "hit"};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
@ -43,7 +43,7 @@ public class TransCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[] { "trans" };
|
return new String[]{"trans"};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
|
@ -50,12 +50,12 @@ public class BlacklistCommand implements Command {
|
||||||
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
|
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
|
||||||
|
|
||||||
ArrayList<String> commandsWithoutDuplicates = new ArrayList<>(hashSet);
|
ArrayList<String> commandsWithoutDuplicates = new ArrayList<>(hashSet);
|
||||||
String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none");
|
String newblacklisted = ((commandsWithoutDuplicates.size() != 0) ? String.join(",", commandsWithoutDuplicates) : "none");
|
||||||
u.setBlacklisted(newblacklisted);
|
u.setBlacklisted(newblacklisted);
|
||||||
e.getTextChannel().sendMessage(
|
e.getTextChannel().sendMessage(
|
||||||
e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
|
e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
|
||||||
"commands.owner.blacklist.success."+args[0].toLowerCase()+".title", "",
|
"commands.owner.blacklist.success." + args[0].toLowerCase() + ".title", "",
|
||||||
"commands.owner.blacklist.success."+args[0].toLowerCase()+".description", newblacklisted)
|
"commands.owner.blacklist.success." + args[0].toLowerCase() + ".description", newblacklisted)
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
u.push();
|
u.push();
|
||||||
} else e.getHelpCommand().sendHelp(this, e);
|
} else e.getHelpCommand().sendHelp(this, e);
|
||||||
|
|
@ -75,7 +75,7 @@ public class BlacklistCommand implements Command {
|
||||||
e.getTextChannel().sendMessage(
|
e.getTextChannel().sendMessage(
|
||||||
e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
|
||||||
.setTitle("Blacklisted Users")
|
.setTitle("Blacklisted Users")
|
||||||
.setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users")
|
.setDescription((stringBuilder.length() != 0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users")
|
||||||
.build()).queue();
|
.build()).queue();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ public class LanguageCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[] { "language" };
|
return new String[]{"language"};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ public class UserPrefixCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[] { "userprefix" };
|
return new String[]{"userprefix"};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ public class MentionListener extends ListenerAdapter {
|
||||||
);
|
);
|
||||||
builder.addField("Developer", devs.toString(), false);
|
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/58My2dM)", true);
|
||||||
builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)",false);
|
builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false);
|
||||||
builder.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);
|
builder.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);
|
||||||
e.getChannel().sendMessage(builder.build()).queue();
|
e.getChannel().sendMessage(builder.build()).queue();
|
||||||
} else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
|
} else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
|
@ -28,7 +26,7 @@ public class OwnerMessageListener extends ListenerAdapter {
|
||||||
if (!emotename.contains(" ")) {
|
if (!emotename.contains(" ")) {
|
||||||
Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]);
|
Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]);
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
if (emotes.length!=0) {
|
if (emotes.length != 0) {
|
||||||
for (Emote emote : emotes) {
|
for (Emote emote : emotes) {
|
||||||
sb.append(emote.getAsMention()).append(" ");
|
sb.append(emote.getAsMention()).append(" ");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ public class EventWaiter {
|
||||||
Object listener = new ListenerAdapter() {
|
Object listener = new ListenerAdapter() {
|
||||||
@Override
|
@Override
|
||||||
public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
|
public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
|
||||||
if (user==null) {
|
if (user == null) {
|
||||||
onEvent.accept(event);
|
onEvent.accept(event);
|
||||||
event.getJDA().getShardManager().removeEventListener(this);
|
event.getJDA().getShardManager().removeEventListener(this);
|
||||||
} else if (event.getAuthor().getId().equals(user.getId())) {
|
} else if (event.getAuthor().getId().equals(user.getId())) {
|
||||||
|
|
@ -47,7 +47,7 @@ public class EventWaiter {
|
||||||
Object listener = new ListenerAdapter() {
|
Object listener = new ListenerAdapter() {
|
||||||
@Override
|
@Override
|
||||||
public void onGuildMessageReactionAdd(@Nonnull GuildMessageReactionAddEvent event) {
|
public void onGuildMessageReactionAdd(@Nonnull GuildMessageReactionAddEvent event) {
|
||||||
if (user==null) {
|
if (user == null) {
|
||||||
onEvent.accept(event);
|
onEvent.accept(event);
|
||||||
event.getJDA().getShardManager().removeEventListener(this);
|
event.getJDA().getShardManager().removeEventListener(this);
|
||||||
} else if (event.getUser().getId().equals(user.getId())) {
|
} else if (event.getUser().getId().equals(user.getId())) {
|
||||||
|
|
|
||||||
|
|
@ -50,10 +50,11 @@ public class MessageEditor {
|
||||||
|
|
||||||
public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
|
public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
|
||||||
String description, String description_extra, String description_extra_two) {
|
String description, String description_extra, String description_extra_two) {
|
||||||
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 + "`";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue