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

Merge pull request #1890 from pixelfed/staging

Browse source 
Deprecate mixed media albums
This commit is contained in:
daniel 2019-12-14 21:30:03 -07:00 committed by GitHub
commit 144f2aad6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/InternalApiController.php
View file

@ -290,6 +290,12 @@ class InternalApiController extends Controller
array_push($mimes, $m->mime); array_push($mimes, $m->mime);
} }
$mediaType = StatusController::mimeTypeCheck($mimes);
if(in_array($mediaType, ['photo', 'video', 'photo:album']) == false) {
abort(400, __('exception.compose.invalid.album'));
}
if($place && is_array($place)) { if($place && is_array($place)) {
$status->place_id = $place['id']; $status->place_id = $place['id'];
} }
@ -317,7 +323,7 @@ class InternalApiController extends Controller
$status->is_nsfw = $cw; $status->is_nsfw = $cw;
$status->visibility = $visibility; $status->visibility = $visibility;
$status->scope = $visibility; $status->scope = $visibility;
$status->type = StatusController::mimeTypeCheck($mimes); $status->type = $mediaType;
$status->save(); $status->save();
NewStatusPipeline::dispatch($status); NewStatusPipeline::dispatch($status);

8
resources/assets/js/components/ComposeClassic.vue
View file

@ -453,12 +453,8 @@ export default {
let data = res.data; let data = res.data;
window.location.href = data; window.location.href = data;
}).catch(err => { }).catch(err => {
let res = err.response.data; let msg = err.response.data.message ? err.response.data.message : 'An unexpected error occured.'
if(res.message == 'Too Many Attempts.') { swal('Oops, something went wrong!', msg, 'error');
swal('You\'re posting too much!', 'We only allow 50 posts per hour or 100 per day. If you\'ve reached that limit, please try again later. If you think this is an error, please contact an administrator.', 'error');
return;
}
swal('Oops, something went wrong!', 'An unexpected error occurred.', 'error');
}); });
return; return;
break; break;

3
resources/assets/js/components/ComposeModal.vue
View file

@ -744,7 +744,8 @@ export default {
let data = res.data; let data = res.data;
window.location.href = data; window.location.href = data;
}).catch(err => { }).catch(err => {
swal('Oops, something went wrong!', 'An unexpected error occurred.', 'error'); let msg = err.response.data.message ? err.response.data.message : 'An unexpected error occured.'
swal('Oops, something went wrong!', msg, 'error');
}); });
return; return;
break; break;

11
resources/lang/en/exception.php Normal file
View file

@ -0,0 +1,11 @@
<?php
return [
'compose' => [
'invalid' => [
'album' => 'Must contain a single photo or video or multiple photos.',
],
],
];