YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Merge pull request #1373 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-06-09 15:15:26 -06:00 • committed by GitHub
commit 7eb7c764d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Jobs/VideoPipeline/VideoThumbnail.php
View file

@ -42,7 +42,7 @@ class VideoThumbnail implements ShouldQueue
$name = last($path); $name = last($path);
try { try {
$t = explode('.', $name); $t = explode('.', $name);
$t = $t[0].'_thumb.png'; $t = $t[0].'_thumb.jpeg';
$i = count($path) - 1; $i = count($path) - 1;
$path[$i] = $t; $path[$i] = $t;
$save = implode('/', $path); $save = implode('/', $path);

2
app/Transformer/Api/AccountTransformer.php
View file

@ -30,7 +30,7 @@ class AccountTransformer extends Fractal\TransformerAbstract
'moved' => null, 'moved' => null,
'fields' => null, 'fields' => null,
'bot' => null, 'bot' => null,
'website' => null, 'website' => $profile->website,
'software' => 'pixelfed', 'software' => 'pixelfed',
'is_admin' => (bool) $is_admin 'is_admin' => (bool) $is_admin
]; ];

42
app/Util/ActivityPub/Helpers.php
View file

@ -319,7 +319,7 @@ class Helpers {
$status->scope = $scope; $status->scope = $scope;
$status->visibility = $scope; $status->visibility = $scope;
$status->save(); $status->save();
// self::importNoteAttachment($res, $status); self::importNoteAttachment($res, $status);
return $status; return $status;
}); });
@ -330,8 +330,6 @@ class Helpers {
public static function importNoteAttachment($data, Status $status) public static function importNoteAttachment($data, Status $status)
{ {
return;
if(self::verifyAttachments($data) == false) { if(self::verifyAttachments($data) == false) {
return; return;
} }
@ -348,28 +346,28 @@ class Helpers {
if(in_array($type, $allowed) == false || $valid == false) { if(in_array($type, $allowed) == false || $valid == false) {
continue; continue;
} }
// $info = pathinfo($url); $info = pathinfo($url);
// // pleroma attachment fix // pleroma attachment fix
// $url = str_replace(' ', '%20', $url); $url = str_replace(' ', '%20', $url);
// $img = file_get_contents($url, false, stream_context_create(['ssl' => ["verify_peer"=>true,"verify_peer_name"=>true]])); $img = file_get_contents($url, false, stream_context_create(['ssl' => ["verify_peer"=>true,"verify_peer_name"=>true]]));
// $file = '/tmp/'.str_random(32); $file = '/tmp/pxmi-'.str_random(32);
// file_put_contents($file, $img); file_put_contents($file, $img);
// $fdata = new File($file); $fdata = new File($file);
// $path = Storage::putFile($storagePath, $fdata, 'public'); $path = Storage::putFile($storagePath, $fdata, 'public');
// $media = new Media(); $media = new Media();
// $media->status_id = $status->id; $media->status_id = $status->id;
// $media->profile_id = $status->profile_id; $media->profile_id = $status->profile_id;
// $media->user_id = null; $media->user_id = null;
// $media->media_path = $path; $media->media_path = $path;
// $media->size = $fdata->getSize(); $media->size = $fdata->getSize();
// $media->mime = $fdata->getMimeType(); $media->mime = $fdata->getMimeType();
// $media->save(); $media->save();
// ImageThumbnail::dispatch($media); ImageThumbnail::dispatch($media);
// ImageOptimize::dispatch($media); ImageOptimize::dispatch($media);
// unlink($file); unlink($file);
} }
return; return;
} }

6
resources/assets/js/components/PostComponent.vue
View file

@ -728,8 +728,10 @@ export default {
type: 'status', type: 'status',
item: this.status.id item: this.status.id
}).then(res => { }).then(res => {
swal('Success', 'You have successfully deleted this post', 'success'); setTimeout(function() {
window.location.href = '/'; swal('Success', 'You have successfully deleted this post', 'success');
window.location.href = '/';
}, 2000);
}).catch(err => { }).catch(err => {
swal('Error', 'Something went wrong. Please try again later.', 'error'); swal('Error', 'Something went wrong. Please try again later.', 'error');
}); });