From 7ea25d33d9d85d6cdbe09feb69f61b276aa44182 Mon Sep 17 00:00:00 2001
From: Sami Mazouz <sychocouldy@gmail.com>
Date: Thu, 28 Mar 2024 18:54:38 +0100
Subject: [PATCH] chore: review

---
 extensions/approval/extend.php                |  5 ++++-
 .../src/Api/DiscussionResourceFields.php      | 22 -------------------
 .../flags/src/Api/ForumResourceFields.php     |  6 -----
 .../src/Api/UserResourceFields.php            |  2 +-
 .../src/common/states/PaginatedListState.ts   |  2 +-
 framework/core/locale/validation.yml          |  2 +-
 6 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 extensions/approval/src/Api/DiscussionResourceFields.php

diff --git a/extensions/approval/extend.php b/extensions/approval/extend.php
index 3323d1e12..cd144fa1b 100644
--- a/extensions/approval/extend.php
+++ b/extensions/approval/extend.php
@@ -8,6 +8,7 @@
  */
 
 use Flarum\Api\Resource;
+use Flarum\Api\Schema;
 use Flarum\Approval\Access;
 use Flarum\Approval\Api\DiscussionResourceFields;
 use Flarum\Approval\Api\PostResourceFields;
@@ -38,7 +39,9 @@ return [
         ->cast('is_approved', 'bool'),
 
     (new Extend\ApiResource(Resource\DiscussionResource::class))
-        ->fields(DiscussionResourceFields::class),
+        ->fields(fn () => [
+            Schema\Boolean::make('isApproved'),
+        ]),
 
     (new Extend\ApiResource(Resource\PostResource::class))
         ->fields(PostResourceFields::class),
diff --git a/extensions/approval/src/Api/DiscussionResourceFields.php b/extensions/approval/src/Api/DiscussionResourceFields.php
deleted file mode 100644
index 76947aefe..000000000
--- a/extensions/approval/src/Api/DiscussionResourceFields.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Approval\Api;
-
-use Flarum\Api\Schema;
-
-class DiscussionResourceFields
-{
-    public function __invoke(): array
-    {
-        return [
-            Schema\Boolean::make('isApproved'),
-        ];
-    }
-}
diff --git a/extensions/flags/src/Api/ForumResourceFields.php b/extensions/flags/src/Api/ForumResourceFields.php
index d88dc7b70..9438535e3 100644
--- a/extensions/flags/src/Api/ForumResourceFields.php
+++ b/extensions/flags/src/Api/ForumResourceFields.php
@@ -12,15 +12,9 @@ namespace Flarum\Flags\Api;
 use Flarum\Api\Context;
 use Flarum\Api\Schema;
 use Flarum\Flags\Flag;
-use Flarum\Settings\SettingsRepositoryInterface;
 
 class ForumResourceFields
 {
-    public function __construct(
-        protected SettingsRepositoryInterface $settings
-    ) {
-    }
-
     public function __invoke(): array
     {
         return [
diff --git a/extensions/subscriptions/src/Api/UserResourceFields.php b/extensions/subscriptions/src/Api/UserResourceFields.php
index aa0fa6c91..c1773cf7f 100644
--- a/extensions/subscriptions/src/Api/UserResourceFields.php
+++ b/extensions/subscriptions/src/Api/UserResourceFields.php
@@ -19,7 +19,7 @@ class UserResourceFields
     {
         return [
             Schema\Str::make('subscription')
-                ->writable(fn (Discussion $discussion, Context $context) => $context->updating() && ! $context->getActor()->isGuest())
+                ->writable(fn (Discussion $discussion, Context $context) => $context->updating())
                 ->nullable()
                 ->get(fn (Discussion $discussion) => $discussion->state?->subscription)
                 ->set(function (Discussion $discussion, ?string $subscription, Context $context) {
diff --git a/framework/core/js/src/common/states/PaginatedListState.ts b/framework/core/js/src/common/states/PaginatedListState.ts
index 804c554e3..4b8efe984 100644
--- a/framework/core/js/src/common/states/PaginatedListState.ts
+++ b/framework/core/js/src/common/states/PaginatedListState.ts
@@ -121,7 +121,7 @@ export default abstract class PaginatedListState<T extends Model, P extends Pagi
       include,
     };
 
-    if (!params.include) {
+    if (typeof params.include === 'undefined') {
       delete params.include;
     }
 
diff --git a/framework/core/locale/validation.yml b/framework/core/locale/validation.yml
index 5ac2f2c9f..f07455473 100644
--- a/framework/core/locale/validation.yml
+++ b/framework/core/locale/validation.yml
@@ -12,7 +12,7 @@ validation:
   before: "The :attribute field must be a date before :date."
   before_or_equal: "The :attribute field must be a date before or equal to :date."
   between:
-    array: "The :attribute field must have between :min and :max items."
+    array: "The :attribute field must contain between :min and :max items."
     file: "The :attribute field must be between :min and :max kilobytes."
     numeric: "The :attribute field must be between :min and :max."
     string: "The :attribute field must be between :min and :max characters."