Skip to content

release: merge develop with master #102

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 3 commits into from
Jul 3, 2021
Merged

release: merge develop with master #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36a2e67
fix: only add 1 button row to the alt menu
ddivad195 Jul 2, 2021
69ca4ca
Merge pull request #101 from the-programmers-hangout/fix/alt-menu-but…
ddivad195 Jul 2, 2021
0280725
chore: udpate timer to add join data to 1 minute
ddivad195 Jul 3, 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.1\n" +
"Version: 2.2.2\n" +
"DiscordKt: ${versions.library}\n" +
"Kotlin: $kotlinVersion" +
"```"
Expand Down
14 changes: 7 additions & 7 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
Expand Up @@ -366,14 +366,14 @@ suspend fun MenuBuilder.createLinkedAccountMenu(
page {
createCondensedHistoryEmbed(linkedUser, linkedUserRecord, guild, config)
}
}

buttons {
button("Prev.", Emojis.arrowLeft) {
previousPage()
}
button("Next", Emojis.arrowRight) {
nextPage()
}
buttons {
button("Prev.", Emojis.arrowLeft) {
previousPage()
}
button("Next", Emojis.arrowRight) {
nextPage()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/me/ddivad/judgebot/listeners/JoinLeaveListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fun onGuildMemberLeave(databaseService: DatabaseService) = listeners {
on<MemberJoinEvent> {
// Add delay before creating user in case they are banned immediately (raid, etc...)
GlobalScope.launch {
delay(1000 * 60 * 5)
delay(1000 * 60 * 1)
guild.getMemberOrNull(member.id)?.let {
databaseService.joinLeaves.createJoinLeaveRecord(guildId.asString, member)
}
Expand Down