UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5186 from pixelfed/staging

Browse source 
Update Media model, fix broken thumbnail/gray thumbnail bug
This commit is contained in:
daniel 2024-06-21 03:47:22 -06:00 committed by GitHub
commit 7ed6d48834
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -31,7 +31,7 @@
- Update DirectMessageController, add timestamps to threads ([b24d2554](https://github.com/pixelfed/pixelfed/commit/b24d2554)) - Update DirectMessageController, add timestamps to threads ([b24d2554](https://github.com/pixelfed/pixelfed/commit/b24d2554))
- Update DirectMessageController, add carousel entity to threads ([96f24f33](https://github.com/pixelfed/pixelfed/commit/96f24f33)) - Update DirectMessageController, add carousel entity to threads ([96f24f33](https://github.com/pixelfed/pixelfed/commit/96f24f33))
- Update and refactor total local post count logic, cache value and schedule updates twice daily to eliminate the perf issue on larger instances ([4f2b8ed2](https://github.com/pixelfed/pixelfed/commit/4f2b8ed2)) - Update and refactor total local post count logic, cache value and schedule updates twice daily to eliminate the perf issue on larger instances ([4f2b8ed2](https://github.com/pixelfed/pixelfed/commit/4f2b8ed2))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - Update Media model, fix broken thumbnail/gray thumbnail bug ([e33643c2](https://github.com/pixelfed/pixelfed/commit/e33643c2))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.12.1 (2024-05-07)](https://github.com/pixelfed/pixelfed/compare/v0.12.0...v0.12.1) ## [v0.12.1 (2024-05-07)](https://github.com/pixelfed/pixelfed/compare/v0.12.0...v0.12.1)

32
app/Media.php
View file

@ -2,11 +2,11 @@
namespace App; namespace App;
use App\Util\Media\License;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use App\Util\Media\License;
use Storage;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Storage;
class Media extends Model class Media extends Model
{ {
@ -21,7 +21,7 @@ class Media extends Model
protected $casts = [ protected $casts = [
'srcset' => 'array', 'srcset' => 'array',
'deleted_at' => 'datetime' 'deleted_at' => 'datetime',
]; ];
public function status() public function status()
@ -36,12 +36,12 @@ class Media extends Model
public function url() public function url()
{ {
if($this->cdn_url) { if ($this->cdn_url) {
// return Storage::disk(config('filesystems.cloud'))->url($this->media_path); // return Storage::disk(config('filesystems.cloud'))->url($this->media_path);
return $this->cdn_url; return $this->cdn_url;
} }
if($this->remote_media && $this->remote_url) { if ($this->remote_media && $this->remote_url) {
return $this->remote_url; return $this->remote_url;
} }
@ -50,19 +50,19 @@ class Media extends Model
public function thumbnailUrl() public function thumbnailUrl()
{ {
if($this->thumbnail_url) { if ($this->thumbnail_url) {
return $this->thumbnail_url; return $this->thumbnail_url;
} }
if(!$this->remote_media && $this->thumbnail_path) { if (! $this->remote_media && $this->thumbnail_path) {
return url(Storage::url($this->thumbnail_path)); return url(Storage::url($this->thumbnail_path));
} }
if($this->remote_media && !$this->thumbnail_path && $this->cdn_url) { if (! $this->thumbnail_path && $this->cdn_url) {
return $this->cdn_url; return $this->cdn_url;
} }
if($this->media_path && $this->mime && in_array($this->mime, ['image/jpeg', 'image/png'])) { if ($this->media_path && $this->mime && in_array($this->mime, ['image/jpeg', 'image/png'])) {
return $this->remote_media || Str::startsWith($this->media_path, 'http') ? return $this->remote_media || Str::startsWith($this->media_path, 'http') ?
$this->media_path : $this->media_path :
url(Storage::url($this->media_path)); url(Storage::url($this->media_path));
@ -78,9 +78,10 @@ class Media extends Model
public function mimeType() public function mimeType()
{ {
if(!$this->mime) { if (! $this->mime) {
return; return;
} }
return explode('/', $this->mime)[0]; return explode('/', $this->mime)[0];
} }
@ -104,6 +105,7 @@ class Media extends Model
$verb = 'Document'; $verb = 'Document';
break; break;
} }
return $verb; return $verb;
} }
@ -114,11 +116,11 @@ class Media extends Model
public function getModel() public function getModel()
{ {
if(empty($this->metadata)) { if (empty($this->metadata)) {
return false; return false;
} }
$meta = $this->getMetadata(); $meta = $this->getMetadata();
if($meta && isset($meta['Model'])) { if ($meta && isset($meta['Model'])) {
return $meta['Model']; return $meta['Model'];
} }
} }
@ -127,11 +129,11 @@ class Media extends Model
{ {
$license = $this->license; $license = $this->license;
if(!$license || strlen($license) > 2 || $license == 1) { if (! $license || strlen($license) > 2 || $license == 1) {
return null; return null;
} }
if(!in_array($license, License::keys())) { if (! in_array($license, License::keys())) {
return null; return null;
} }
@ -140,7 +142,7 @@ class Media extends Model
return [ return [
'id' => $res['id'], 'id' => $res['id'],
'title' => $res['title'], 'title' => $res['title'],
'url' => $res['url'] 'url' => $res['url'],
]; ];
} }
} }