Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/kotlin/de/bigboot/ggtools/fang/CommandContext.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package de.bigboot.ggtools.fang

import discord4j.core.`object`.entity.Guild
import discord4j.core.`object`.entity.Message
import discord4j.core.`object`.entity.User
import discord4j.core.`object`.entity.channel.MessageChannel
import kotlinx.coroutines.reactive.awaitSingle
import org.koin.core.component.KoinComponent
Expand All @@ -16,6 +17,7 @@ data class CommandContext(

suspend fun channel(): MessageChannel = message.channel.awaitSingle()
suspend fun guild(): Guild = message.guild.awaitSingle()
suspend fun author(): User = message.authorAsMember.awaitSingle()

class Arguments(private val arguments: Map<String, String>) {
operator fun get(key: String) = arguments.getValue(key)
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/de/bigboot/ggtools/fang/commands/Root.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import de.bigboot.ggtools.fang.CommandGroupSpec
import de.bigboot.ggtools.fang.commands.admin.Admin
import de.bigboot.ggtools.fang.commands.queue.Queue
import de.bigboot.ggtools.fang.commands.server.Server
import de.bigboot.ggtools.fang.commands.match.Match
import de.bigboot.ggtools.fang.utils.createEmbedCompat
import de.bigboot.ggtools.fang.utils.formatCommandHelp
import de.bigboot.ggtools.fang.utils.formatCommandTree
Expand All @@ -15,6 +16,7 @@ class Root : CommandGroupSpec("", "") {
group(Admin())
group(Queue())
group(Server())
group(Match())

command("help", "show this help") {
onCall {
Expand Down
36 changes: 36 additions & 0 deletions src/main/kotlin/de/bigboot/ggtools/fang/commands/match/Match.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package de.bigboot.ggtools.fang.commands.match

import de.bigboot.ggtools.fang.CommandGroupBuilder
import de.bigboot.ggtools.fang.CommandGroupSpec
import de.bigboot.ggtools.fang.Config
import de.bigboot.ggtools.fang.service.MatchService
import de.bigboot.ggtools.fang.service.QueueMessageService
import de.bigboot.ggtools.fang.utils.*
import discord4j.common.util.Snowflake
import kotlinx.coroutines.reactive.awaitSingle
import org.koin.core.component.inject

class Match : CommandGroupSpec("match", "Commands for matches") {
private val matchService by inject<MatchService>()
private val queueMessageService by inject<QueueMessageService>()

override val build: CommandGroupBuilder.() -> Unit = {
command("swap", "shows the swap commands for the server") {
onCall {
val currentServer = queueMessageService.findUser(author().id.asLong());

channel().createMessageCompat {
addEmbedCompat {
if (currentServer != null && currentServer.openUrl != null) {
title("Swap commands")
description("Leiren: `open ${currentServer.openUrl}?team=0`\nGrenn: `open ${currentServer.openUrl}?team=1`")
}
else {
description("You are not in a game with a server up")
}
}
}.awaitSingle()
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,15 @@ class QueueMessageService : AutostartService, KoinComponent {
))
}

fun findUser(user: Long): MatchRequest? {
matchReuests.forEach { (_, request) ->
if (request.pop.allPlayers.contains(user)) {
return request;
}
}
return null;
}

private suspend fun handleInteraction(event: ComponentInteractionEvent, button: ButtonJoin) {
event.deferEdit().awaitSafe()
matchService.join(button.queue, event.interaction.user.id.asLong())
Expand Down