Merge pull request #16 from onlime/improve-banned-scope

Improve banned() scope to be used for both banned and unbanned queries

Author: mchev

README.md

@@ -146,7 +146,10 @@ $bannedTeams = Team::banned()->get();
 $notBannedTeams = Team::notBanned()->get();
 ```
 
+> Alternatively to `notBanned()` you may also use the `banned()` scope to filter not-banned models: `Team::banned(false)`. Like this, you could simply use the `banned` scope for e.g. [spatie/laravel-query-builder](https://spatie.be/docs/laravel-query-builder/v5/features/filtering#content-scope-filters) [Scope Filters](https://spatie.be/docs/laravel-query-builder/v5/features/filtering#content-scope-filters), instead of using more complex ways to apply either `banned` or `notBanned` scopes.
+
 Unban
+
 ```php
 $user->unban();
 ```

src/Traits/Bannable.php

@@ -63,11 +63,11 @@ public function unban(): void
     /**
      * Scope a query to include only models that are currently banned.
      */
-    public function scopeBanned(Builder $query): void
+    public function scopeBanned(Builder $query, bool $banned = true): void
     {
-        $query->whereHas('bans', function ($query) {
-            $query->notExpired();
-        });
+        $banned
+            ? $query->whereHas('bans', fn ($query) => $query->notExpired())
+            : $this->scopeNotBanned($query);
     }
 
     /**