Skip to content

Commit

Permalink
reformat code
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaktushose committed May 10, 2024
1 parent 12e432d commit 13f88ba
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
1 change: 0 additions & 1 deletion src/main/java/com/github/kaktushose/nplaybot/Database.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.github.kaktushose.nplaybot.settings.SettingsService;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import net.dv8tion.jda.api.entities.Role;

public class Database {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,6 @@ public int getCollectLootDrop(Message message) {
}
}

public record CollectCurrency(String name, String emoji) {
}

public CollectCurrency getCollectCurrency(Guild guild) {
log.debug("Querying collect currency emoji");
try (Connection connection = dataSource.getConnection()) {
Expand All @@ -157,9 +154,6 @@ public CollectCurrency getCollectCurrency(Guild guild) {
}
}

public record CollectReward(int rewardId, String name, int threshold, int xp, long roleId, String embed) {
}

public List<CollectReward> getCollectRewards() {
log.debug("Querying collect rewards");
try (Connection connection = dataSource.getConnection()) {
Expand Down Expand Up @@ -218,4 +212,10 @@ public int getCollectPoints(UserSnowflake user) {
throw new RuntimeException(e);
}
}

public record CollectCurrency(String name, String emoji) {
}

public record CollectReward(int rewardId, String name, int threshold, int xp, long roleId, String embed) {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
import com.github.kaktushose.nplaybot.Database;
import com.github.kaktushose.nplaybot.permissions.BotPermissions;
import com.google.gson.*;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonSyntaxException;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Mentions;
import net.dv8tion.jda.api.entities.Role;
Expand All @@ -24,13 +26,13 @@
@Permissions(BotPermissions.MANAGE_EVENTS)
public class CollectRewardCommands {

private static final Gson gson = new Gson();
private static final String ROLE_REWARD = "Rolle";
private static final String XP_REWARD = "XP";
@Inject
private EmbedCache embedCache;
@Inject
private Database database;
private static final Gson gson = new Gson();
private static final String ROLE_REWARD = "Rolle";
private static final String XP_REWARD = "XP";
private String name;
private String rewardType;
private Role role;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class ContestEventService {

private static final Logger log = LoggerFactory.getLogger(ContestEventService.class);
private final DataSource dataSource;

public ContestEventService(DataSource dataSource) {
this.dataSource = dataSource;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.kaktushose.nplaybot.rank.model.UserInfo;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.UserSnowflake;
import net.dv8tion.jda.api.interactions.commands.Command;

@Interaction
Expand Down

0 comments on commit 13f88ba

Please sign in to comment.