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

Jump to bottom

feat: fixed audience counter permission problem #208

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: fixed audience counter permission problem #208

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcf848f
feat: fixed audience counter permission problem
Mirai1129 Oct 19, 2023
328c584
feat: delete comments change to extension method
Mirai1129 Oct 20, 2023
527f5e5
feat: static import LocalDateTime.now()
Mirai1129 Oct 20, 2023
186013f
feat: more semantic in judge if alpha
Mirai1129 Oct 20, 2023
0df1136
feat: more semantic in judge if alpha
Mirai1129 Oct 20, 2023
84241e9
feat: more semantic in judge if alpha
Mirai1129 Oct 20, 2023
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
24 changes: 16 additions & 8 deletions ...-counter/src/main/kotlin/tw/waterballsa/utopia/audiencecounter/AudienceCounterListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import tw.waterballsa.utopia.commons.extensions.onStart
import tw.waterballsa.utopia.commons.extensions.toDate
import tw.waterballsa.utopia.jda.UtopiaListener
import tw.waterballsa.utopia.jda.extensions.getOptionAsPositiveInt
import java.time.LocalDateTime
import tw.waterballsa.utopia.jda.extensions.replyEphemerally
import net.dv8tion.jda.api.entities.Member
import java.time.LocalDateTime.now
import java.time.temporal.ChronoUnit
import java.util.*
import kotlin.concurrent.timerTask
Expand Down Expand Up @@ -41,17 +43,23 @@ class AudienceCounterListener(private val wsa: WsaDiscordProperties) : UtopiaLis
return
}

val recordPeriodTime =
getOptionAsPositiveInt(TIME_LENGTH)!!.toLong() // period time between startTime and endTime
val currentTime = LocalDateTime.now() // now time
val startRecordTime = currentTime.truncatedTo(ChronoUnit.MINUTES).toDate() // start time
val endRecordTime = currentTime.plusMinutes(recordPeriodTime).toDate() // end time
if (member.isAlpha()) {
val recordPeriodTime =
getOptionAsPositiveInt(TIME_LENGTH)!!.toLong()
val currentTime = now()
val startRecordTime = currentTime.truncatedTo(ChronoUnit.MINUTES).toDate()
val endRecordTime = currentTime.plusMinutes(recordPeriodTime).toDate()
Comment on lines +49 to +51
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit： 把 currentTime 、 startRecordTime 、 endRecordTime 封裝成一個具有領域意義類別，程式會更乾淨整潔

請參考 message-cherry-pick 的 DateTimeRange。


reply("counter start!!!").queue {
scheduledRecordHighestAudience(startRecordTime, endRecordTime)
reply("counter start!!!").queue {
scheduledRecordHighestAudience(startRecordTime, endRecordTime)
}
} else {
replyEphemerally("You should be the Alpha!")
}
}
}

private fun Member?.isAlpha(): Boolean = this?.roles?.any { it.id == wsa.wsaAlphaRoleId } ?: false
}

private fun SlashCommandInteractionEvent.scheduledRecordHighestAudience(startRecordTime: Date, endRecordTime: Date) {
Expand Down