role basics

app/Models/Permission.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class Permission extends NexusModel
-{
-    public $timestamps = true;
-
-    protected $fillable = ['name', ];
-
-}

app/Models/Role.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class Role extends NexusModel
-{
-    public $timestamps = true;
-
-    protected $fillable = ['name', 'class'];
-
-    public function permissions(): \Illuminate\Database\Eloquent\Relations\HasMany
-    {
-        return $this->hasMany(Permission::class, 'role_id');
-    }
-
-    public function getClassTextAttribute()
-    {
-        if ($this->class < 0) {
-            return '';
-        }
-        return User::getClassText($this->class);
-    }
-
-    public static function initClassRoles()
-    {
-        foreach (User::$classes as $class => $info) {
-            $attributes = [
-                'class' => $class
-            ];
-            $values = [
-                'name' => $info['text'],
-            ];
-            Role::query()->firstOrCreate($attributes, $values);
-        }
-    }
-
-}

app/Models/RolePermission.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class RolePermission extends NexusModel
-{
-    public $timestamps = true;
-
-    protected $fillable = ['role_id', 'permission_id'];
-
-}

app/Models/Setting.php

@@ -11,6 +11,10 @@ class Setting extends NexusModel
 
     public $timestamps = true;
 
+    public static array $permissionDegeneration = [
+        'torrent-approval' => 'torrentmanage',
+    ];
+
     /**
      * get setting autoload = yes with cache
      *

app/Models/User.php

@@ -17,6 +17,8 @@ use Laravel\Sanctum\HasApiTokens;
 use Nexus\Database\NexusDB;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Models\Contracts\HasName;
+use NexusPlugin\Permission\Models\Permission;
+use NexusPlugin\Permission\Models\Role;
 
 class User extends Authenticatable implements FilamentUser, HasName
 {
@@ -98,7 +100,7 @@ class User extends Authenticatable implements FilamentUser, HasName
 
     public static function getClassText($class)
     {
-        if (!isset(self::$classes[$class])) {
+        if (!is_numeric($class)|| !isset(self::$classes[$class])) {
             return '';
         }
         if ($class >= self::CLASS_VIP) {
@@ -113,6 +115,15 @@ class User extends Authenticatable implements FilamentUser, HasName
         return $classText;
     }
 
+    public static function listClass(): array
+    {
+        $result = [];
+        foreach (self::$classes as $class => $info) {
+            $result[$class] = self::getClassText($class);
+        }
+        return $result;
+    }
+
     public function canAccessFilament(): bool
     {
         return $this->canAccessAdmin();
@@ -463,7 +474,7 @@ class User extends Authenticatable implements FilamentUser, HasName
         return $this->belongsToMany(Role::class, 'user_roles', 'uid', 'role_id')->withTimestamps();
     }
 
-    public function permissions()
+    public function directPermissions()
     {
         return $this->belongsToMany(Permission::class, 'user_permissions', 'uid', 'permission_id')->withTimestamps();
     }

app/Models/UserPermission.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class UserPermission extends NexusModel
-{
-    public $timestamps = true;
-
-    protected $fillable = ['uid', 'permission_id'];
-
-}

app/Models/UserRole.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class UserRole extends NexusModel
-{
-    public $timestamps = true;
-
-    protected $fillable = ['uid', 'role_id'];
-
-}