Code clean up #576

Merged
greg6775 merged 6 commits from greg-dev into master 2020-11-17 22:02:48 +01:00
12 changed files with 23 additions and 23 deletions

View file

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>Hadder</groupId>
<artifactId>Hadder</artifactId>
<version>1.3.22</version>
<version>1.3.24</version>
<name>Hadder</name>
<inceptionYear>2019</inceptionYear>
<description>Hadder is a multi-purpose Discord bot.</description>
@ -69,12 +69,12 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_215</version>
<version>4.2.0_217</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20200518</version>
<version>20201115</version>
</dependency>
<dependency>
<groupId>com.rethinkdb</groupId>

View file

@ -27,9 +27,9 @@ import org.json.JSONObject;
import java.lang.reflect.Field;
public class Rethink {
private RethinkDB r = RethinkDB.r;
private final RethinkDB r = RethinkDB.r;
private Connection conn;
private Config config;
private final Config config;
public Rethink(Config config) {
this.config = config;

View file

@ -33,9 +33,9 @@ import java.time.Instant;
public class CommandListener extends ListenerAdapter {
private Rethink rethink;
private CommandHandler handler;
private AudioManager audioManager;
private final Rethink rethink;
private final CommandHandler handler;
private final AudioManager audioManager;
public CommandListener(Rethink rethink, CommandHandler handler, AudioManager audioManager) {
this.rethink = rethink;

View file

@ -30,8 +30,8 @@ import java.time.Instant;
public class GuildListener extends ListenerAdapter {
private Rethink rethink;
private Config config;
private final Rethink rethink;
private final Config config;
public GuildListener(Rethink rethink, Config config) {
this.rethink = rethink;

View file

@ -33,8 +33,8 @@ import java.util.Random;
public class MentionListener extends ListenerAdapter {
private Rethink rethink;
private Config config;
private final Rethink rethink;
private final Config config;
public MentionListener(Rethink rethink, Config config) {
this.rethink = rethink;

View file

@ -22,9 +22,9 @@ public class OwnerMessageListener extends ListenerAdapter {
@Override
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
if (config.getOwners().contains(event.getAuthor().getIdLong()) && event.getMessage().getContentRaw().startsWith(":") && event.getMessage().getContentRaw().endsWith(":")) {
String emotename = event.getMessage().getContentRaw().split(":")[1];
if (!emotename.contains(" ")) {
Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]);
String emoteName = event.getMessage().getContentRaw().split(":")[1];
if (!emoteName.contains(" ")) {
Emote[] emotes = event.getJDA().getEmotesByName(emoteName, true).toArray(new Emote[0]);
StringBuilder sb = new StringBuilder();
if (emotes.length != 0) {
for (Emote emote : emotes) {

View file

@ -30,7 +30,7 @@ import java.time.Instant;
public class PrivateMessageListener extends ListenerAdapter {
private Rethink rethink;
private final Rethink rethink;
public PrivateMessageListener(Rethink rethink) {
this.rethink = rethink;

View file

@ -28,8 +28,8 @@ import javax.annotation.Nonnull;
public class ReadyListener extends ListenerAdapter {
private Rethink rethink;
private Config config;
private final Rethink rethink;
private final Config config;
public ReadyListener(Rethink rethink, Config config) {
this.rethink = rethink;

View file

@ -24,7 +24,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter;
public class RulesListener extends ListenerAdapter {
private Rethink rethink;
private final Rethink rethink;
public RulesListener(Rethink rethink) {
this.rethink = rethink;

View file

@ -30,7 +30,7 @@ import javax.annotation.Nonnull;
public class StarboardListener extends ListenerAdapter {
private Rethink rethink;
private final Rethink rethink;
public StarboardListener(Rethink rethink) {
this.rethink = rethink;

View file

@ -22,7 +22,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter;
public class VoiceLeaveListener extends ListenerAdapter {
private AudioManager audioManager;
private final AudioManager audioManager;
public VoiceLeaveListener(AudioManager audioManager) {
this.audioManager = audioManager;

View file

@ -27,8 +27,8 @@ import java.util.ResourceBundle;
public class MessageEditor {
private RethinkUser rethinkUser;
private User user;
private final RethinkUser rethinkUser;
private final User user;
public MessageEditor(RethinkUser rethinkUser, User user) {
this.rethinkUser = rethinkUser;