w33b/hstream
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add user roles system

Browse Source
This commit is contained in:
w33b
2026-01-16 23:14:47 +01:00
parent c0be2e294a
commit e5ef197ed6
21 changed files with 206 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Enums/UserRole.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
namespace App\Enums;
enum UserRole: string
{
case ADMINISTRATOR = 'admin';
case MODERATOR = 'moderator';
case SUPPORTER = 'supporter';
case BANNED = 'banned';
}

5
app/Http/Controllers/Admin/UserController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Admin;
use App\Enums\UserRole;
use App\Models\User;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
@@ -31,11 +32,11 @@ class UserController extends Controller
switch ($validated['action']) {
case 'ban':
$user->update(['is_banned' => 1]);
$user->addRole(UserRole::BANNED);
alert()->success('Banned', 'User has been banned.');
break;
case 'unban':
$user->update(['is_banned' => 0]);
$user->removeRole(UserRole::BANNED);
alert()->success('Unbanned', 'User has been unbanned.');
break;
default:

28
app/Http/Controllers/Auth/DiscordAuthController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Auth;
use App\Enums\UserRole;
use App\Models\User;
use App\Http\Controllers\Controller;
@@ -88,10 +89,7 @@ class DiscordAuthController extends Controller
// User is not in the guild
if ($response->status() === 404) {
$user->update([
'is_patreon' => false,
]);
$user->removeRole(UserRole::SUPPORTER);
return;
}
@@ -110,21 +108,15 @@ class DiscordAuthController extends Controller
$discordRoles = $response->json('roles', []);
$patreonRoles = config('discord.patreon_roles', []);
$isPatreon = false;
foreach($patreonRoles as $patreonRole)
{
if (in_array($patreonRole, $discordRoles, true)) {
$isPatreon = true;
break;
}
// If intersect of array is empty, then the user doesn't have the role
$hasSupporterRole = !empty(array_intersect($discordRoles, $patreonRoles));
if (!$hasSupporterRole) {
// Remove role if not found
$user->removeRole(UserRole::SUPPORTER);
return;
}
// Only update if something actually changed
if ($user->is_patreon !== $isPatreon) {
$user->update([
'is_patreon' => $isPatreon,
]);
$user->addRole(UserRole::SUPPORTER);
}
}
}

1
app/Http/Kernel.php
View File

@@ -59,6 +59,7 @@ class Kernel extends HttpKernel
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
'auth.admin' => \App\Http\Middleware\IsAdmin::class,
'auth.moderator' => \App\Http\Middleware\IsModerator::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

35
app/Http/Middleware/IsAdmin.php
View File

@@ -1,28 +1,14 @@
<?php namespace app\Http\Middleware;
use App\Enums\UserRole;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Symfony\Component\HttpFoundation\Response;
class IsAdmin {
/**
* The Guard implementation.
*
* @var Guard
*/
protected $auth;
/**
* Create a new filter instance.
*
* @param Guard $auth
* @return void
*/
public function __construct(Guard $auth)
{
$this->auth = $auth;
}
/**
* Handle an incoming request.
*
@@ -30,15 +16,14 @@ class IsAdmin {
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next): Response
{
if( ! $this->auth->user()->is_admin)
if(Auth::check() && Auth::user()->hasRole(UserRole::ADMINISTRATOR))
{
session()->flash('error_msg','This resource is restricted to Administrators!');
return redirect()->route('home.index');
}
return $next($request);
}
session()->flash('error_msg','This resource is restricted to Administrators!');
return redirect()->route('home.index');
}
}

9
app/Http/Middleware/IsBanned.php
View File

@@ -1,8 +1,11 @@
<?php namespace app\Http\Middleware;
use App\Enums\UserRole;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Contracts\Auth\Guard;
use Symfony\Component\HttpFoundation\Response;
class IsBanned {
@@ -13,9 +16,9 @@ class IsBanned {
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next): Response
{
if(auth()->check() && auth()->user()->is_banned == 1)
if(Auth::check() && Auth::user()->hasRole(UserRole::BANNED))
{
Auth::logout();
$request->session()->invalidate();

29
app/Http/Middleware/IsModerator.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use App\Enums\UserRole;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Symfony\Component\HttpFoundation\Response;
class IsModerator
{
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
if (Auth::check() && Auth::user()->hasRole(UserRole::MODERATOR))
{
return $next($request);
}
session()->flash('error_msg','This resource is restricted to Administrators!');
return redirect()->route('home.index');
}
}

9
app/Livewire/AdminUserSearch.php
View File

@@ -2,6 +2,7 @@
namespace App\Livewire;
use App\Enums\UserRole;
use App\Models\Comment;
use App\Models\User;
@@ -17,7 +18,7 @@ class AdminUserSearch extends Component
public $search = '';
#[Url(history: true)]
public $filtered = ['true'];
public $discordId = '';
#[Url(history: true)]
public $patreon = [];
@@ -38,10 +39,10 @@ class AdminUserSearch extends Component
public function render()
{
$users = User::when($this->filtered !== [], fn ($query) => $query->where('id', '>=', 10000))
->when($this->patreon !== [], fn ($query) => $query->where('is_patreon', 1))
->when($this->banned !== [], fn ($query) => $query->where('is_banned', 1))
$users = User::when($this->patreon !== [], fn ($query) => $query->whereJsonContains('roles', UserRole::SUPPORTER->value))
->when($this->banned !== [], fn ($query) => $query->whereJsonContains('roles', UserRole::BANNED->value))
->when($this->search !== '', fn ($query) => $query->where('name', 'like', '%'.$this->search.'%'))
->when($this->discordId !== '', fn ($query) => $query->where('discord_id', '=', $this->discordId))
->paginate(20);
return view('livewire.admin-user-search', [

6
app/Livewire/DownloadsSearch.php
View File

@@ -73,9 +73,9 @@ class DownloadsSearch extends Component
$types[] = 'FHD';
} elseif ($label === 'FHD 48fps') {
$types[] = 'FHDi';
} elseif ($label === 'UHD' && auth()->user()->is_patreon) {
} elseif ($label === 'UHD' && auth()->user()->hasRole(\App\Enums\UserRole::SUPPORTER)) {
$types[] = 'UHD';
} elseif ($label === 'UHD 48fps' && auth()->user()->is_patreon) {
} elseif ($label === 'UHD 48fps' && auth()->user()->hasRole(\App\Enums\UserRole::SUPPORTER)) {
$types[] = 'UHDi';
}
}
@@ -98,7 +98,7 @@ class DownloadsSearch extends Component
public function mount()
{
if (!auth()->user()->is_patreon) {
if (!auth()->user()->hasRole(\App\Enums\UserRole::SUPPORTER)) {
return;
}

45
app/Models/User.php
View File

@@ -3,6 +3,8 @@
namespace App\Models;
//use Illuminate\Contracts\Auth\MustVerifyEmail;
use App\Enums\UserRole;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -25,7 +27,6 @@ class User extends Authenticatable
'email',
'password',
'locale',
'is_banned',
// Discord
'discord_id',
'discord_avatar',
@@ -54,7 +55,7 @@ class User extends Authenticatable
'name' => 'string',
'email' => 'string',
'locale' => 'string',
'roles' => 'json',
'roles' => 'array',
'tag_blacklist' => 'array',
// Discord
'discord_id' => 'integer',
@@ -119,4 +120,44 @@ class User extends Authenticatable
return asset('images/default-avatar.webp');
}
/**
* Check if user has a specific role
*/
public function hasRole(UserRole $role): bool
{
return in_array($role->value, $this->roles ?? [], true);
}
/**
* Add Role to User
*/
public function addRole(UserRole $role): void
{
if ($this->hasRole($role)) {
return;
}
// Get all current roles
$roles = $this->roles ?? [];
// Add new role
$roles[] = $role->value;
$this->roles = $roles;
$this->save();
}
/**
* Remove Role from User
*/
public function removeRole(UserRole $role): void
{
if (!$this->hasRole($role)) {
return;
}
$this->roles = array_diff($this->roles, [$role->value]);
$this->save();
}
}

14
config/discord.php
View File

@@ -6,13 +6,13 @@ return [
'guild_id' => 802233383710228550,
'patreon_roles' => [
841798154999169054, // ????
803329707650187364, // Tier-5
803327903659196416, // ????
803325441942356059, // Tier-3
803322725576736858, // Tier-2
802270568912519198, // Tier-1
802234830384267315 // admin
'841798154999169054', // ????
'803329707650187364', // Tier-5
'803327903659196416', // ????
'803325441942356059', // Tier-3
'803322725576736858', // Tier-2
'802270568912519198', // Tier-1
'802234830384267315' // admin
],
'discord_bot_token' => env('DISCORD_BOT_TOKEN'),

50
database/migrations/2026_01_11_184725_migrate_to_user_roles.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
// Migrate supporters
DB::table('users')->where('is_patreon', 1)->update([
'roles' => DB::raw("JSON_ARRAY('supporter')")
]);
// Migrate banned
DB::table('users')->where('is_banned', 1)->update([
'roles' => DB::raw("JSON_ARRAY('banned')")
]);
// Migrate admins
DB::table('users')->where('is_admin', 1)->update([
'roles' => DB::raw("JSON_ARRAY('admin')")
]);
// Drop columns
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('is_admin');
$table->dropColumn('is_patreon');
$table->dropColumn('is_banned');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
DB::table('users')->update(['roles' => null]);
Schema::table('users', function (Blueprint $table) {
$table->boolean('is_admin')->default(0);
$table->boolean('is_patreon')->default(0);
$table->boolean('is_banned')->default(0);
});
}
};

4
resources/views/admin/home/alert.blade.php
View File

@@ -6,7 +6,7 @@
<div class="mb-4 rounded-lg bg-success-400 px-6 py-5 text-base text-success-800 mt-5" role="alert">
{{ $alert->text }}
@auth
@if(Auth::user()->is_admin)
@if(Auth::user()->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
<form method="POST" action="{{ route('admin.alert.delete', $alert->id) }}" class="float-right hover:text-success-900">
@csrf
@method('delete')
@@ -21,7 +21,7 @@
<div class="mb-4 rounded-lg bg-danger-400 px-6 py-5 text-base text-danger-800 mt-5" role="alert">
{{ $alert->text }}
@auth
@if(Auth::user()->is_admin)
@if(Auth::user()->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
<form method="POST" action="{{ route('admin.alert.delete', $alert->id) }}" class="float-right hover:text-danger-900">
@csrf
@method('delete')

2
resources/views/admin/stream.blade.php
View File

@@ -1,5 +1,5 @@
@auth
@if(Auth::user()->is_admin)
@if(Auth::user()->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
<div class="relative p-5 bg-white dark:bg-neutral-700/40 rounded-lg overflow-hidden z-10">
<div class="float-left">
<a data-te-toggle="modal" data-te-target="#modalUploadEpisode" class="text-xl text-gray-800 dark:text-gray-200 leading-tight cursor-pointer whitespace-nowrap">

2
resources/views/layouts/navigation.blade.php
View File

@@ -163,7 +163,7 @@
<i class="fa-solid fa-gear"></i> {{ __('nav.settings') }}
</x-dropdown-link>
@if (Auth::user()->is_admin)
@if (Auth::user()->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
<x-dropdown-link href="{{ route('admin.upload.index') }}">
<i class="fa-solid fa-user-tie"></i> Admin
</x-dropdown-link>

25
resources/views/livewire/admin-user-search.blade.php
View File

@@ -6,12 +6,16 @@
<thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-pink-700 dark:text-neutral-200 ">
<tr>
<th scope="col" class="px-6 py-3">
Discord-ID
ID
</th>
<th scope="col" class="px-6 py-3">
Discord ID
<input
class="w-4 h-4 ml-2 text-rose-600 bg-gray-100 border-gray-300 rounded focus:ring-rose-500 dark:focus:ring-rose-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
type="checkbox"
wire:model.live="filtered"
value="true"
wire:model.live.debounce.600ms="discordId"
type="search"
id="discord-search"
class="ml-2 w-32 h-7 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900"
placeholder="Search..."
>
</th>
<th scope="col" class="px-6 py-3">
@@ -59,14 +63,17 @@
<th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
{{ $user->id }}
</th>
<td class="px-6 py-4">
{{ $user->discord_id ?? 'n/a' }}
</td>
<td class="px-6 py-4">
{{ $user->name }}
</td>
<td class="px-6 py-4">
{{ $user->is_patreon ? 'Yes' : 'No' }}
{{ $user->hasRole(\App\Enums\UserRole::SUPPORTER) ? 'Yes' : 'No' }}
</td>
<td class="px-6 py-4">
{{ $user->is_banned ? 'Yes' : 'No' }}
{{ $user->hasRole(\App\Enums\UserRole::BANNED) ? 'Yes' : 'No' }}
</td>
<td class="px-6 py-4">
{{ $user->created_at->format('Y-m-d') }}
@@ -78,9 +85,9 @@
<form method="POST" action="{{ route('admin.user.update') }}">
@csrf
<input type="hidden" value="{{ $user->id }}" name="id">
<input type="hidden" value="{{ $user->is_banned ? 'unban' : 'ban' }}" name="action">
<input type="hidden" value="{{ $user->hasRole(\App\Enums\UserRole::BANNED) ? 'unban' : 'ban' }}" name="action">
<button type="submit" class="inline-block w-full rounded bg-rose-600 pl-[4px] pr-[4px] p-[1px] text-xs font-medium uppercase leading-normal text-white transition duration-150 ease-in-out hover:bg-rose-700 focus:bg-rose-600">
{{ $user->is_banned ? 'Unban' : 'Ban' }}
{{ $user->hasRole(\App\Enums\UserRole::BANNED) ? 'Unban' : 'Ban' }}
</button>
</form>
<button wire:click="deleteUserComments('{{ $user->id }}')" class="inline-block w-full rounded bg-red-600 pl-[4px] pr-[4px] p-[1px] text-xs font-medium uppercase leading-normal text-white transition duration-150 ease-in-out hover:bg-rose-700 focus:bg-rose-600">

4
resources/views/livewire/comment.blade.php
View File

@@ -6,10 +6,10 @@
<div class="flex-grow">
<div class="flex gap-2">
<p class="font-medium text-gray-900 dark:text-gray-100">{{ $comment->user->name }}</p>
@if($comment->user->is_admin)
@if($comment->user->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
<a data-te-toggle="tooltip" title="Admin"><i class="fa-solid fa-crown text-yellow-600"></i></a>
@endif
@if($comment->user->is_patreon)
@if($comment->user->hasRole(\App\Enums\UserRole::SUPPORTER))
<a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600"></i></a>
@endif
</div>

4
resources/views/modals/partials/download-authorized.blade.php
View File

@@ -52,7 +52,7 @@
<br>
@php $download = $episode->getDownloadByType('UHD'); @endphp
@isset($download)
@if (!Auth::user()->is_patreon)
@if (!Auth::user()->hasRole(\App\Enums\UserRole::SUPPORTER))
@if (config('hstream.free_downloads'))
<p class="font-bold text-gray-800 dark:text-gray-200">
<i class="fa-solid fa-lock-open pr-[4px] text-yellow-600"></i> 4k
@@ -91,7 +91,7 @@
<br>
@if ($episode->interpolated_uhd)
@if (!Auth::user()->is_patreon)
@if (!Auth::user()->hasRole(\App\Enums\UserRole::SUPPORTER))
@if (config('hstream.free_downloads'))
<p class="font-bold text-gray-800 dark:text-gray-200">
<i class="fa-solid fa-lock-open pr-[4px] text-yellow-600"></i> 4k 48fps

4
resources/views/partials/comment.blade.php
View File

@@ -6,10 +6,10 @@
<div class="flex-grow">
<div class="flex gap-2">
<p class="font-medium text-gray-900 dark:text-gray-100">{{ $comment->user->name }}</p>
@if($comment->user->is_admin)
@if($comment->user->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
<a data-te-toggle="tooltip" title="Admin"><i class="fa-solid fa-crown text-yellow-600"></i></a>
@endif
@if($comment->user->is_patreon)
@if($comment->user->hasRole(\App\Enums\UserRole::SUPPORTER))
<a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600"></i></a>
@endif
</div>

2
resources/views/stream/index.blade.php
View File

@@ -46,7 +46,7 @@
@include('modals.share')
@auth
@if(Auth::user()->is_admin)
@if(Auth::user()->hasRole(\App\Enums\UserRole::ADMINISTRATOR))
@include('admin.modals.upload-episode')
@include('admin.modals.add-subtitles')
@include('admin.modals.edit-episode')

2
resources/views/user/partials/profile.blade.php
View File

@@ -4,7 +4,7 @@
<div class="flex flex-col py-5 pl-24">
<strong class="text-slate-900 text-xl font-bold dark:text-slate-200">
{{ $user->name }}
@if ($user->is_patreon)
@if ($user->hasRole(\App\Enums\UserRole::SUPPORTER))
<a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i
class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a>
@endif