Merge pull request #9 from SychO9/size_limit_setting

Add maximum size setting

README.md

@@ -2,6 +2,7 @@
 ![latest version](https://img.shields.io/github/release/SychO9/flarum-profile-cover.svg?style=flat-square)
 ![flarum version](https://img.shields.io/badge/flarum-%5E0.1.0--beta.10-%23e7742e?style=flat-square)
 ![mit license](https://img.shields.io/badge/license-MIT-green.svg?style=flat-square&color=green)
+![downloads](https://img.shields.io/packagist/dt/sycho/flarum-profile-cover?color=%23f28d1a&style=flat-square)
 
 A [Flarum](http://flarum.org/) extension. Adds the ability to upload a cover image to a user profile.
 

composer.json

@@ -11,7 +11,8 @@
     ],
     "type": "flarum-extension",
     "require": {
-        "flarum/core": ">=0.1.0-beta.10 <0.1.0-beta.12"
+        "flarum/core": ">=0.1.0-beta.10 <0.1.0-beta.12",
+        "fof/extend": ">=0.2.0"
     },
     "autoload": {
         "psr-4": {

extend.php

@@ -14,14 +14,19 @@
         ->css(__DIR__.'/resources/less/forum.less'),
 
     (new Extend\Frontend('admin'))
-        ->js(__DIR__.'/js/dist/admin.js'),
+        ->js(__DIR__.'/js/dist/admin.js')
+        ->css(__DIR__.'/resources/less/admin.less'),
 
     (new Extend\Routes('api'))
         ->post('/users/{id}/cover', 'users.cover.upload', Controller\UploadCoverController::class)
         ->delete('/users/{id}/cover', 'users.cover.delete', Controller\DeleteCoverController::class),
 
     new Extend\Locales(__DIR__.'/resources/locale'),
 
+    (new FoF\Extend\Extend\ExtensionSettings())
+        ->setPrefix('sycho-profile-cover.')
+        ->addKeys(['max_size']),
+
     function (Factory $view) {
         $view->addNamespace('profile-cover', __DIR__.'/views');
     },

js/src/admin/components/CoverSettingsModal.js

@@ -1,6 +1,12 @@
 import SettingsModal from 'flarum/components/SettingsModal';
+import formatBytes from '../../common/formatBytes';
 
 export default class CoverSettingsModal extends SettingsModal {
+  init() {
+    super.init();
+
+    this.maxSize = this.setting('sycho-profile-cover.max_size', 2048);
+  }
   title() {
     return app.translator.trans('sycho-profile-cover.admin.settings');
   }
@@ -18,6 +24,14 @@ export default class CoverSettingsModal extends SettingsModal {
         </label>
       </div>,
 
+      <div className="Form-group">
+        <label>{app.translator.trans('sycho-profile-cover.admin.max_size')}</label>
+        <div className="ProfileCover-size-input">
+          <input type="number" className="FormControl" value={this.maxSize()} oninput={m.withAttr('value', this.maxSize)}/>
+          <input className="FormControl" value={formatBytes(this.maxSize() * Math.pow(2, 10))} disabled/>
+        </div>
+      </div>,
+
       <div className="Form-group">
         <div><strong>{app.translator.trans('sycho-profile-cover.admin.cover_size')}:</strong> {this.sizeOf('images')}</div>
         <div><strong>{app.translator.trans('sycho-profile-cover.admin.thumb_size')}:</strong> {this.sizeOf('thumbs')}</div>
@@ -43,20 +57,8 @@ export default class CoverSettingsModal extends SettingsModal {
     const count = parseInt(stats[type + '_count']);
 
     return app.translator.transChoice(`sycho-profile-cover.admin.size_of_${type}`, count, {
-      size: this.formatBytes(parseFloat(size)),
+      size: formatBytes(size),
       count: count
     });
   }
-
-  formatBytes(bytes, decimals = 2) {
-    if (bytes === 0) return '0 Bytes';
-
-    const k = 1024;
-    const dm = decimals < 0 ? 0 : decimals;
-    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
-
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
-  }
 }

js/src/common/formatBytes.js

@@ -0,0 +1,11 @@
+export default function formatBytes(bytes, decimals = 2) {
+  if (bytes === 0) return '0 Bytes';
+
+  const k = 1024;
+  const dm = decimals < 0 ? 0 : decimals;
+  const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+}

js/src/forum/components/CoverEditorModal.js

@@ -6,13 +6,16 @@ import FieldSet from 'flarum/components/FieldSet';
 import ItemList from 'flarum/utils/ItemList';
 import LoadingIndicator from 'flarum/components/LoadingIndicator';
 import listItems from 'flarum/helpers/listItems';
+import formatBytes from '../../common/formatBytes';
 
 export default class CoverEditorModal extends Modal {
   init() {
     super.init();
 
+    this.maxSize = parseFloat(app.data['sycho-profile-cover.max_size'] || 2048);
+
     this.alert = Alert.component({
-      children: app.translator.trans('sycho-profile-cover.forum.notice')
+      children: app.translator.trans('sycho-profile-cover.forum.notice', {size: formatBytes(this.maxSize * Math.pow(2, 10))})
     });
 
     this.loading = false;

resources/less/admin.less

@@ -0,0 +1,10 @@
+.ProfileCover-size-input :first-child {
+  margin-bottom: 1px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.ProfileCover-size-input :last-child {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}

resources/locale/en.yml

@@ -2,14 +2,15 @@ sycho-profile-cover:
   admin:
     settings: ProfileCover Settings
     thumbnails: Create thumbnails
+    max_size: Maximum profile cover image size (in KB)
     cover_size: Images size
     thumb_size: Thumbnails size
     size_of_images: "{size} out of {count} image|{size} out of {count} images"
     size_of_thumbs: "{size} out of {count} thumbnail|{size} out of {count} thumbnails"
   forum:
     cover: Cover
     edit_cover: Edit Cover
-    notice: "Maximum size: 2MB"
+    notice: "Maximum size: {size}"
     added:
       success: Profile cover updated.
       error: Image could not be uploaded.

src/CoverValidator.php

@@ -3,14 +3,47 @@
 namespace SychO\ProfileCover;
 
 use Flarum\Foundation\AbstractValidator;
+use Flarum\Settings\SettingsRepositoryInterface;
+use Illuminate\Validation\Factory;
+use Illuminate\Contracts\Events\Dispatcher;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class CoverValidator extends AbstractValidator
 {
-    protected $rules = [
-        'cover' => [
-            'required',
-            'mimes:jpeg,png,bmp',
-            'max:2048'
-        ]
-    ];
+    /**
+     * @var SettingsRepositoryInterface
+     */
+    protected $config;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(Factory $validator, Dispatcher $events, TranslatorInterface $translator, SettingsRepositoryInterface $config)
+    {
+        parent::__construct($validator, $events, $translator);
+
+        $this->config = $config;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRules()
+    {
+        return [
+            'cover' => [
+                'required',
+                'mimes:jpeg,png,bmp',
+                'max:' . $this->getMaxSize()
+            ]
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function getMaxSize()
+    {
+        return $this->config->get('sycho-profile-cover.max_size') ?? '2048';
+    }
 }