commit f19e8847da5a5d801d38310e38daaf0276a97de7 parent 983e51f8baa7a5621c46836d69128e3d7623a568 Author: Wim Dupont <wim@wimdupont.com> Date: Tue, 3 Feb 2026 19:27:11 +0100 j25 upgrade Diffstat:
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>4.0.0</version> + <version>4.0.2</version> <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>com.wimdupont</groupId> @@ -15,8 +15,8 @@ <description>OSRS oriented Discord Bot</description> <properties> - <java.version>21</java.version> - <dv8ation.jda.version>6.1.1</dv8ation.jda.version> + <java.version>25</java.version> + <dv8ation.jda.version>6.3.0</dv8ation.jda.version> </properties> <dependencies> diff --git a/src/main/java/com/wimdupont/sxcybot/listeners/member/PvmListListener.java b/src/main/java/com/wimdupont/sxcybot/listeners/member/PvmListListener.java @@ -20,7 +20,7 @@ public class PvmListListener implements Listener { @Override public void process(MessageReceivedEvent event) { var embedBuilder = EmbedBuilderFactory.createBuilder(); - var pvmRoleUsers = pvmRoleUserService.findAll(); + var pvmRoleUsers = pvmRoleUserService.findAllOrderedByRsn(); embedBuilder.setTitle("List of PvM Role competitors:"); event.getGuild().loadMembers().onSuccess(members -> { diff --git a/src/main/java/com/wimdupont/sxcybot/repository/guild/pvmrole/PvmRoleUserRepository.java b/src/main/java/com/wimdupont/sxcybot/repository/guild/pvmrole/PvmRoleUserRepository.java @@ -4,6 +4,7 @@ import com.wimdupont.sxcybot.repository.guild.pvmrole.dao.PvmRoleUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @Repository @@ -13,4 +14,6 @@ public interface PvmRoleUserRepository extends JpaRepository<PvmRoleUser, String Optional<PvmRoleUser> findByRsnIgnoreCase(String rsn); + List<PvmRoleUser> findAllByOrderByRsnAsc(); + } diff --git a/src/main/java/com/wimdupont/sxcybot/services/guild/pvmrole/PvmRoleUserService.java b/src/main/java/com/wimdupont/sxcybot/services/guild/pvmrole/PvmRoleUserService.java @@ -26,6 +26,10 @@ public class PvmRoleUserService { return pvmRoleUserRepository.findAll(); } + public List<PvmRoleUser> findAllOrderedByRsn() { + return pvmRoleUserRepository.findAllByOrderByRsnAsc(); + } + public PvmRoleUser save(PvmRoleUser pvmRoleUser) { return pvmRoleUserRepository.save(pvmRoleUser); }