diff --git a/app/Models/Album.php b/app/Models/Album.php index 265a6c32..2e57cc5e 100644 --- a/app/Models/Album.php +++ b/app/Models/Album.php @@ -126,8 +126,6 @@ class Album extends Model implements Searchable, Commentable, Favouritable return $query; } - protected $table = 'albums'; - public function user() { return $this->belongsTo(User::class); diff --git a/app/Models/Announcement.php b/app/Models/Announcement.php index 1ea9bebe..aae6eeaa 100644 --- a/app/Models/Announcement.php +++ b/app/Models/Announcement.php @@ -49,7 +49,6 @@ use Illuminate\Database\Eloquent\Model; */ class Announcement extends Model { - protected $table = 'announcements'; protected $casts = [ 'links' => 'array', diff --git a/app/Models/Comment.php b/app/Models/Comment.php index 90a4f6a6..0edd13e3 100644 --- a/app/Models/Comment.php +++ b/app/Models/Comment.php @@ -70,8 +70,6 @@ class Comment extends Model { use SoftDeletes; - protected $table = 'comments'; - public function user() { return $this->belongsTo(User::class); diff --git a/app/Models/Favourite.php b/app/Models/Favourite.php index 33df34d8..8029c84d 100644 --- a/app/Models/Favourite.php +++ b/app/Models/Favourite.php @@ -47,7 +47,6 @@ use Illuminate\Database\Eloquent\Model; */ class Favourite extends Model { - protected $table = 'favourites'; public $timestamps = false; /* diff --git a/app/Models/Follower.php b/app/Models/Follower.php index 70e7f364..3ff0c542 100644 --- a/app/Models/Follower.php +++ b/app/Models/Follower.php @@ -42,7 +42,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; */ class Follower extends Model { - protected $table = 'followers'; public $timestamps = false; diff --git a/app/Models/Genre.php b/app/Models/Genre.php index ca805b28..709d3310 100644 --- a/app/Models/Genre.php +++ b/app/Models/Genre.php @@ -60,8 +60,6 @@ class Genre extends Model { use HasFactory; - protected $table = 'genres'; - protected $fillable = ['name', 'slug']; protected $appends = ['track_count', 'url']; protected $hidden = ['trackCountRelation']; diff --git a/app/Models/Image.php b/app/Models/Image.php index 1a3336c3..660ae2e4 100644 --- a/app/Models/Image.php +++ b/app/Models/Image.php @@ -165,8 +165,6 @@ class Image extends Model chmod($path, 0644); } - protected $table = 'images'; - public function getUrl($type = self::NORMAL) { $type = self::$ImageTypes[$type]; diff --git a/app/Models/License.php b/app/Models/License.php index 8ac97b15..ded04d92 100644 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -41,5 +41,4 @@ use Illuminate\Database\Eloquent\Model; */ class License extends Model { - protected $table = 'licenses'; } diff --git a/app/Models/PinnedPlaylist.php b/app/Models/PinnedPlaylist.php index 00a6f316..5c28b3db 100644 --- a/app/Models/PinnedPlaylist.php +++ b/app/Models/PinnedPlaylist.php @@ -41,7 +41,6 @@ use Illuminate\Database\Eloquent\Model; */ class PinnedPlaylist extends Model { - protected $table = 'pinned_playlists'; public function user() { diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php index bb2087b3..e2ec68bc 100644 --- a/app/Models/Playlist.php +++ b/app/Models/Playlist.php @@ -94,8 +94,6 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable protected $elasticsearchType = 'playlist'; - protected $table = 'playlists'; - protected $casts = [ 'id' => 'integer', 'user_id' => 'integer', diff --git a/app/Models/ResourceLogItem.php b/app/Models/ResourceLogItem.php index de4e1541..f9922ed0 100644 --- a/app/Models/ResourceLogItem.php +++ b/app/Models/ResourceLogItem.php @@ -51,7 +51,6 @@ use Illuminate\Support\Facades\Request; */ class ResourceLogItem extends Model { - protected $table = 'resource_log_items'; public $timestamps = false; protected $dates = ['created_at']; diff --git a/app/Models/ResourceUser.php b/app/Models/ResourceUser.php index 68614c27..df943f4d 100644 --- a/app/Models/ResourceUser.php +++ b/app/Models/ResourceUser.php @@ -53,7 +53,6 @@ use Illuminate\Database\Eloquent\Model; */ class ResourceUser extends Model { - protected $table = 'resource_users'; public $timestamps = false; public static function get($userId, $resourceType, $resourceId) diff --git a/app/Models/Role.php b/app/Models/Role.php index 6f208f13..785aded6 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\Model; */ class Role extends Model { - protected $table = 'roles'; public $timestamps = false; public function users() diff --git a/app/Models/ShowSong.php b/app/Models/ShowSong.php index 2dd7c171..3aee966f 100644 --- a/app/Models/ShowSong.php +++ b/app/Models/ShowSong.php @@ -46,7 +46,6 @@ use Illuminate\Database\Eloquent\Model; */ class ShowSong extends Model { - protected $table = 'show_songs'; protected $fillable = ['title', 'slug', 'lyrics']; public function trackCountRelation() diff --git a/app/Models/Track.php b/app/Models/Track.php index 592a13e5..8ffec778 100644 --- a/app/Models/Track.php +++ b/app/Models/Track.php @@ -692,8 +692,6 @@ class Track extends Model implements Searchable, Commentable, Favouritable ]; } - protected $table = 'tracks'; - public function genre() { return $this->belongsTo(Genre::class); diff --git a/app/Models/TrackType.php b/app/Models/TrackType.php index 0240f260..2102c224 100644 --- a/app/Models/TrackType.php +++ b/app/Models/TrackType.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\Model; */ class TrackType extends Model { - protected $table = 'track_types'; const ORIGINAL_TRACK = 1; const OFFICIAL_TRACK_REMIX = 2; diff --git a/app/Models/User.php b/app/Models/User.php index 931d6a57..64b526d1 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -109,8 +109,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearchTrait; protected $elasticsearchType = 'user'; - - protected $table = 'users'; protected $casts = [ 'id' => 'integer', 'sync_names' => 'boolean',