_Bastler/we.bstly-back
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

try to hotfix permission expiring

Browse Source
This commit is contained in:
_Bastler 2023-12-18 09:46:36 +01:00
parent 6d7407979d
commit ba28c98e44
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/de/bstly/we/businesslogic/PermissionManager.java
View File

@ -416,7 +416,11 @@ public class PermissionManager implements UserDataProvider {
List<Permission> existingPermissions = get(target, name); List<Permission> existingPermissions = get(target, name);
for (Permission existingPermission : existingPermissions) { for (Permission existingPermission : existingPermissions) {
if (existingPermission.getExpires().isBefore(permissionsExpires)) { if (existingPermission.getExpires().isBefore(permissionsExpires)
|| permissionMapping.isLifetimeRound() && InstantHelper
.truncate(existingPermission.getExpires(), permissionMapping.getLifetimeUnit())
.isBefore(InstantHelper.truncate(permissionsExpires,
permissionMapping.getLifetimeUnit()))) {
if (starts != null) { if (starts != null) {
if (existingPermission.getStarts() == null || existingPermission.getStarts().isAfter(starts) if (existingPermission.getStarts() == null || existingPermission.getStarts().isAfter(starts)
|| existingPermission.getExpires().isAfter(starts)) { || existingPermission.getExpires().isAfter(starts)) {