Skip to content

Commit 6db5588

Browse files
feat: Add findClanByUuid method to APIs and service implementations
- Introduce `findClanByUuid(clanUuid: UUID)` in `ClanService` and `SurfClanApi` to enable clan lookup by UUID. - Update `ClanServiceImpl` and `SurfClanApiImpl` to implement the new method.
1 parent 5543af2 commit 6db5588

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

surf-clan-api/src/main/kotlin/dev/slne/clan/api/SurfClanApi.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ val surfClanApi = requiredService<SurfClanApi>()
1212
interface SurfClanApi {
1313
fun findClan(player: Player): Clan?
1414
fun findClan(playerUuid: UUID): Clan?
15+
fun findClanByUuid(clanUuid: UUID): Clan?
1516
suspend fun findClanPlayer(player: Player): ClanPlayer
1617

1718
fun getWhitelistedClans(): ObjectSet<String>

surf-clan-core/src/main/kotlin/dev/slne/clan/core/service/ClanService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ interface ClanService {
1414
fun findClanByTag(tag: String): Clan?
1515
fun findClanByName(name: String): Clan?
1616
fun findClanByMember(uuid: UUID): Clan?
17+
fun findClanByUuid(clanUuid: UUID): Clan?
1718
fun findInvitesByMember(memberUuid: UUID): ObjectSet<ClanInvite>
1819
fun findClanByInvite(invite: ClanInvite): Clan?
1920

surf-clan-fallback/src/main/kotlin/dev/slne/surf/clan/fallback/service/ClanServiceImpl.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class ClanServiceImpl : ClanService, Services.Fallback {
4444
override fun findClanByMember(uuid: UUID) =
4545
clans.find { it.members.any { member -> member.uuid == uuid } }
4646

47+
override fun findClanByUuid(clanUuid: UUID): Clan? =
48+
clans.find { it.uuid == clanUuid }
49+
4750
override fun findInvitesByMember(memberUuid: UUID) =
4851
clans.flatMap { it.invites }.filter { it.invited == memberUuid }.toObjectSet()
4952

surf-clan-velocity/src/main/kotlin/dev/slne/clan/velocity/api/SurfClanApiImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import java.util.*
1717
class SurfClanApiImpl : SurfClanApi, Services.Fallback {
1818
override fun findClan(player: Player) = clanService.findClanByMember(player.uniqueId)
1919
override fun findClan(playerUuid: UUID) = clanService.findClanByMember(playerUuid)
20+
override fun findClanByUuid(clanUuid: UUID) = clanService.findClanByUuid(clanUuid)
2021

2122
override suspend fun findClanPlayer(player: Player) =
2223
clanPlayerService.findClanPlayerByUuid(player.uniqueId) ?: error("ClanPlayer not found")

0 commit comments

Comments
 (0)