Fix conflict

Author: andreia

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to `Filament Forum` will be documented in this file.
 
+## v2.0.4 - 2025-12-11
+
+### What's Changed
+
+* Add columnSpanFull() by @andreia in https://github.com/TappNetwork/Filament-Forum/pull/10
+
+**Full Changelog**: https://github.com/TappNetwork/Filament-Forum/compare/v2.0.3...v2.0.4
+
+## v2.0.3 - 2025-11-13
+
+**Full Changelog**: https://github.com/TappNetwork/Filament-Forum/compare/v2.0.2...v2.0.3
+
+## v2.0.1 - 2025-11-13
+
+**Full Changelog**: https://github.com/TappNetwork/Filament-Forum/compare/v2.0.0...v2.0.1
+
+bugfix
+
+## v2.0.0 - 2025-11-13
+
+### What's Changed
+
+* Add forum access control and consolidate user traits by @scottgrayson in https://github.com/TappNetwork/Filament-Forum/pull/8
+
+### New Contributors
+
+* @scottgrayson made their first contribution in https://github.com/TappNetwork/Filament-Forum/pull/8
+
+**Full Changelog**: https://github.com/TappNetwork/Filament-Forum/compare/v1.1.0...v2.0.0
+
+### Breaking Changes
+
+- The three separate traits (HasFavoriteForumPost, HasMentionables, HasForumUserSearch) have been consolidated into a single `ForumUser` trait. Users should update their User model to use `ForumUser` instead of the three separate traits.
+
 ## v1.1.0 - 2025-10-08
 
 ### What's Changed

README.md

@@ -80,29 +80,25 @@ A forum package for Filament apps that provides both admin and frontend resource
 
 - Ensure your User model has a `name` attribute
 
-- Add `HasFavoriteForumPost` trait to your `User` model:
+- Add the `ForumUser` trait to your `User` model:
 
 ```php
-use Tapp\FilamentForum\Models\Traits\HasFavoriteForumPost;
+use Tapp\FilamentForum\Traits\ForumUser;
 
 class User extends Authenticatable
 {
     // ...
-    use HasFavoriteForumPost;
+    use ForumUser;
     // ...
 }
 ```
 
-- Add `HasMentionables` trait (you can use it to customize which users are mentionable, see below in "Custom Mentionables") to your `User` model
-
-```php
-use Tapp\FilamentForum\Models\Traits\HasMentionables;
-
-class User extends Authenticatable
-{
-    use HasMentionables;
-}
-```
+The `ForumUser` trait provides:
+- `forums()` relationship - Get all forums the user is assigned to
+- `favoriteForumPosts()` relationship - Get all favorite forum posts
+- `getMentionableUsers()` method - Customize which users are mentionable (see "Custom Mentionables" below)
+- `hasCustomForumSearch()`, `getForumSearchResults()`, `getForumOptionLabel()` methods - Custom search functionality (see "Custom User Model, Attribute, and Search Functionality" below)
+- `isForumAdmin()` method - Override to grant admin access to hidden forums (defaults to `false`)
 
 6. Add to your custom theme (usually`theme.css`) file:
 
@@ -301,33 +297,11 @@ For more detailed information about implementing multi-tenancy in Filament, see
 
 ## Custom User Model, Attribute, and Search Functionality
 
-By default, the `name` column of `User` model is used for the `user` relationship. You can customize it using the  `title-attribute` on `filament-form.php` config file.
+By default, the `name` column of `User` model is used for the `user` relationship. You can customize it using the  `title-attribute` on `filament-forum.php` config file.
 
 The Filament Forum plugin also supports custom search functionality for user selects in forms and filters. This allows you to customize which users' columns are used to search and display in dropdowns (eg. if your `User` model doesn't have a `name` column).
 
-## Setup
-
-### 1. Add the Trait to Your User Model
-
-Add the `HasForumUserSearch` trait to your User model:
-
-```php
-<?php
-
-namespace App\Models;
-
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Tapp\FilamentForum\Traits\HasForumUserSearch;
-
-class User extends Authenticatable
-{
-    use HasForumUserSearch;
-    
-    // Your existing model code...
-}
-```
-
-### 2. Configure Your User Model Class
+### Configure Your User Model Class
 
 Make sure your `config/filament-forum.php` file points to the correct `User` model:
 
@@ -338,7 +312,7 @@ Make sure your `config/filament-forum.php` file points to the correct `User` mod
 ],
 ```
 
-### 3. Customize the Search Methods
+### Customize the Search Methods
 
 Override the trait methods in your User model to customize search behavior:
 
@@ -348,11 +322,11 @@ Override the trait methods in your User model to customize search behavior:
 namespace App\Models;
 
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Tapp\FilamentForum\Traits\HasForumUserSearch;
+use Tapp\FilamentForum\Traits\ForumUser;
 
 class User extends Authenticatable
 {
-    use HasForumUserSearch;
+    use ForumUser;
 
     /**
      * Custom search that searches both name and email
@@ -392,6 +366,31 @@ public static function getMentionableUsers()
 }
 ```
 
+## Forum Access Control
+
+Forums can be set as public (visible to all logged-in users) or hidden (only visible to assigned users). Forum admins can see all hidden forums regardless of assignment.
+
+### Setting Forum Access
+
+In the admin panel, you can set a forum as hidden by checking the "Hidden Forum" checkbox. Hidden forums will only be visible to:
+- Users who are explicitly assigned to the forum
+- Forum admins (users where `isForumAdmin()` returns `true`)
+
+### Forum Admin Access
+
+Override the `isForumAdmin()` method in your User model to grant admin access:
+
+```php
+// In your User model
+public function isForumAdmin(): bool
+{
+    // Example: Grant admin access based on roles
+    return $this->hasRole('Admin') || $this->hasRole('Forum Admin');
+}
+```
+
+Forum admins can see and access all hidden forums, even if they're not assigned to them.
+
 ## User Avatar
 
 Optionally, implements Filament's `HasAvatar` interface:

composer.json

@@ -2,6 +2,7 @@
     "name": "tapp/filament-forum",
     "description": "Forum and comments package for Filament apps.",
     "type": "library",
+    "license": "MIT",
     "autoload": {
         "psr-4": {
             "Tapp\\FilamentForum\\": "src/",

database/migrations/add_is_hidden_to_forums_table.php.stub

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('forums', function (Blueprint $table) {
+            $table->boolean('is_hidden')->default(false)->after('description');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('forums', function (Blueprint $table) {
+            $table->dropColumn('is_hidden');
+        });
+    }
+};
+

database/migrations/create_forum_user_table.php.stub

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('forum_user', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->constrained()->onDelete('cascade');
+            $table->foreignId('forum_id')->constrained('forums')->onDelete('cascade');
+            $table->timestamps();
+            $table->unique(['user_id', 'forum_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('forum_user');
+    }
+};
+

src/Filament/Resources/Admin/ForumResource.php

@@ -12,6 +12,7 @@
 use Tapp\FilamentForum\Filament\Resources\Admin\ForumResource\Schemas\ForumForm;
 use Tapp\FilamentForum\Filament\Resources\Admin\ForumResource\Tables\ForumsTable;
 use Tapp\FilamentForum\Models\Forum;
+use Tapp\FilamentForum\RelationManagers\ForumUsersRelationManager;
 
 class ForumResource extends Resource
 {
@@ -61,7 +62,7 @@ public static function table(Table $table): Table
     public static function getRelations(): array
     {
         return [
-            //
+            ForumUsersRelationManager::make(),
         ];
     }
 

src/Filament/Resources/Admin/ForumResource/Schemas/ForumForm.php

@@ -2,13 +2,15 @@
 
 namespace Tapp\FilamentForum\Filament\Resources\Admin\ForumResource\Schemas;
 
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\SpatieMediaLibraryFileUpload;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Components\Section;
 use Filament\Schemas\Schema;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class ForumForm
 {
@@ -26,6 +28,7 @@ public static function configure(Schema $schema): Schema
                 return $record->{$titleAttribute};
             })
             ->searchable()
+            ->default(fn () => Auth::id())
             ->label(__('filament-forum::filament-forum.forum.form.label.owner'));
 
         // Add custom search functionality if User model has the trait and implements custom methods
@@ -55,6 +58,10 @@ public static function configure(Schema $schema): Schema
                             ->label(__('filament-forum::filament-forum.forum.form.label.image'))
                             ->collection('images')
                             ->columnSpanFull(),
+                        Checkbox::make('is_hidden')
+                            ->label('Hidden Forum')
+                            ->helperText('If checked, only assigned users can view this forum. If unchecked, all logged in users can view it.')
+                            ->live(),
                     ]),
             ]);
     }

src/Filament/Resources/Admin/ForumResource/Tables/ForumsTable.php

@@ -66,6 +66,12 @@ public static function configure(Table $table): Table
                         // Only render the tooltip if the column content exceeds the length limit.
                         return $state;
                     }),
+                TextColumn::make('is_hidden')
+                    ->label('Access')
+                    ->badge()
+                    ->formatStateUsing(fn (bool $state): string => $state ? 'Hidden' : 'Public')
+                    ->color(fn (bool $state): string => $state ? 'warning' : 'success')
+                    ->icon(fn (bool $state): string => $state ? 'heroicon-o-lock-closed' : 'heroicon-o-globe-alt'),
                 TextColumn::make('created_at')
                     ->label(__('filament-forum::filament-forum.forum.table.label.created-at'))
                     ->dateTime()

src/Filament/Resources/Forums/Pages/ListForums.php

@@ -4,7 +4,9 @@
 
 use Filament\Resources\Pages\ListRecords;
 use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Support\Facades\Auth;
 use Tapp\FilamentForum\Filament\Resources\Forums\ForumResource;
+use Tapp\FilamentForum\Models\Forum;
 
 class ListForums extends ListRecords
 {
@@ -14,4 +16,17 @@ public function getTitle(): string|Htmlable
     {
         return __('filament-forum::filament-forum.forum.title');
     }
+
+    protected function getTableQuery(): \Illuminate\Database\Eloquent\Builder
+    {
+        $user = Auth::user();
+
+        if ($user) {
+            // Use the accessibleTo scope for better performance
+            return Forum::accessibleTo($user);
+        }
+
+        // For non-authenticated users, only show public forums
+        return Forum::where('is_hidden', false);
+    }
 }

src/FilamentForumServiceProvider.php

@@ -26,6 +26,8 @@ public function configurePackage(Package $package): void
             ->hasAssets()
             ->hasMigrations([
                 'create_forums_table',
+                'add_is_hidden_to_forums_table',
+                'create_forum_user_table',
                 'create_forum_posts_table',
                 'create_favorite_forum_post_table',
                 'create_forum_post_views_table',