mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-05-03 08:50:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

update: UserGroups ENUM

Browse Source
This commit is contained in:
HDVinnie
2023-10-31 06:47:08 -04:00
parent 2b3e1f8747
commit 834f7f4d7a
9 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Staff/UserController.php
+1 -1
View File
@@ -120,7 +120,7 @@ class UserController extends Controller
'can_invite' => false,
'can_request' => false,
'can_chat' => false,
'group_id' => UserGroups::PRUNED,
'group_id' => UserGroups::PRUNED->value,
'deleted_by' => auth()->id(),
]);
app/Http/Controllers/User/NotificationSettingController.php
+8 -8
View File
@@ -41,10 +41,10 @@ class NotificationSettingController extends Controller
$validGroups = Group::query()
->where('is_modo', '=', '0')
->where('is_admin', '=', '0')
->where('id', '!=', UserGroups::VALIDATING)
->where('id', '!=', UserGroups::PRUNED)
->where('id', '!=', UserGroups::BANNED)
->where('id', '!=', UserGroups::DISABLED)
->where('id', '!=', UserGroups::VALIDATING->value)
->where('id', '!=', UserGroups::PRUNED->value)
->where('id', '!=', UserGroups::BANNED->value)
->where('id', '!=', UserGroups::DISABLED->value)
->pluck('id');
$request->validate([
@@ -139,10 +139,10 @@ class NotificationSettingController extends Controller
'groups' => Group::query()
->where('is_modo', '=', '0')
->where('is_admin', '=', '0')
->where('id', '!=', UserGroups::VALIDATING)
->where('id', '!=', UserGroups::PRUNED)
->where('id', '!=', UserGroups::BANNED)
->where('id', '!=', UserGroups::DISABLED)
->where('id', '!=', UserGroups::VALIDATING->value)
->where('id', '!=', UserGroups::PRUNED->value)
->where('id', '!=', UserGroups::BANNED->value)
->where('id', '!=', UserGroups::DISABLED->value)
->latest('level')
->get(),
]);
app/Http/Controllers/User/PrivacySettingController.php
+8 -8
View File
@@ -41,10 +41,10 @@ class PrivacySettingController extends Controller
$validGroups = Group::query()
->where('is_modo', '=', '0')
->where('is_admin', '=', '0')
->where('id', '!=', UserGroups::VALIDATING)
->where('id', '!=', UserGroups::PRUNED)
->where('id', '!=', UserGroups::BANNED)
->where('id', '!=', UserGroups::DISABLED)
->where('id', '!=', UserGroups::VALIDATING->value)
->where('id', '!=', UserGroups::PRUNED->value)
->where('id', '!=', UserGroups::BANNED->value)
->where('id', '!=', UserGroups::DISABLED->value)
->pluck('id');
$request->validate([
@@ -154,10 +154,10 @@ class PrivacySettingController extends Controller
'groups' => Group::query()
->where('is_modo', '=', '0')
->where('is_admin', '=', '0')
->where('id', '!=', UserGroups::VALIDATING)
->where('id', '!=', UserGroups::PRUNED)
->where('id', '!=', UserGroups::BANNED)
->where('id', '!=', UserGroups::DISABLED)
->where('id', '!=', UserGroups::VALIDATING->value)
->where('id', '!=', UserGroups::PRUNED->value)
->where('id', '!=', UserGroups::BANNED->value)
->where('id', '!=', UserGroups::DISABLED->value)
->latest('level')
->get(),
]);
database/migrations/2022_12_30_090331_update_user_notifications_table.php
+4 -4
View File
@@ -13,10 +13,10 @@ return new class () extends Migration {
$allowedGroups = DB::table('groups')
->where('is_modo', '=', '0')
->where('is_admin', '=', '0')
->where('id', '!=', UserGroups::VALIDATING)
->where('id', '!=', UserGroups::PRUNED)
->where('id', '!=', UserGroups::BANNED)
->where('id', '!=', UserGroups::DISABLED)
->where('id', '!=', UserGroups::VALIDATING->value)
->where('id', '!=', UserGroups::PRUNED->value)
->where('id', '!=', UserGroups::BANNED->value)
->where('id', '!=', UserGroups::DISABLED->value)
->pluck('id')
->toArray();
database/migrations/2022_12_30_090351_update_user_privacy_table.php
+4 -4
View File
@@ -13,10 +13,10 @@ return new class () extends Migration {
$allowedGroups = DB::table('groups')
->where('is_modo', '=', '0')
->where('is_admin', '=', '0')
->where('id', '!=', UserGroups::VALIDATING)
->where('id', '!=', UserGroups::PRUNED)
->where('id', '!=', UserGroups::BANNED)
->where('id', '!=', UserGroups::DISABLED)
->where('id', '!=', UserGroups::VALIDATING->value)
->where('id', '!=', UserGroups::PRUNED->value)
->where('id', '!=', UserGroups::BANNED->value)
->where('id', '!=', UserGroups::DISABLED->value)
->pluck('id')
->toArray();
tests/Feature/Http/Controllers/Staff/ChatBotControllerTest.php
+1 -1
View File
@@ -44,7 +44,7 @@ test('destroy aborts with a 403', function (): void {
$this->seed(GroupsTableSeeder::class);
$user = User::factory()->create([
'group_id' => UserGroups::USER,
'group_id' => UserGroups::USER->value,
]);
$bot = Bot::factory()->create();
tests/Feature/Http/Controllers/User/ApikeyControllerTest.php
+4 -4
View File
@@ -30,11 +30,11 @@ test('edit aborts with a 403', function (): void {
$this->seed(GroupsTableSeeder::class);
$staffUser = User::factory()->create([
'group_id' => UserGroups::MODERATOR,
'group_id' => UserGroups::MODERATOR->value,
]);
$user = User::factory()->create([
'group_id' => UserGroups::USER,
'group_id' => UserGroups::USER->value,
]);
$response = $this->actingAs($user)->get(route('users.apikey.edit', [$staffUser]));
@@ -57,11 +57,11 @@ test('update aborts with a 403', function (): void {
$this->seed(GroupsTableSeeder::class);
$staffUser = User::factory()->create([
'group_id' => UserGroups::MODERATOR,
'group_id' => UserGroups::MODERATOR->value,
]);
$user = User::factory()->create([
'group_id' => UserGroups::USER,
'group_id' => UserGroups::USER->value,
]);
$response = $this->actingAs($user)->patch(route('users.apikey.update', [$staffUser]));
tests/Feature/Http/Controllers/User/EarningControllerTest.php
+2 -2
View File
@@ -42,11 +42,11 @@ test('index aborts with a 403', function (): void {
$this->seed(GroupsTableSeeder::class);
$user = User::factory()->create([
'group_id' => UserGroups::MODERATOR,
'group_id' => UserGroups::MODERATOR->value,
]);
$authUser = User::factory()->create([
'group_id' => UserGroups::USER,
'group_id' => UserGroups::USER->value,
]);
$response = $this->actingAs($authUser)->get(route('users.earnings.index', [$user]));
tests/Feature/Http/Controllers/User/EmailControllerTest.php
+4 -4
View File
@@ -29,11 +29,11 @@ test('edit aborts with a 403', function (): void {
$this->seed(GroupsTableSeeder::class);
$user = User::factory()->create([
'group_id' => UserGroups::MODERATOR,
'group_id' => UserGroups::MODERATOR->value,
]);
$authUser = User::factory()->create([
'group_id' => UserGroups::USER,
'group_id' => UserGroups::USER->value,
]);
$response = $this->actingAs($authUser)->get(route('users.email.edit', [$user]));
@@ -56,11 +56,11 @@ test('update aborts with a 403', function (): void {
$this->seed(GroupsTableSeeder::class);
$user = User::factory()->create([
'group_id' => UserGroups::MODERATOR,
'group_id' => UserGroups::MODERATOR->value,
]);
$authUser = User::factory()->create([
'group_id' => UserGroups::USER,
'group_id' => UserGroups::USER->value,
]);
$response = $this->actingAs($authUser)->patch(route('users.apikey.update', [$user]));