From ee9e9546e53ccda052536f5593790289f06f77c9 Mon Sep 17 00:00:00 2001
From: Aleksei <a.gryczewski999@gmail.com>
Date: Tue, 25 Feb 2020 17:11:27 -0500
Subject: [PATCH] Import cleaning and stuff

---
 .../fsbot/commands/developer/TestCommand.java |  4 +---
 .../controllers/OutfitController.java         |  1 -
 .../fsbot/database/models/Outfit.java         | 20 +++++++++----------
 .../fsbot/listeners/ImageListener.java        | 11 ----------
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java
index 57df489..e436668 100644
--- a/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java
+++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java
@@ -10,12 +10,10 @@ import dev.salmonllama.fsbot.guthix.Command;
 import dev.salmonllama.fsbot.guthix.CommandContext;
 import dev.salmonllama.fsbot.guthix.CommandPermission;
 import dev.salmonllama.fsbot.guthix.PermissionType;
-import org.javacord.api.entity.message.MessageAttachment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 
 public class TestCommand extends Command {
     @Override public String name() { return "Test"; }
@@ -28,7 +26,7 @@ public class TestCommand extends Command {
     @Override
     public void onCommand(CommandContext ctx) {
         OutfitController.findRandom().thenAccept(outfit -> {
-            ctx.reply(outfit.toString());
+            outfit.ifPresent(o -> ctx.reply(o.toString()));
         });
     }
 }
diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
index 09ad3b1..423c745 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
@@ -10,7 +10,6 @@ import dev.salmonllama.fsbot.database.models.Outfit;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
index a33225e..75fae9f 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
@@ -10,16 +10,16 @@ import dev.salmonllama.fsbot.database.DatabaseModel;
 import java.sql.Timestamp;
 
 public class Outfit extends DatabaseModel {
-    private String id = "";
-    private String link = "";
-    private String submitter = "";
-    private String tag = "";
-    private Timestamp created = null;
-    private Timestamp updated = null;
-    private boolean deleted = false;
-    private boolean featured = false;
-    private int displayCount = 0;
-    private String deleteHash = "";
+    private String id;
+    private String link;
+    private String submitter;
+    private String tag;
+    private Timestamp created;
+    private Timestamp updated;
+    private boolean deleted;
+    private boolean featured;
+    private int displayCount;
+    private String deleteHash;
 
     public Outfit(OutfitBuilder builder) {
         id = builder.id;
diff --git a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java
index f0e5525..efee6a2 100644
--- a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java
+++ b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java
@@ -7,27 +7,16 @@ package dev.salmonllama.fsbot.listeners;
 
 import com.rethinkdb.RethinkDB;
 import com.rethinkdb.net.Connection;
-import com.rethinkdb.net.Cursor;
-import com.vdurmont.emoji.EmojiParser;
 import dev.salmonllama.fsbot.database.controllers.GalleryController;
 import dev.salmonllama.fsbot.database.controllers.OutfitController;
 import dev.salmonllama.fsbot.database.models.Outfit;
 import dev.salmonllama.fsbot.endpoints.imgur.ImgurAPIConnection;
-import okhttp3.*;
-import org.javacord.api.entity.message.Message;
 import org.javacord.api.entity.message.MessageAttachment;
-import org.javacord.api.entity.message.embed.EmbedBuilder;
 import org.javacord.api.event.message.MessageCreateEvent;
 import org.javacord.api.listener.message.MessageCreateListener;
 import org.javacord.api.util.logging.ExceptionLogger;
-import org.json.JSONObject;
-import dev.salmonllama.fsbot.config.BotConfig;
 
-import java.awt.*;
 import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
 
 public class ImageListener implements MessageCreateListener {