Skip to content

Preventing access requests from longer than 35 minutes ago from being processed #57

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

Open
MobileOak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preventing access requests from longer than 35 minutes ago from being processed #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/main/kotlin/com/timcastelijns/room15bot/bot/bot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class Bot(

companion object {
private val logger = LoggerFactory.getLogger(Bot::class.java)
private const val RESPOND_TO_ACCEPTANCE_DEADLINE = 1_800_000L
private const val TIME_USER_HAS_TO_ACK_RULES_MS = 1_800_000L // 30 mins
private const val TIME_OWNER_HAS_TO_ACCEPT_REQUEST_MS = 2_100_000L // 35 mins
}

private val job = kotlinx.coroutines.Job()
Expand Down Expand Up @@ -221,7 +222,7 @@ class Bot(
}
}

override fun provideLatestAccessRequestee() = recentAccessRequests.filterNot { it.processed }.lastOrNull()?.user
override fun provideLatestAccessRequestee() = recentAccessRequests.filterNot { it.processed }.filterNot { it.acceptDeadlineExceeded }.lastOrNull()?.user

override fun acceptMessage(message: String) {
outboundMessageQueue.add(OutboundMessage(message))
Expand Down Expand Up @@ -272,10 +273,13 @@ class Bot(
)

private val AccessGrant.respondDeadlineExceeded
get() = Instant.now().isAfter(timestamp.plusMillis(RESPOND_TO_ACCEPTANCE_DEADLINE))
get() = Instant.now().isAfter(timestamp.plusMillis(TIME_USER_HAS_TO_ACK_RULES_MS))

private data class AccessRequest(val user: User, val timestamp: Instant, var processed: Boolean = false)

private val AccessRequest.acceptDeadlineExceeded
get() = Instant.now().isAfter(timestamp.plusMillis(TIME_OWNER_HAS_TO_ACCEPT_REQUEST_MS))

private data class AccessGrant(val user: User, val timestamp: Instant, var shouldMonitor: Boolean = true)

}
Expand Down