From f8e88a84b077cb6c4ad5d296b7dbe4f7da153fdd Mon Sep 17 00:00:00 2001
From: Alex G <agryczewski@outlook.com>
Date: Tue, 28 Jun 2022 10:15:56 -0400
Subject: [PATCH] Re-added discord usernames to database tracking.

---
 .../fsbot/database/models/Outfit.java          | 18 ++++++++++++++++--
 .../fsbot/listeners/ImageListener.java         |  2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

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 b619006..1caea76 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
@@ -14,6 +14,7 @@ public class Outfit extends DatabaseModel {
     private String submitter;
     private String tag;
     private String meta;
+    private String discordName;
     private Timestamp created;
     private Timestamp updated;
     private boolean deleted;
@@ -27,6 +28,7 @@ public class Outfit extends DatabaseModel {
         submitter = builder.submitter;
         tag = builder.tag;
         meta = builder.meta;
+        discordName = builder.discordName;
         created = builder.created;
         updated = builder.updated;
         deleted = builder.deleted;
@@ -55,6 +57,10 @@ public class Outfit extends DatabaseModel {
         return meta;
     }
 
+    public String getDiscordName() {
+        return discordName;
+    }
+
     public void setMeta(String meta) {
         this.meta = meta;
     }
@@ -98,6 +104,7 @@ public class Outfit extends DatabaseModel {
                 "submitter TEXT," +
                 "tag TEXT," +
                 "meta TEXT," +
+                "discord_name TEXT" +
                 "created TEXT," +
                 "updated TEXT," +
                 "deleted TEXT," +
@@ -108,8 +115,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, meta: %s]",
-                id, link, submitter, tag, created, updated, deleted, featured, displayCount, deleteHash, meta
+        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]",
+                id, link, submitter, tag, created, updated, deleted, featured, displayCount, deleteHash, meta, discordName
         );
     }
 
@@ -119,6 +126,7 @@ public class Outfit extends DatabaseModel {
         private String submitter;
         private String tag;
         private String meta;
+        private String discordName;
         private Timestamp created = null;
         private Timestamp updated = null;
         private boolean deleted = false;
@@ -135,6 +143,7 @@ public class Outfit extends DatabaseModel {
             this.submitter = outfit.getSubmitter();
             this.tag = outfit.getTag();
             this.meta = outfit.getMeta();
+            this.discordName = outfit.getDiscordName();
             this.created = outfit.getCreated();
             this.updated = outfit.getUpdated();
             this.deleted = outfit.isDeleted();
@@ -168,6 +177,11 @@ public class Outfit extends DatabaseModel {
             return this;
         }
 
+        public OutfitBuilder setDiscordName(String discordName) {
+            this.discordName = discordName;
+            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 60a23b2..d8dc9c8 100644
--- a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java
+++ b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java
@@ -80,6 +80,7 @@ public class ImageListener implements MessageCreateListener {
             Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder()
                     .setId(upload.getId())
                     .setMeta(event.getMessageContent())
+                    .setDiscordName(event.getMessageAuthor().getDiscriminatedName())
                     .setLink(upload.getLink())
                     .setSubmitter(event.getMessageAuthor().getIdAsString())
                     .setDeleteHash(upload.getDeleteHash());
@@ -102,6 +103,7 @@ public class ImageListener implements MessageCreateListener {
         Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder()
                 .setId(UUID.randomUUID().toString())
                 .setMeta(event.getMessageContent())
+                .setDiscordName(event.getMessageAuthor().getDiscriminatedName())
                 .setLink("DUMMY-LINK")
                 .setSubmitter(event.getMessageAuthor().getIdAsString())
                 .setDeleteHash("DUMMY-DELETE-HASH");