chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #4149 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2023-02-03 20:22:42 -07:00 committed by GitHub
parent 922da916b7 c62ac0259d
commit c68985755f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -93,6 +93,7 @@
- Update ComposeController, fix validation issue ([80e6a5a9](https://github.com/pixelfed/pixelfed/commit/80e6a5a9)) - Update ComposeController, fix validation issue ([80e6a5a9](https://github.com/pixelfed/pixelfed/commit/80e6a5a9))
- Update reply view, fix visibility filtering ([d419af4b](https://github.com/pixelfed/pixelfed/commit/d419af4b)) - Update reply view, fix visibility filtering ([d419af4b](https://github.com/pixelfed/pixelfed/commit/d419af4b))
- Update AP helpers, ingest attachments in replies ([c504e643](https://github.com/pixelfed/pixelfed/commit/c504e643)) - Update AP helpers, ingest attachments in replies ([c504e643](https://github.com/pixelfed/pixelfed/commit/c504e643))
- Update Media model, use cloud filesystem url if enabled instead of cdn_url to easily update S3 media urls ([e6bc57d7](https://github.com/pixelfed/pixelfed/commit/e6bc57d7))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

2
app/Media.php
View File

@ -38,7 +38,7 @@ class Media extends Model
public function url() public function url()
{ {
if($this->cdn_url) { if($this->cdn_url) {
return $this->cdn_url; return Storage::disk(config('filesystems.cloud'))->url($this->media_path);
} }
if($this->remote_media && $this->remote_url) { if($this->remote_media && $this->remote_url) {

1
config/filesystems.php
View File

@ -82,6 +82,7 @@ return [
], ],
'root' => env('DO_SPACES_ROOT',''), 'root' => env('DO_SPACES_ROOT',''),
'throw' => true, 'throw' => true,
'url' => env('AWS_URL'),
], ],
'backup' => [ 'backup' => [