Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added an emoji in front of the user ID to indicate that they are banned in report embed. #49

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Added an emoji in front of the user ID to indicate that they are banned in report embed. #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e204d67
Added an emoji in front of the user ID to indicate that they are banned.
PeterStark000 Jul 22, 2024
17f7928
Check temporarily banned users and renamed the function to a more des…
PeterStark000 Jul 22, 2024
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
56 changes: 50 additions & 6 deletions ...otlin/net/perfectdreams/loritta/helper/utils/generateserverreport/GenerateServerReport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,24 @@ import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction
import net.dv8tion.jda.api.utils.FileUpload
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder
import net.perfectdreams.loritta.cinnamon.pudding.tables.BannedUsers
import net.perfectdreams.loritta.cinnamon.pudding.utils.exposed.selectFirstOrNull
import net.perfectdreams.loritta.helper.LorittaHelper
import net.perfectdreams.loritta.helper.listeners.ApproveReportsOnReactionListener
import net.perfectdreams.loritta.helper.utils.ComponentDataUtils
import net.perfectdreams.loritta.helper.utils.Constants
import net.perfectdreams.loritta.helper.utils.GoogleDriveUtils
import net.perfectdreams.loritta.helper.utils.extensions.await
import net.perfectdreams.loritta.helper.utils.extensions.getBannedState
import org.jetbrains.exposed.sql.SortOrder
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.greaterEq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNotNull
import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull
import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.or
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
import java.awt.Color
import java.net.HttpURLConnection
import java.net.URL
Expand Down Expand Up @@ -270,6 +282,32 @@ class GenerateServerReport(val m: LorittaHelper) {
}
}

private fun getFancyUserId(
userId: Long
): String {
val userBanned = transaction(m.databases.lorittaDatabase) {
BannedUsers.select {
BannedUsers.userId eq userId and
(BannedUsers.valid eq true) and
(
BannedUsers.expiresAt.isNull()
or
(
BannedUsers.expiresAt.isNotNull() and
(BannedUsers.expiresAt greaterEq System.currentTimeMillis()))
)
}
.orderBy(BannedUsers.bannedAt, SortOrder.DESC)
.firstOrNull()
}

if (userBanned !== null) {
return "$userId ⚒\uFE0F"
}

return userId.toString()
}

private suspend fun handleLoriSwearingRules(
jda: JDA,
userThatMadeTheReport: User,
Expand Down Expand Up @@ -390,7 +428,7 @@ class GenerateServerReport(val m: LorittaHelper) {

embed.addField(
"ID do Usuário",
userId?.toString()!!,
getFancyUserId(userId!!),
false
)

Expand Down Expand Up @@ -512,7 +550,7 @@ class GenerateServerReport(val m: LorittaHelper) {
embed.apply {
addField(
"ID do Usuário",
userId?.toString()!!,
getFancyUserId(userId!!),
false
)

Expand Down Expand Up @@ -576,13 +614,16 @@ class GenerateServerReport(val m: LorittaHelper) {

embed.addField(
"ID do Usuário",
userId?.toString()!!,
getFancyUserId(userId!!),
false
)

embed.addField(
"IDs das Contas Alternativas",
accountIds.joinToString(", "),
accountIds
.mapNotNull { it.toLongOrNull() }
.map { getFancyUserId(it) }
.joinToString(", "),
false
)

Expand Down Expand Up @@ -639,13 +680,16 @@ class GenerateServerReport(val m: LorittaHelper) {

embed.addField(
"ID do Usuário",
userId?.toString()!!,
getFancyUserId(userId!!),
false
)

embed.addField(
"IDs das Contas Alternativas",
accountIds.joinToString(", "),
accountIds
.mapNotNull { it.toLongOrNull() }
.map { getFancyUserId(it) }
.joinToString(", "),
false
)

Expand Down
Loading