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

Update avatar logic, allow custom file size limits. Fixes #654

Browse source
This commit is contained in:
Daniel Supernault 2018-12-18 00:09:36 -07:00
parent f39fec44f5
commit b85d351bc5
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/BaseApiController.php
View file

@ -123,7 +123,7 @@ class BaseApiController extends Controller
public function avatarUpdate(Request $request) public function avatarUpdate(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'upload' => 'required|mimes:jpeg,png,gif|max:2000', 'upload' => 'required|mimes:jpeg,png,gif|max:'.config('pixelfed.max_avatar_size'),
]); ]);
try { try {

2
app/Http/Controllers/AvatarController.php
View file

@ -19,7 +19,7 @@ class AvatarController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'avatar' => 'required|mimes:jpeg,png|max:2000', 'avatar' => 'required|mimes:jpeg,png|max:'.config('pixelfed.max_avatar_size'),
]); ]);
try { try {

10
config/pixelfed.php
View file

@ -107,6 +107,16 @@ return [
*/ */
'max_photo_size' => env('MAX_PHOTO_SIZE', 15000), 'max_photo_size' => env('MAX_PHOTO_SIZE', 15000),
/*
|--------------------------------------------------------------------------
| Avatar file size limit
|--------------------------------------------------------------------------
|
| Update the max avatar size, in KB.
|
*/
'max_avatar_size' => (int) env('MAX_AVATAR_SIZE', 2000),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Caption limit | Caption limit

28
resources/views/settings/home.blade.php
View file

@ -10,11 +10,12 @@
@csrf @csrf
<div class="form-group row"> <div class="form-group row">
<div class="col-sm-3"> <div class="col-sm-3">
<img src="{{Auth::user()->profile->avatarUrl()}}" width="38px" class="rounded-circle img-thumbnail float-right"> <img src="{{Auth::user()->profile->avatarUrl()}}" width="38px" height="38px" class="rounded-circle float-right">
</div> </div>
<div class="col-sm-9"> <div class="col-sm-9">
<p class="lead font-weight-bold mb-0">{{Auth::user()->username}}</p> <p class="lead font-weight-bold mb-0">{{Auth::user()->username}}</p>
<p><a href="#" class="font-weight-bold change-profile-photo">Change Profile Photo</a></p> <p class="mb-0"><a href="#" class="font-weight-bold change-profile-photo">Change Profile Photo</a></p>
<p><span class="small font-weight-bold">Max avatar size: <span id="maxAvatarSize"></span></span></p>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
@ -60,6 +61,25 @@
</p> </p>
</div> </div>
</div> </div>
<div class="pt-5">
<p class="font-weight-bold text-muted text-center">Storage Usage</p>
</div>
<div class="form-group row">
<label for="email" class="col-sm-3 col-form-label font-weight-bold text-right">Storage Used</label>
<div class="col-sm-9">
<div class="progress mt-2">
<div class="progress-bar" role="progressbar" style="width: {{$storage['percentUsed']}}%" aria-valuenow="{{$storage['percentUsed']}}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<div class="help-text">
<span class="small text-muted">
{{$storage['percentUsed']}}% used
</span>
<span class="small text-muted float-right">
{{$storage['usedPretty']}} / {{$storage['limitPretty']}}
</span>
</div>
</div>
</div>
<hr> <hr>
<div class="form-group row"> <div class="form-group row">
<div class="col-12 text-right"> <div class="col-12 text-right">
@ -96,6 +116,8 @@
$('.bio-counter').html(val); $('.bio-counter').html(val);
}); });
$('#maxAvatarSize').text(filesize({{config('pixelfed.max_avatar_size') * 1024}}, {round: 0}));
$(document).on('click', '.change-profile-photo', function(e) { $(document).on('click', '.change-profile-photo', function(e) {
e.preventDefault(); e.preventDefault();
swal({ swal({
@ -103,7 +125,7 @@
content: { content: {
element: 'input', element: 'input',
attributes: { attributes: {
placeholder: 'Upload your photo', placeholder: 'Upload your photo.',
type: 'file', type: 'file',
name: 'photoUpload', name: 'photoUpload',
id: 'photoUploadInput' id: 'photoUploadInput'