TimeLimit.io/timelimit-server
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-server.git synced 2026-08-31 19:03:45 +02:00
Code Actions Packages Releases 6 Activity

adjust isAtLeastAsStrictAsPreviously calculation

Browse Source
This commit is contained in:
Jonas Lochmann
2026-06-15 02:00:00 +02:00
parent bf338f4aff
commit ccfbf97d36
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/function/sync/apply-actions/dispatch-parent-action/updatetimelimitrule.ts
+5 -1
View File
@@ -1,6 +1,6 @@
/* /*
* server component for the TimeLimit App * server component for the TimeLimit App
* Copyright (C) 2019 - 2024 Jonas Lochmann * Copyright (C) 2019 - 2026 Jonas Lochmann
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as
@@ -67,6 +67,9 @@ export async function dispatchUpdateTimelimitRule ({
const wasSessionDurationLimitationEnabled = const wasSessionDurationLimitationEnabled =
ruleEntry.sessionPauseMilliseconds > 0 && ruleEntry.sessionDurationMilliseconds > 0 ruleEntry.sessionPauseMilliseconds > 0 && ruleEntry.sessionDurationMilliseconds > 0
const isSessionDurationLimitationEnabled =
action.sessionPauseMilliseconds > 0 && action.sessionDurationMilliseconds > 0
const countOldAffectedDays = Array(7) const countOldAffectedDays = Array(7)
.fill(0) .fill(0)
.reduce((sum, _, index) => sum + ((ruleEntry.dayMaskAsBitmask >> index) & 1), 0) .reduce((sum, _, index) => sum + ((ruleEntry.dayMaskAsBitmask >> index) & 1), 0)
@@ -78,6 +81,7 @@ export async function dispatchUpdateTimelimitRule ({
action.start <= ruleEntry.startMinuteOfDay && action.start <= ruleEntry.startMinuteOfDay &&
action.end >= ruleEntry.endMinuteOfDay && action.end >= ruleEntry.endMinuteOfDay &&
(!wasSessionDurationLimitationEnabled || ( (!wasSessionDurationLimitationEnabled || (
isSessionDurationLimitationEnabled &&
action.sessionDurationMilliseconds <= ruleEntry.sessionDurationMilliseconds && action.sessionDurationMilliseconds <= ruleEntry.sessionDurationMilliseconds &&
action.sessionPauseMilliseconds >= ruleEntry.sessionPauseMilliseconds action.sessionPauseMilliseconds >= ruleEntry.sessionPauseMilliseconds
)) && )) &&