Browse Source

Update AP Helpers

Daniel Supernault 5 years ago
parent
commit
692d3c8d1b
1 changed files with 2 additions and 3 deletions
  1. 2 3
      app/Util/ActivityPub/Helpers.php

+ 2 - 3
app/Util/ActivityPub/Helpers.php

@@ -24,6 +24,7 @@ use App\Jobs\StatusPipeline\NewStatusPipeline;
 use App\Util\ActivityPub\HttpSignature;
 use App\Util\ActivityPub\HttpSignature;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use App\Services\ActivityPubDeliveryService;
 use App\Services\ActivityPubDeliveryService;
+use App\Services\MediaPathService;
 
 
 class Helpers {
 class Helpers {
 
 
@@ -355,9 +356,7 @@ class Helpers {
 		}
 		}
 		$attachments = isset($data['object']) ? $data['object']['attachment'] : $data['attachment'];
 		$attachments = isset($data['object']) ? $data['object']['attachment'] : $data['attachment'];
 		$user = $status->profile;
 		$user = $status->profile;
-		$monthHash = hash('sha1', date('Y').date('m'));
-		$userHash = hash('sha1', $user->id.(string) $user->created_at);
-		$storagePath = "public/m/{$monthHash}/{$userHash}";
+		$storagePath = MediaPathService::get($user, 2);
 		$allowed = explode(',', config('pixelfed.media_types'));
 		$allowed = explode(',', config('pixelfed.media_types'));
 
 
 		foreach($attachments as $media) {
 		foreach($attachments as $media) {