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 6d0c8ef..a69a8d4 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java +++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java @@ -232,13 +232,14 @@ public class OutfitController { FSDB.get().insert( "INSERT INTO " + - "outfits('id', 'link', 'submitter', 'tag', 'meta', 'created', 'updated', 'deleted', 'featured', 'display_count', 'delete_hash') " + - "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "outfits('id', 'link', 'submitter', 'tag', 'meta', 'discord_name', 'created', 'updated', 'deleted', 'featured', 'display_count', 'delete_hash') " + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", outfit.getId(), outfit.getLink(), outfit.getSubmitter(), outfit.getTag(), outfit.getMeta(), + outfit.getDiscordName(), outfit.getCreated(), outfit.getUpdated(), outfit.isDeleted(), @@ -372,6 +373,7 @@ public class OutfitController { "submitter = ?," + "tag = ?," + "meta = ?," + + "discord_name = ?," + "updated = ?," + "featured = ?," + "deleted = ?," + @@ -381,6 +383,7 @@ public class OutfitController { outfit.getSubmitter(), outfit.getTag(), outfit.getMeta(), + outfit.getDiscordName(), outfit.getUpdated(), outfit.isFeatured(), outfit.isDeleted(), @@ -429,6 +432,7 @@ public class OutfitController { .setSubmitter(rs.getString("submitter")) .setTag(rs.getString("tag")) .setMeta(rs.getString("meta")) + .setDiscordName(rs.getString("discord_name")) .setCreated(new Timestamp(rs.getLong("created"))) .setUpdated(new Timestamp(rs.getLong("updated"))) .setDeleted(rs.getBoolean("deleted")) 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 1caea76..c091648 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java +++ b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java @@ -115,7 +115,7 @@ public class Outfit extends DatabaseModel { @Override public String toString() { - return String.format("Outfit: [id: %s, link: %s, submitter: %s, tag: %s, created: %s, updated: %s, deleted: %s, featured: %s, display count: %s, deletion hash: %s, meta: %s, discordName: %s]", + return String.format("Outfit: [id: %s, link: %s, submitter: %s, tag: %s, created: %s, updated: %s, deleted: %s, featured: %s, display count: %s, deletion hash: %s, meta: %s, discord_name: %s]", id, link, submitter, tag, created, updated, deleted, featured, displayCount, deleteHash, meta, discordName ); } diff --git a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java index d8dc9c8..b457b24 100644 --- a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java +++ b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java @@ -104,7 +104,7 @@ public class ImageListener implements MessageCreateListener { .setId(UUID.randomUUID().toString()) .setMeta(event.getMessageContent()) .setDiscordName(event.getMessageAuthor().getDiscriminatedName()) - .setLink("DUMMY-LINK") + .setLink(event.getMessageAttachments().get(0).getUrl().toString()) .setSubmitter(event.getMessageAuthor().getIdAsString()) .setDeleteHash("DUMMY-DELETE-HASH"); @@ -126,7 +126,8 @@ public class ImageListener implements MessageCreateListener { .setFooter(String.format("%s | %s", outfit.getTag(), outfit.getId())) .setUrl(outfit.getLink()) .setColor(Color.GREEN) - .addField("Uploaded:", outfit.getCreated().toString()); + .addField("Uploaded:", outfit.getCreated().toString()) + .addField("Discord Name:", outfit.getDiscordName()); if (!outfit.getMeta().equals("")) { response.addField("Meta:", outfit.getMeta());