Skip to content

release: merge develop with master #97

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

Merged
merged 2 commits into from
Jun 30, 2021
Merged

release: merge develop with master #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eda420
feat: update menu buttons
ddivad195 Jun 30, 2021
d674e3c
Merge pull request #96 from the-programmers-hangout/feat/update-menu-…
ddivad195 Jun 30, 2021
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: 1 addition & 1 deletion src/main/kotlin/me/ddivad/judgebot/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ suspend fun main(args: Array<String>) {
field {
name = "Build Info"
value = "```" +
"Version: 2.2.0\n" +
"Version: 2.2.1\n" +
"DiscordKt: ${versions.library}\n" +
"Kotlin: $kotlinVersion" +
"```"
Expand Down
38 changes: 24 additions & 14 deletions src/main/kotlin/me/ddivad/judgebot/embeds/UserEmbeds.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package me.ddivad.judgebot.embeds

import dev.kord.common.entity.ButtonStyle
import dev.kord.common.entity.Snowflake
import dev.kord.common.kColor
import dev.kord.core.entity.Guild
Expand Down Expand Up @@ -37,25 +36,16 @@ suspend fun MenuBuilder.createHistoryEmbed(
val leaveData = databaseService.joinLeaves.getMemberJoinLeaveDataForGuild(guild.id.asString, member.userId)
this.apply {
buildOverviewPage(guild, guildConfiguration, target, userRecord, embedColor, totalMenuPages, databaseService)
buildInfractionPage(guild, target, userRecord, embedColor, totalMenuPages)
buildInfractionPage(guild, guildConfiguration, target, userRecord, embedColor, totalMenuPages)
buildNotesPages(guild, guildConfiguration, target, userRecord, embedColor, totalMenuPages)
buildInformationPage(guild, guildConfiguration, target, userRecord, embedColor, totalMenuPages)
buildJoinLeavePage(guild, target, leaveData, userRecord, embedColor, totalMenuPages)
}

buttons {
button("Prev.", Emojis.arrowLeft) {
previousPage()
}
button("Next", Emojis.arrowRight) {
nextPage()
}
button("Overview", Emojis.clipboard) {
loadPage(0)
}
}

buttons {
button("Infractions", Emojis.warning) {
loadPage(1)
}
Expand All @@ -69,6 +59,17 @@ suspend fun MenuBuilder.createHistoryEmbed(
loadPage(4 + if (paginatedNotes.isNotEmpty()) paginatedNotes.size - 1 else 0)
}
}

if (paginatedNotes.isNotEmpty()) {
buttons {
button("Prev.", Emojis.arrowLeft) {
previousPage()
}
button("Next", Emojis.arrowRight) {
nextPage()
}
}
}
}

private suspend fun MenuBuilder.buildOverviewPage(
Expand Down Expand Up @@ -135,6 +136,7 @@ private suspend fun MenuBuilder.buildOverviewPage(

private suspend fun MenuBuilder.buildInfractionPage(
guild: Guild,
config: GuildConfiguration,
target: User,
userRecord: GuildMemberDetails,
embedColor: Color,
Expand All @@ -148,11 +150,10 @@ private suspend fun MenuBuilder.buildInfractionPage(
}
val warnings = userRecord.infractions.filter { it.type == InfractionType.Warn }.sortedBy { it.dateTime }
val strikes = userRecord.infractions.filter { it.type == InfractionType.Strike }.sortedBy { it.dateTime }
val bans = userRecord.infractions.filter { it.punishment?.punishment == PunishmentType.BAN }

addInlineField("Points", "**${userRecord.points} / ${config.infractionConfiguration.pointCeiling}**")
addInlineField("Warns", "${warnings.size}")
addInlineField("Strikes", "${strikes.size}")
addInlineField("Bans", "${bans.size}")

if (userRecord.infractions.isEmpty()) addField("", "**User has no infractions**")
if (warnings.isNotEmpty()) addField("", "**__Warnings__**")
Expand Down Expand Up @@ -203,9 +204,9 @@ private suspend fun MenuBuilder.buildNotesPages(
url = target.asUser().avatar.url
}

addInlineField("Points", "**${userRecord.points} / ${config.infractionConfiguration.pointCeiling}**")
addInlineField("Notes", "${userRecord.notes.size}")
addInlineField("Information", "${userRecord.info.size}")
addInlineField("Points", "**${userRecord.points} / ${config.infractionConfiguration.pointCeiling}**")

addField("", "**User has no notes**")
footer {
Expand Down Expand Up @@ -365,6 +366,15 @@ suspend fun MenuBuilder.createLinkedAccountMenu(
page {
createCondensedHistoryEmbed(linkedUser, linkedUserRecord, guild, config)
}

buttons {
button("Prev.", Emojis.arrowLeft) {
previousPage()
}
button("Next", Emojis.arrowRight) {
nextPage()
}
}
}
}

Expand Down