Fix Setting stuff.

Signed-off-by: Presti <dxssucuk@hotmail.com>
Ree6-Applications · Oct 18, 2024 · 0e7653f · 0e7653f
1 parent 9f5f878
commit 0e7653f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/src/main/java/de/presti/ree6/commands/impl/economy/Steal.java b/src/main/java/de/presti/ree6/commands/impl/economy/Steal.java
@@ -5,7 +5,6 @@
 import de.presti.ree6.commands.interfaces.Command;
 import de.presti.ree6.commands.interfaces.ICommand;
 import de.presti.ree6.sql.SQLSession;
-import de.presti.ree6.sql.entities.Setting;
 import de.presti.ree6.utils.data.EconomyUtil;
 import de.presti.ree6.utils.others.RandomUtils;
 import de.presti.ree6.utils.others.ThreadUtil;
@@ -17,7 +16,6 @@
 
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Map;
 
 /**
  * Steal money from other users.
@@ -42,8 +40,8 @@ public void onPerform(CommandEvent commandEvent) {
 
         String entryString = commandEvent.getGuild().getIdLong() + "-" + commandEvent.getMember().getIdLong();
 
-        SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                Map.of("gid", commandEvent.getGuild().getId(), "name", "configuration_steal_delay")).subscribe(value -> {
+        SQLSession.getSqlConnector().getSqlWorker().getSetting(commandEvent.getGuild().getIdLong(),
+                "configuration_steal_delay").subscribe(value -> {
             long delay = Long.parseLong(value.get().getStringValue());
 
             if (stealTimeout.contains(entryString)) {

diff --git a/src/main/java/de/presti/ree6/commands/impl/economy/Work.java b/src/main/java/de/presti/ree6/commands/impl/economy/Work.java
@@ -5,15 +5,13 @@
 import de.presti.ree6.commands.interfaces.Command;
 import de.presti.ree6.commands.interfaces.ICommand;
 import de.presti.ree6.sql.SQLSession;
-import de.presti.ree6.sql.entities.Setting;
 import de.presti.ree6.utils.data.EconomyUtil;
 import de.presti.ree6.utils.others.RandomUtils;
 import de.presti.ree6.utils.others.ThreadUtil;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Map;
 
 /**
  * Work for money.
@@ -33,20 +31,19 @@ public class Work implements ICommand {
     public void onPerform(CommandEvent commandEvent) {
         String entryString = commandEvent.getGuild().getIdLong() + "-" + commandEvent.getMember().getIdLong();
 
-        SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                Map.of("gid", commandEvent.getGuild().getId(), "name", "configuration_work_delay")).subscribe(value -> {
+        SQLSession.getSqlConnector().getSqlWorker().getSetting(commandEvent.getGuild().getIdLong(), "configuration_work_delay").subscribe(value -> {
             long delay = Long.parseLong(value.get().getStringValue());
 
             if (workTimeout.contains(entryString)) {
                 commandEvent.reply(commandEvent.getResource("message.work.cooldown", delay));
                 return;
             }
 
-            double min = Double.parseDouble(SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                    Map.of("gid", commandEvent.getGuild().getId(), "name", "configuration_work_min")).block().get().getStringValue());
+            double min = Double.parseDouble(SQLSession.getSqlConnector().getSqlWorker().getSetting(commandEvent.getGuild().getIdLong(),
+                    "configuration_work_min").block().get().getStringValue());
 
-            double max = Double.parseDouble(SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                    Map.of("gid", commandEvent.getGuild().getId(), "name", "configuration_work_max")).block().get().getStringValue());
+            double max = Double.parseDouble(SQLSession.getSqlConnector().getSqlWorker().getSetting(commandEvent.getGuild().getIdLong(),
+                            "configuration_work_max").block().get().getStringValue());
 
             double amount = RandomUtils.round(RandomUtils.nextDouble(min, max), 2);
 

diff --git a/src/main/java/de/presti/ree6/module/game/impl/blackjack/Blackjack.java b/src/main/java/de/presti/ree6/module/game/impl/blackjack/Blackjack.java
@@ -13,7 +13,6 @@
 import de.presti.ree6.module.game.impl.blackjack.entities.BlackJackPlayer;
 import de.presti.ree6.module.game.impl.blackjack.util.BlackJackCardUtility;
 import de.presti.ree6.sql.SQLSession;
-import de.presti.ree6.sql.entities.Setting;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
@@ -23,7 +22,6 @@
 
 import java.awt.*;
 import java.util.ArrayList;
-import java.util.Map;
 
 /**
  * Class used to represent the game of blackjack.
@@ -311,8 +309,8 @@ public void stopGame(BlackJackPlayer currentPlayer, BlackJackPlayer nextPlayer)
         nextPlayer.getInteractionHook().editOriginalComponents(new ArrayList<>()).queue();
 
         Main.getInstance().getCommandManager().sendMessage(messageCreateBuilder.build(), session.getChannel());
-        SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                Map.of("gid", session.getGuild().getIdLong(), "name", "configuration_rewards_blackjack_win"))
+        SQLSession.getSqlConnector().getSqlWorker().getSetting(session.getGuild().getIdLong(),
+                "configuration_rewards_blackjack_win")
                 .subscribe(setting -> rewardPlayer(session, winner, setting.get().getValue()));
 
         stopGame();

diff --git a/src/main/java/de/presti/ree6/module/game/impl/musicquiz/MusicQuiz.java b/src/main/java/de/presti/ree6/module/game/impl/musicquiz/MusicQuiz.java
@@ -12,7 +12,6 @@
 import de.presti.ree6.module.game.impl.musicquiz.entities.MusicQuizPlayer;
 import de.presti.ree6.module.game.impl.musicquiz.util.MusicQuizUtil;
 import de.presti.ree6.sql.SQLSession;
-import de.presti.ree6.sql.entities.Setting;
 import de.presti.ree6.utils.others.ThreadUtil;
 import lavalink.client.player.event.IPlayerEventListener;
 import lavalink.client.player.event.TrackEndEvent;
@@ -29,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -214,8 +212,7 @@ public void onMessageReceive(MessageReceivedEvent messageReceivedEvent) {
         if (currentEntry.checkTitle(messageContent)) {
             musicQuizPlayer.addPoints(1);
 
-            SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                            Map.of("gid", session.getGuild().getIdLong(), "name", "configuration_rewards_musicquiz_title"))
+            SQLSession.getSqlConnector().getSqlWorker().getSetting(session.getGuild().getIdLong(), "configuration_rewards_musicquiz_title")
                     .subscribe(setting -> rewardPlayer(session, musicQuizPlayer, setting.get().getValue()));
 
             messageReceivedEvent.getMessage().reply(LanguageService.getByGuild(messageReceivedEvent.getGuild(), "message.musicQuiz.foundTitle", currentEntry.getTitle()).block()).delay(5, TimeUnit.SECONDS).flatMap(Message::delete).queue();
@@ -225,8 +222,8 @@ public void onMessageReceive(MessageReceivedEvent messageReceivedEvent) {
         if (currentEntry.checkArtist(messageContent)) {
             musicQuizPlayer.addPoints(2);
 
-            SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                    Map.of("gid", session.getGuild().getIdLong(), "name", "configuration_rewards_musicquiz_artist"))
+            SQLSession.getSqlConnector().getSqlWorker().getSetting(session.getGuild().getIdLong(),
+                            "configuration_rewards_musicquiz_artist")
                     .subscribe(setting -> rewardPlayer(session, musicQuizPlayer, setting.get().getValue()));
 
             messageReceivedEvent.getMessage().reply(LanguageService.getByGuild(messageReceivedEvent.getGuild(), "message.musicQuiz.foundArtists", currentEntry.getArtist()).block()).delay(5, TimeUnit.SECONDS).flatMap(Message::delete).queue();
@@ -236,8 +233,8 @@ public void onMessageReceive(MessageReceivedEvent messageReceivedEvent) {
         if (currentEntry.checkFeatures(messageContent)) {
             musicQuizPlayer.addPoints(3);
 
-            SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                    Map.of("gid", session.getGuild().getIdLong(), "name", "configuration_rewards_musicquiz_feature"))
+            SQLSession.getSqlConnector().getSqlWorker().getSetting(session.getGuild().getIdLong(),
+                    "configuration_rewards_musicquiz_feature")
                     .subscribe(setting -> rewardPlayer(session, musicQuizPlayer, setting.get().getValue()));
 
             messageReceivedEvent.getMessage().reply(LanguageService.getByGuild(messageReceivedEvent.getGuild(), "message.musicQuiz.foundFeature", String.join(",", currentEntry.getFeatures())).block()).delay(5, TimeUnit.SECONDS).flatMap(Message::delete).queue();
@@ -286,8 +283,8 @@ public void stopGame() {
         menuMessage.delete().queue();
         session.getChannel().sendMessage(messageCreateBuilder.build()).queue();
 
-        SQLSession.getSqlConnector().getSqlWorker().getEntity(new Setting(), "FROM Setting WHERE settingId.guildId=:gid AND settingId.name=:name",
-                        Map.of("gid", session.getGuild().getIdLong(), "name", "configuration_rewards_musicquiz_win"))
+        SQLSession.getSqlConnector().getSqlWorker().getSetting(session.getGuild().getIdLong(),
+                "configuration_rewards_musicquiz_win")
                 .subscribe(setting -> rewardPlayer(session, sortedList.get(0), setting.get().getValue()));
 
         Main.getInstance().getMusicWorker().disconnect(session.getGuild());