Merge branch 'master' into master

src/main/java/cc/fascinated/bat/model/BatGuild.java

@@ -14,13 +14,16 @@ import java.util.Date;
  * @author Fascinated (fascinated7)
  */
 @RequiredArgsConstructor
-@Getter @Setter
+@Getter
+@Setter
 @Document(collection = "guilds")
 public class BatGuild extends ProfileHolder {
     /**
      * The ID of the guild
      */
-    @NonNull @Id private final String id;
+    @NonNull
+    @Id
+    private final String id;
 
     /**
      * The time this guild was joined
@@ -62,7 +65,9 @@ public class BatGuild extends ProfileHolder {
         return DiscordService.JDA.getGuildById(id);
     }
 
-    @AllArgsConstructor @Getter @Setter
+    @AllArgsConstructor
+    @Getter
+    @Setter
     public static class Premium {
         /**
          * The time the premium was activated

src/main/java/cc/fascinated/bat/model/BatUser.java

@@ -16,19 +16,29 @@ import java.util.Date;
  * @author Fascinated (fascinated7)
  */
 @RequiredArgsConstructor
-@Getter @Setter
+@Getter
+@Setter
 @Document(collection = "users")
 public class BatUser extends ProfileHolder {
     /**
      * The ID of the user
      */
-    @NonNull @Id private final String id;
+    @NonNull
+    @Id
+    private final String id;
 
     /**
      * The time this user was created
      */
     private Date createdAt = new Date();
 
+    /**
+     * The name of the user
+     */
+    public String getName() {
+        return getDiscordUser().getName();
+    }
+
     /**
      * Gets the guild as the JDA Guild
      *

src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java

@@ -88,7 +88,8 @@ public class ScoreSaberAccountToken {
     /**
      * The badge for this account.
      */
-    @AllArgsConstructor @Getter
+    @AllArgsConstructor
+    @Getter
     public static class Badge {
         /**
          * The image for this badge.
@@ -104,7 +105,8 @@ public class ScoreSaberAccountToken {
     /**
      * The score stats for this account.
      */
-    @AllArgsConstructor @Getter
+    @AllArgsConstructor
+    @Getter
     public static class ScoreStats {
         /**
          * The total score for this account.

src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java

@@ -5,7 +5,8 @@ import lombok.ToString;
 
 import java.util.List;
 
-@Getter @ToString
+@Getter
+@ToString
 public class ScoreSaberLeaderboardToken {
     /**
      * The ID of the leaderboard.

src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java

@@ -3,7 +3,8 @@ package cc.fascinated.bat.model.token.beatsaber.scoresaber;
 import lombok.Getter;
 import lombok.ToString;
 
-@Getter @ToString
+@Getter
+@ToString
 public class ScoreSaberPageMetadataToken {
     /**
      * The total amount of scores.

src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java

@@ -3,7 +3,8 @@ package cc.fascinated.bat.model.token.beatsaber.scoresaber;
 import lombok.Getter;
 import lombok.ToString;
 
-@Getter @ToString
+@Getter
+@ToString
 public class ScoreSaberPlayerScoreToken {
     /**
      * The score that was set.

src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java

@@ -3,7 +3,8 @@ package cc.fascinated.bat.model.token.beatsaber.scoresaber;
 import lombok.Getter;
 import lombok.ToString;
 
-@Getter @ToString
+@Getter
+@ToString
 public class ScoreSaberScoreToken {
     /**
      * The id for this score.

src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java

@@ -4,7 +4,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-@Getter @Setter
+@Getter
+@Setter
 @ToString
 public class ScoreSaberScoresPageToken {
     /**

src/main/java/cc/fascinated/bat/model/token/dogceo/RandomImage.java

@@ -6,7 +6,8 @@ import lombok.Getter;
 /**
  * @author Fascinated (fascinated7)
  */
-@Getter @AllArgsConstructor
+@Getter
+@AllArgsConstructor
 public class RandomImage {
     /**
      * The URL of the image.

src/main/java/cc/fascinated/bat/model/token/thecatapi/CatImageToken.java

@@ -6,7 +6,8 @@ import lombok.Getter;
 /**
  * @author Fascinated (fascinated7)
  */
-@Getter @AllArgsConstructor
+@Getter
+@AllArgsConstructor
 public class CatImageToken {
     /**
      * The ID of the image.