Fix published scope

Author: Tofandel

src/Models/Model.php

@@ -33,12 +33,15 @@ protected function isTranslationModel(): bool
         return Str::endsWith(get_class($this), 'Translation');
     }
 
-    public function scopePublished($query): Builder
+    public function scopePublished(Builder $query): Builder
     {
-        return $query->where("{$this->getTable()}.published", true);
+        if ($this->isFillable('published')) {
+            return $query->where($query->qualifyColumn('published'), true);
+        }
+        return $query;
     }
 
-    public function scopeAccessible($query): Builder
+    public function scopeAccessible(Builder $query): Builder
     {
         if (! TwillPermissions::enabled()) {
             return $query;
@@ -75,11 +78,11 @@ public function scopeAccessible($query): Builder
         return $query;
     }
 
-    public function scopePublishedInListings($query): Builder
+    public function scopePublishedInListings(Builder $query): Builder
     {
         // @todo: Remove? Seems unused.
         if ($this->isFillable('public')) {
-            $query->where("{$this->getTable()}.public", true);
+            $query->where($query->qualifyColumn('public'), true);
         }
 
         return $query->published()->visible();
@@ -88,21 +91,21 @@ public function scopePublishedInListings($query): Builder
     /**
      * @todo: Document
      */
-    public function scopeVisible($query): Builder
+    public function scopeVisible(Builder $query): Builder
     {
         if ($this->isFillable('publish_start_date')) {
             $query->where(function ($query) {
-                $query->whereNull("{$this->getTable()}.publish_start_date")->orWhere(
-                    "{$this->getTable()}.publish_start_date",
+                $query->whereNull($query->qualifyColumn('publish_start_date'))->orWhere(
+                    $query->qualifyColumn('publish_start_date'),
                     '<=',
                     Carbon::now()
                 );
             });
 
             if ($this->isFillable('publish_end_date')) {
                 $query->where(function ($query) {
-                    $query->whereNull("{$this->getTable()}.publish_end_date")->orWhere(
-                        "{$this->getTable()}.publish_end_date",
+                    $query->whereNull($query->qualifyColumn('publish_end_date'))->orWhere(
+                        $query->qualifyColumn('publish_end_date'),
                         '>=',
                         Carbon::now()
                     );
@@ -118,12 +121,15 @@ public function setPublishStartDateAttribute($value): void
         $this->attributes['publish_start_date'] = $value ?? Carbon::now();
     }
 
-    public function scopeDraft($query): Builder
+    public function scopeDraft(Builder $query): Builder
     {
-        return $query->where("{$this->getTable()}.published", false);
+        if ($this->isFillable('published')) {
+            return $query->where($query->qualifyColumn('published'), false);
+        }
+        return $query;
     }
 
-    public function scopeOnlyTrashed($query): Builder
+    public function scopeOnlyTrashed(Builder $query): Builder
     {
         return $query->onlyTrashed();
     }