Tweaks to the comment functionality and docs

Author: chrisjk123

README.md

@@ -80,7 +80,7 @@ You can install the package via composer:
 composer require chrisjk123/laravel-blogger
 ```
 
-You can publish the migrations with:
+Publish the migrations with:
 
 ```bash
 php artisan vendor:publish --provider="Chriscreates\Blog\BloggerServiceProvider" --tag="migrations"
@@ -94,21 +94,34 @@ php artisan vendor:publish --provider="Chriscreates\Blog\BloggerServiceProvider"
 ```
 
 This is the contents of the published config file, if your `User` class is
-within a different directory, you can change it here as well as the User primary key:
+within a different directory or has a different primary key it can be changed here.
+
+Furthermore, the settings for allowing commenting on posts is set here, the default
+is set to true as well as guest commenting.
 
 ```php
 return [
     /*
-     * The default path to the User model in Laravel
+     * User: the default path to the User model in Laravel and primary key
+     */
+    'user' => [
+        'user_class' => \App\User::class,
+        'user_key_name' => 'id',
+    ],
+
+    /*
+     * Post: allow commenting on posts / allow guest commenting on posts
      */
-    'user_class' => \App\User::class,
-    'user_key_name' => 'id',
+    'posts' => [
+        'allow_comments' => true,
+        'allow_guest_comments' => true,
+    ],
 ];
 ```
 
 ## Local testing
 
-You can publish the factories with:
+For testing purposes, you can publish the factories with:
 
 ```bash
 php artisan vendor:publish --provider="Chriscreates\Blog\BloggerServiceProvider" --tag="factories"
@@ -136,7 +149,7 @@ class User extends Authenticatable
 // Retrieve the posts created by the user(s)
 $user->posts;
 
-// Retrieve the comments created by the user(s)
+// Retrieve the comments created by the guest/user(s)
 $user->comments;
 ```
 

config/blogs.php

@@ -2,13 +2,15 @@
 
 return [
     /*
-     * The default path to the User model in Laravel
+     * User: the default path to the User model in Laravel and primary key
      */
-    'user_class' => \App\User::class,
-    'user_key_name' => 'id',
+    'user' => [
+        'user_class' => \App\User::class,
+        'user_key_name' => 'id',
+    ],
 
     /*
-     * The default path to the User model in Laravel
+     * Post: allow commenting on posts / allow guest commenting on posts
      */
     'posts' => [
         'allow_comments' => true,

database/factories/CategoryFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-use Chriscreatess\Blog\Category;
+use Chriscreates\Blog\Category;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;
 

database/factories/CommentFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-use Chriscreatess\Blog\Comment;
+use Chriscreates\Blog\Comment;
 use Faker\Generator as Faker;
 
 $factory->define(Comment::class, function (Faker $faker) {

database/factories/PostFactory.php

@@ -1,7 +1,7 @@
 <?php
 
-use Chriscreatess\Blog\Category;
-use Chriscreatess\Blog\Post;
+use Chriscreates\Blog\Category;
+use Chriscreates\Blog\Post;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;
 
@@ -10,7 +10,7 @@
 
     return [
         'category_id' => factory(Category::class)->create()->id,
-        'name' => $title,
+        'title' => $title,
         'slug' => Str::slug($title),
         'excerpt' => $faker->name,
         'content' => $faker->paragraph,

database/factories/TagFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-use Chriscreatess\Blog\Tag;
+use Chriscreates\Blog\Tag;
 use Faker\Generator as Faker;
 
 $factory->define(Tag::class, function (Faker $faker) {

database/migrations/2019_12_28_101010_create_posts_table.php

@@ -20,7 +20,7 @@ public function up()
             $table->integer('user_id')->nullable();
             $table->index('user_id');
             $table->string('title');
-            $table->string('sub_title');
+            $table->string('sub_title')->nullable();
             $table->string('slug')->nullable();
             $table->string('excerpt')->nullable();
             $table->text('content')->nullable();

database/seeds/PostsTableSeeder.php

@@ -1,8 +1,8 @@
 <?php
 
-use Chriscreatess\Blog\Comment;
-use Chriscreatess\Blog\Post;
-use Chriscreatess\Blog\Tag;
+use Chriscreates\Blog\Comment;
+use Chriscreates\Blog\Post;
+use Chriscreates\Blog\Tag;
 use Illuminate\Database\Seeder;
 
 class PostsTableSeeder extends Seeder

src/Post.php

@@ -40,6 +40,15 @@ public function category()
 
     public function comments()
     {
+        if ( ! $this->allow_comments) {
+            return null;
+        }
+
+        if ( ! $this->allow_guest_comments) {
+            return $this->morphMany(Comment::class, 'commentable')
+            ->whereNull('user_id');
+        }
+
         return $this->morphMany(Comment::class, 'commentable');
     }
 
@@ -53,18 +62,19 @@ public function disapprovedComments()
         return $this->comments()->where('is_approved', false);
     }
 
-    public function tags()
+    public function guestComments()
     {
-        return $this->morphToMany(Tag::class, 'taggable');
+        return $this->comments()->whereNull('user_id');
     }
 
-    public static function boot()
+    public function userComments()
     {
-        parent::boot();
+        return $this->comments()->whereNotNull('user_id');
+    }
 
-        static::deleted(function (Model $post) {
-            $post->tags()->detach();
-        });
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
     }
 
     public function path()

src/Traits/IsAuthorable.php

@@ -9,18 +9,18 @@ trait IsAuthorable
     public function author()
     {
         return $this->belongsTo(
-            config('blogs.user_class'),
+            config('blogs.user.user_class'),
             'user_id',
-            config('blogs.user_key_name')
+            config('blogs.user.user_key_name')
         );
     }
 
     public function user()
     {
         return $this->belongsTo(
-            config('blogs.user_class'),
+            config('blogs.user.user_class'),
             'user_id',
-            config('blogs.user_key_name')
+            config('blogs.user.user_key_name')
         );
     }