Make permissions match flags when removing them

kordlib · Jul 6, 2020 · 2307c5c · 2307c5c
1 parent 8478199
commit 2307c5c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.5.6
+
+## Fixes
+* Fixed incorrect calculations of denied `Permissions`. 
+
 # 0.5.5
 
 ## Additions

diff --git a/common/src/main/kotlin/com/gitlab/kordlib/common/entity/Permission.kt b/common/src/main/kotlin/com/gitlab/kordlib/common/entity/Permission.kt
@@ -5,15 +5,11 @@ import kotlinx.serialization.*
 @Serializable(with = Permissions.Companion::class)
 class Permissions constructor(val code: Int) {
 
-    operator fun plus(permission: Permission): Permissions = when {
-        code and permission.code == permission.code -> this
-        else -> Permissions(this.code or permission.code)
-    }
+    operator fun plus(permission: Permission): Permissions = Permissions(this.code or permission.code)
+
+
+    operator fun minus(permission: Permission): Permissions = Permissions(code xor (code and permission.code))
 
-    operator fun minus(permission: Permission): Permissions = when {
-        code and permission.code == permission.code -> Permissions(code xor permission.code)
-        else -> this
-    }
 
     operator fun contains(permission: Permission): Boolean {
         return this.code and permission.code == permission.code
@@ -52,19 +48,15 @@ class Permissions constructor(val code: Int) {
         }
 
         operator fun Permissions.unaryMinus() {
-            if (this@PermissionsBuilder.code and code == code) {
-                this@PermissionsBuilder.code = this@PermissionsBuilder.code xor code
-            }
+            this@PermissionsBuilder.code = this@PermissionsBuilder.code xor (this@PermissionsBuilder.code and code)
         }
 
         operator fun Permission.unaryPlus() {
             this@PermissionsBuilder.code = this@PermissionsBuilder.code or code
         }
 
         operator fun Permission.unaryMinus() {
-            if (this@PermissionsBuilder.code and code == code) {
-                this@PermissionsBuilder.code = this@PermissionsBuilder.code xor code
-            }
+            this@PermissionsBuilder.code = this@PermissionsBuilder.code xor (this@PermissionsBuilder.code and code)
         }
 
         fun permissions() = Permissions(code)