forked from SteamWar/SteamWar
Improve TeamCommand.info
This commit is contained in:
@@ -81,6 +81,14 @@ class TeamTeilnahme(id: EntityID<CompositeID>) : CompositeEntity(id) {
|
|||||||
fun getEvents(teamId: Int) = useDb {
|
fun getEvents(teamId: Int) = useDb {
|
||||||
find { TeamTeilnahmeTable.teamId eq teamId }.map { Event.byId(it.eventId.value) }.toSet()
|
find { TeamTeilnahmeTable.teamId eq teamId }.map { Event.byId(it.eventId.value) }.toSet()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@JvmStatic
|
||||||
|
fun getPlacement(team: Team, event: Event) = useDb {
|
||||||
|
get(CompositeID {
|
||||||
|
it[TeamTeilnahmeTable.teamId] = team.id
|
||||||
|
it[TeamTeilnahmeTable.eventId] = event.id
|
||||||
|
}).placement
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val teamId by TeamTeilnahmeTable.teamId
|
val teamId by TeamTeilnahmeTable.teamId
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ import de.steamwar.velocitycore.VelocityCore;
|
|||||||
import de.steamwar.velocitycore.discord.DiscordBot;
|
import de.steamwar.velocitycore.discord.DiscordBot;
|
||||||
import de.steamwar.velocitycore.inventory.SWItem;
|
import de.steamwar.velocitycore.inventory.SWItem;
|
||||||
import de.steamwar.velocitycore.inventory.SWListInv;
|
import de.steamwar.velocitycore.inventory.SWListInv;
|
||||||
|
import lombok.val;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.event.ClickEvent;
|
import net.kyori.adventure.text.event.ClickEvent;
|
||||||
import net.kyori.adventure.text.event.HoverEvent;
|
import net.kyori.adventure.text.event.HoverEvent;
|
||||||
@@ -307,7 +308,29 @@ public class TeamCommand extends SWCommand {
|
|||||||
|
|
||||||
Set<Event> events = TeamTeilnahme.getEvents(team.getTeamId());
|
Set<Event> events = TeamTeilnahme.getEvents(team.getTeamId());
|
||||||
if(!events.isEmpty()){
|
if(!events.isEmpty()){
|
||||||
sender.prefixless("TEAM_INFO_EVENTS", events.size(), events.stream().map(Event::getEventName).collect(Collectors.joining(", ")));
|
sender.prefixless("TEAM_INFO_EVENTS", events.size(), events.stream().map(event -> {
|
||||||
|
Integer placement = TeamTeilnahme.getPlacement(team, event);
|
||||||
|
if (placement != null) {
|
||||||
|
String prefix;
|
||||||
|
switch (placement) {
|
||||||
|
case 1:
|
||||||
|
prefix = "§x§F§F§D§7§0§e\uD83C\uDFC6 ";
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
prefix = "§x§C§0§C§0§C§7\uD83C\uDFC6 ";
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
prefix = "§x§8§C§7§8§5§6\uD83C\uDFC6 ";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
prefix = "§f" + placement + ". ";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return prefix + event.getEventName();
|
||||||
|
} else {
|
||||||
|
return event.getEventName();
|
||||||
|
}
|
||||||
|
}).collect(Collectors.joining("§8,§e ")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +351,7 @@ public class TeamCommand extends SWCommand {
|
|||||||
st.append(user.getUserName());
|
st.append(user.getUserName());
|
||||||
return st.toString();
|
return st.toString();
|
||||||
})
|
})
|
||||||
.collect(Collectors.joining(" "));
|
.collect(Collectors.joining("§8,§r "));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register("list")
|
@Register("list")
|
||||||
|
|||||||
Reference in New Issue
Block a user