From 5550016d797cb539883fe55b13373c158018f811 Mon Sep 17 00:00:00 2001 From: Jannik Reimers Date: Fri, 2 May 2025 03:38:00 +0200 Subject: [PATCH] even more grrrr --- .../kotlin/dev/jansel/aglaea/database/entities/ReplayData.kt | 3 +++ .../kotlin/dev/jansel/aglaea/extensions/ReplayExtension.kt | 4 ++-- src/main/kotlin/dev/jansel/aglaea/utils/Twitch.kt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/dev/jansel/aglaea/database/entities/ReplayData.kt b/src/main/kotlin/dev/jansel/aglaea/database/entities/ReplayData.kt index 751d6fb..93417a7 100644 --- a/src/main/kotlin/dev/jansel/aglaea/database/entities/ReplayData.kt +++ b/src/main/kotlin/dev/jansel/aglaea/database/entities/ReplayData.kt @@ -1,11 +1,14 @@ package dev.jansel.aglaea.database.entities +import dev.kord.common.entity.Snowflake import kotlinx.serialization.Serializable @Serializable data class ReplayData( val id: String, val replayFile: ByteArray, + val submitTime: Long, + val userId: Snowflake, ) { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/src/main/kotlin/dev/jansel/aglaea/extensions/ReplayExtension.kt b/src/main/kotlin/dev/jansel/aglaea/extensions/ReplayExtension.kt index 64b8890..6554962 100644 --- a/src/main/kotlin/dev/jansel/aglaea/extensions/ReplayExtension.kt +++ b/src/main/kotlin/dev/jansel/aglaea/extensions/ReplayExtension.kt @@ -57,13 +57,13 @@ class ReplayExtension : Extension() { if (file.filename.endsWith(".osr")) { val id = Uuid.random().toString() - ReplayCollection().set(ReplayData(id, file.download())) + ReplayCollection().set(ReplayData(id, file.download(), System.currentTimeMillis(), event.interaction.user.id)) respond { content = "Your Auth Code is: $id" } } else { respond { - content = "" + content = "Invalid Replay file." } } } diff --git a/src/main/kotlin/dev/jansel/aglaea/utils/Twitch.kt b/src/main/kotlin/dev/jansel/aglaea/utils/Twitch.kt index de5f355..7c760ee 100644 --- a/src/main/kotlin/dev/jansel/aglaea/utils/Twitch.kt +++ b/src/main/kotlin/dev/jansel/aglaea/utils/Twitch.kt @@ -44,7 +44,7 @@ class Twitch : KordExKoinComponent { .getChannelOf(Snowflake(1130954956892029060)) val replay = ReplayCollection().get(event.message) ?: return@launch channel.createMessage { - content = "Replay redeemed by: ${event.user.name}" + content = "Replay redeemed by: ${event.user.name}, submitted to the Database at by <@${replay.userId}>" this.addFile("replay.osr", ChannelProvider(null) { ByteReadChannel(replay.replayFile) }) } // remove the replay from the database