From 7c85496eb8a35b9a4c996ff6c2d2b10d5dd24f37 Mon Sep 17 00:00:00 2001
From: luukas <lukasdoesdev@gmail.com>
Date: Wed, 18 May 2022 01:55:05 +0300
Subject: [PATCH] Clean up enum-related functions

---
 app/classes/models/crafty_permissions.py |  8 +++-----
 app/classes/models/server_permissions.py | 18 ++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/classes/models/crafty_permissions.py b/app/classes/models/crafty_permissions.py
index 54d22443..8042fe6c 100644
--- a/app/classes/models/crafty_permissions.py
+++ b/app/classes/models/crafty_permissions.py
@@ -45,15 +45,13 @@ class PermissionsCrafty:
     # **********************************************************************************
     @staticmethod
     def get_permissions_list():
-        return [
-            permission for _, permission in EnumPermissionsCrafty.__members__.items()
-        ]
+        return list(EnumPermissionsCrafty.__members__.values())
 
     @staticmethod
     def get_permissions(permissions_mask):
         return [
             permission
-            for _, permission in EnumPermissionsCrafty.__members__.items()
+            for permission in EnumPermissionsCrafty.__members__.values()
             if PermissionsCrafty.has_permission(permissions_mask, permission)
         ]
 
@@ -81,7 +79,7 @@ class PermissionsCrafty:
 
     @staticmethod
     def get_all_permission_quantity_list():
-        return {name: -1 for name, _ in EnumPermissionsCrafty.__members__.items()}
+        return {name: -1 for name in EnumPermissionsCrafty.__members__.keys()}
 
     @staticmethod
     def get_permission_quantity_list(user_id):
diff --git a/app/classes/models/server_permissions.py b/app/classes/models/server_permissions.py
index 58ce204a..10a43b70 100644
--- a/app/classes/models/server_permissions.py
+++ b/app/classes/models/server_permissions.py
@@ -51,15 +51,13 @@ class PermissionsServers:
 
     @staticmethod
     def get_permissions_list():
-        return [
-            permission for _, permission in EnumPermissionsServer.__members__.items()
-        ]
+        return list(EnumPermissionsServer.__members__.values())
 
     @staticmethod
     def get_permissions(permissions_mask):
         return [
             permission
-            for _, permission in EnumPermissionsServer.__members__.items()
+            for permission in EnumPermissionsServer.__members__.values()
             if PermissionsServers.has_permission(permissions_mask, permission)
         ]
 
@@ -82,13 +80,13 @@ class PermissionsServers:
 
     @staticmethod
     def get_token_permissions(permissions_mask, api_permissions_mask):
-        permissions_list = []
-        for member in EnumPermissionsServer.__members__.items():
+        return [
+            permission
+            for permission in EnumPermissionsServer.__members__.values()
             if PermissionHelper.both_have_perm(
-                permissions_mask, api_permissions_mask, member[1]
-            ):
-                permissions_list.append(member[1])
-        return permissions_list
+                permissions_mask, api_permissions_mask, permission
+            )
+        ]
 
     # **********************************************************************************
     #                                   Role_Servers Methods