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

Update Media, Profile models, fix S3 urls

This commit is contained in:
Daniel Supernault 2019-08-01 22:35:39 -06:00
parent 8e033b3228
commit 396848b20b
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Media.php
View File

@ -34,10 +34,10 @@ class Media extends Model
$url = $this->remote_url;
} else {
$path = $this->media_path;
$url = $this->cdn_url ?? Storage::url($path);
$url = $this->cdn_url ?? config('app.url') . Storage::url($path);
}
return url($url);
return $url;
}
public function thumbnailUrl()

2
app/Profile.php
View File

@ -140,7 +140,7 @@ class Profile extends Model
$version = hash('sha256', $avatar->change_count);
$path = "{$path}?v={$version}";
return url(Storage::url($path));
return config('app.url') . Storage::url($path);
});
return $url;