UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update RemoteFollowImportRecent, use MediaPathService

Browse source
This commit is contained in:
Daniel Supernault 2024-03-16 03:58:24 -06:00
parent 3628b4625c
commit 5162c0704a
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php
View file

@ -17,6 +17,7 @@ use Log;
use Storage; use Storage;
use Zttp\Zttp; use Zttp\Zttp;
use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\Helpers;
use App\Services\MediaPathService;
class RemoteFollowImportRecent implements ShouldQueue class RemoteFollowImportRecent implements ShouldQueue
{ {
@ -45,7 +46,6 @@ class RemoteFollowImportRecent implements ShouldQueue
'image/jpg', 'image/jpg',
'image/jpeg', 'image/jpeg',
'image/png', 'image/png',
'image/gif',
]; ];
} }
@ -208,9 +208,7 @@ class RemoteFollowImportRecent implements ShouldQueue
public function importMedia($url, $mime, $status) public function importMedia($url, $mime, $status)
{ {
$user = $this->profile; $user = $this->profile;
$monthHash = hash('sha1', date('Y').date('m')); $storagePath = MediaPathService::get($user, 2);
$userHash = hash('sha1', $user->id.(string) $user->created_at);
$storagePath = "public/m/{$monthHash}/{$userHash}";
try { try {
$info = pathinfo($url); $info = pathinfo($url);