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 19f3f8d..10adc13 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java +++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java @@ -210,12 +210,13 @@ public class OutfitController { FSDB.get().insert( "INSERT INTO " + - "outfits('id', 'link', 'submitter', 'tag', 'created', 'updated', 'deleted', 'featured', 'display_count', 'delete_hash') " + - "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "outfits('id', 'link', 'submitter', 'tag', 'meta', 'created', 'updated', 'deleted', 'featured', 'display_count', 'delete_hash') " + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", outfit.getId(), outfit.getLink(), outfit.getSubmitter(), outfit.getTag(), + outfit.getMeta(), outfit.getCreated(), outfit.getUpdated(), outfit.isDeleted(), @@ -348,6 +349,7 @@ public class OutfitController { "link = ?," + "submitter = ?," + "tag = ?," + + "meta = ?," + "updated = ?," + "featured = ?," + "display_count = ?" + @@ -355,6 +357,7 @@ public class OutfitController { outfit.getLink(), outfit.getSubmitter(), outfit.getTag(), + outfit.getMeta(), outfit.isFeatured(), outfit.getDisplayCount()); } @@ -395,6 +398,7 @@ public class OutfitController { .setLink(rs.getString("link")) .setSubmitter(rs.getString("submitter")) .setTag(rs.getString("tag")) + .setMeta(rs.getString("meta")) .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 ddd4bbf..6791f5d 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java +++ b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java @@ -6,7 +6,6 @@ package dev.salmonllama.fsbot.database.models; import dev.salmonllama.fsbot.database.DatabaseModel; -import org.javacord.api.entity.message.embed.EmbedBuilder; import java.sql.Timestamp; @@ -15,6 +14,7 @@ public class Outfit extends DatabaseModel { private String link; private String submitter; private String tag; + private String meta; private Timestamp created; private Timestamp updated; private boolean deleted; @@ -27,6 +27,7 @@ public class Outfit extends DatabaseModel { link = builder.link; submitter = builder.submitter; tag = builder.tag; + meta = builder.meta; created = builder.created; updated = builder.updated; deleted = builder.deleted; @@ -51,6 +52,10 @@ public class Outfit extends DatabaseModel { return tag; } + public String getMeta() { + return meta; + } + public Timestamp getCreated() { return created; } @@ -89,6 +94,7 @@ public class Outfit extends DatabaseModel { "link TEXT," + "submitter TEXT," + "tag TEXT," + + "meta TEXT," + "created TEXT," + "updated TEXT," + "deleted TEXT," + @@ -99,8 +105,8 @@ 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]", - id, link, submitter, tag, created, updated, deleted, featured, displayCount, deleteHash + 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]", + id, link, submitter, tag, created, updated, deleted, featured, displayCount, deleteHash, meta ); } @@ -109,6 +115,7 @@ public class Outfit extends DatabaseModel { private String link; private String submitter; private String tag; + private String meta; private Timestamp created = null; private Timestamp updated = null; private boolean deleted = false; @@ -124,6 +131,7 @@ public class Outfit extends DatabaseModel { this.link = outfit.getLink(); this.submitter = outfit.getSubmitter(); this.tag = outfit.getTag(); + this.meta = outfit.getMeta(); this.created = outfit.getCreated(); this.updated = outfit.getUpdated(); this.deleted = outfit.isDeleted(); @@ -152,6 +160,11 @@ public class Outfit extends DatabaseModel { return this; } + public OutfitBuilder setMeta(String meta) { + this.meta = meta; + return this; + } + public OutfitBuilder setCreated(Timestamp created) { this.created = created; return this; diff --git a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java index f1f5f5f..7bcbd06 100644 --- a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java +++ b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java @@ -54,6 +54,7 @@ public class ImageListener implements MessageCreateListener { // Store in the database Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder() .setId(upload.getId()) + .setMeta(event.getMessageContent()) .setLink(upload.getLink()) .setSubmitter(event.getMessageAuthor().getIdAsString()) .setCreated(new Timestamp(upload.getDateTime()));