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

Merge pull request #54 from Fashionscape/dev

Browse Source 
Dev
This commit is contained in:
Aleksei Gryczewski 2022-06-28 10:19:49 -04:00 committed by GitHub
commit a0a7bc654c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ public class Outfit extends DatabaseModel {
private String submitter; private String submitter;
private String tag; private String tag;
private String meta; private String meta;
private String discordName;
private Timestamp created; private Timestamp created;
private Timestamp updated; private Timestamp updated;
private boolean deleted; private boolean deleted;
@ -27,6 +28,7 @@ public class Outfit extends DatabaseModel {
submitter = builder.submitter; submitter = builder.submitter;
tag = builder.tag; tag = builder.tag;
meta = builder.meta; meta = builder.meta;
discordName = builder.discordName;
created = builder.created; created = builder.created;
updated = builder.updated; updated = builder.updated;
deleted = builder.deleted; deleted = builder.deleted;
@ -55,6 +57,10 @@ public class Outfit extends DatabaseModel {
return meta; return meta;
} }
public String getDiscordName() {
return discordName;
}
public void setMeta(String meta) { public void setMeta(String meta) {
this.meta = meta; this.meta = meta;
} }
@ -98,6 +104,7 @@ public class Outfit extends DatabaseModel {
"submitter TEXT," + "submitter TEXT," +
"tag TEXT," + "tag TEXT," +
"meta TEXT," + "meta TEXT," +
"discord_name TEXT" +
"created TEXT," + "created TEXT," +
"updated TEXT," + "updated TEXT," +
"deleted TEXT," + "deleted TEXT," +
@ -108,8 +115,8 @@ public class Outfit extends DatabaseModel {
@Override @Override
public String toString() { 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]", 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 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 submitter;
private String tag; private String tag;
private String meta; private String meta;
private String discordName;
private Timestamp created = null; private Timestamp created = null;
private Timestamp updated = null; private Timestamp updated = null;
private boolean deleted = false; private boolean deleted = false;
@ -135,6 +143,7 @@ public class Outfit extends DatabaseModel {
this.submitter = outfit.getSubmitter(); this.submitter = outfit.getSubmitter();
this.tag = outfit.getTag(); this.tag = outfit.getTag();
this.meta = outfit.getMeta(); this.meta = outfit.getMeta();
this.discordName = outfit.getDiscordName();
this.created = outfit.getCreated(); this.created = outfit.getCreated();
this.updated = outfit.getUpdated(); this.updated = outfit.getUpdated();
this.deleted = outfit.isDeleted(); this.deleted = outfit.isDeleted();
@ -168,6 +177,11 @@ public class Outfit extends DatabaseModel {
return this; return this;
} }
public OutfitBuilder setDiscordName(String discordName) {
this.discordName = discordName;
return this;
}
public OutfitBuilder setCreated(Timestamp created) { public OutfitBuilder setCreated(Timestamp created) {
this.created = created; this.created = created;
return this; return this;

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

@ -80,6 +80,7 @@ public class ImageListener implements MessageCreateListener {
Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder() Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder()
.setId(upload.getId()) .setId(upload.getId())
.setMeta(event.getMessageContent()) .setMeta(event.getMessageContent())
.setDiscordName(event.getMessageAuthor().getDiscriminatedName())
.setLink(upload.getLink()) .setLink(upload.getLink())
.setSubmitter(event.getMessageAuthor().getIdAsString()) .setSubmitter(event.getMessageAuthor().getIdAsString())
.setDeleteHash(upload.getDeleteHash()); .setDeleteHash(upload.getDeleteHash());
@ -102,6 +103,7 @@ public class ImageListener implements MessageCreateListener {
Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder() Outfit.OutfitBuilder outfitBuilder = new Outfit.OutfitBuilder()
.setId(UUID.randomUUID().toString()) .setId(UUID.randomUUID().toString())
.setMeta(event.getMessageContent()) .setMeta(event.getMessageContent())
.setDiscordName(event.getMessageAuthor().getDiscriminatedName())
.setLink("DUMMY-LINK") .setLink("DUMMY-LINK")
.setSubmitter(event.getMessageAuthor().getIdAsString()) .setSubmitter(event.getMessageAuthor().getIdAsString())
.setDeleteHash("DUMMY-DELETE-HASH"); .setDeleteHash("DUMMY-DELETE-HASH");