From a60f167d496245269afb0636802ca9fb293d3959 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 18 Jul 2019 22:08:39 -0600 Subject: [PATCH] Update AP Helpers --- app/Util/ActivityPub/Helpers.php | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 49a881740..e9ea90e91 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -361,29 +361,16 @@ class Helpers { if(in_array($type, $allowed) == false || $valid == false) { continue; } - $info = pathinfo($url); - // pleroma attachment fix - $url = str_replace(' ', '%20', $url); - - $img = file_get_contents($url, false, stream_context_create(['ssl' => ["verify_peer"=>true,"verify_peer_name"=>true]])); - $file = '/tmp/pxmi-'.str_random(32); - file_put_contents($file, $img); - $fdata = new File($file); - $path = Storage::putFile($storagePath, $fdata, 'public'); $media = new Media(); $media->remote_media = true; $media->status_id = $status->id; $media->profile_id = $status->profile_id; $media->user_id = null; - $media->media_path = $path; - $media->size = $fdata->getSize(); - $media->mime = $fdata->getMimeType(); + $media->media_path = $url; + $media->remote_url = $url; + $media->mime = $type; $media->save(); - - ImageThumbnail::dispatch($media); - ImageOptimize::dispatch($media); - unlink($file); } $status->viewType();