Fashionscape/discord-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import cleaning and stuff

Browse Source
This commit is contained in:
Aleksei 2020-02-25 17:11:27 -05:00
parent ce156a1bf9
commit ee9e9546e5
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java
View File

@ -10,12 +10,10 @@ import dev.salmonllama.fsbot.guthix.Command;
import dev.salmonllama.fsbot.guthix.CommandContext; import dev.salmonllama.fsbot.guthix.CommandContext;
import dev.salmonllama.fsbot.guthix.CommandPermission; import dev.salmonllama.fsbot.guthix.CommandPermission;
import dev.salmonllama.fsbot.guthix.PermissionType; import dev.salmonllama.fsbot.guthix.PermissionType;
import org.javacord.api.entity.message.MessageAttachment;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List;
public class TestCommand extends Command { public class TestCommand extends Command {
@Override public String name() { return "Test"; } @Override public String name() { return "Test"; }
@ -28,7 +26,7 @@ public class TestCommand extends Command {
@Override @Override
public void onCommand(CommandContext ctx) { public void onCommand(CommandContext ctx) {
OutfitController.findRandom().thenAccept(outfit -> { OutfitController.findRandom().thenAccept(outfit -> {
ctx.reply(outfit.toString()); outfit.ifPresent(o -> ctx.reply(o.toString()));
}); });
} }
} }

1
src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
View File

@ -10,7 +10,6 @@ import dev.salmonllama.fsbot.database.models.Outfit;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;

20
src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
View File

@ -10,16 +10,16 @@ import dev.salmonllama.fsbot.database.DatabaseModel;
import java.sql.Timestamp; import java.sql.Timestamp;
public class Outfit extends DatabaseModel { public class Outfit extends DatabaseModel {
private String id = ""; private String id;
private String link = ""; private String link;
private String submitter = ""; private String submitter;
private String tag = ""; private String tag;
private Timestamp created = null; private Timestamp created;
private Timestamp updated = null; private Timestamp updated;
private boolean deleted = false; private boolean deleted;
private boolean featured = false; private boolean featured;
private int displayCount = 0; private int displayCount;
private String deleteHash = ""; private String deleteHash;
public Outfit(OutfitBuilder builder) { public Outfit(OutfitBuilder builder) {
id = builder.id; id = builder.id;

11
src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java
View File

@ -7,27 +7,16 @@ package dev.salmonllama.fsbot.listeners;
import com.rethinkdb.RethinkDB; import com.rethinkdb.RethinkDB;
import com.rethinkdb.net.Connection; 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.GalleryController;
import dev.salmonllama.fsbot.database.controllers.OutfitController; import dev.salmonllama.fsbot.database.controllers.OutfitController;
import dev.salmonllama.fsbot.database.models.Outfit; import dev.salmonllama.fsbot.database.models.Outfit;
import dev.salmonllama.fsbot.endpoints.imgur.ImgurAPIConnection; 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.MessageAttachment;
import org.javacord.api.entity.message.embed.EmbedBuilder;
import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.event.message.MessageCreateEvent;
import org.javacord.api.listener.message.MessageCreateListener; import org.javacord.api.listener.message.MessageCreateListener;
import org.javacord.api.util.logging.ExceptionLogger; 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.sql.Timestamp;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
public class ImageListener implements MessageCreateListener { public class ImageListener implements MessageCreateListener {