merges 5.5 and master into next-back

src/User/Command/DeleteAvatarHandler.php

@@ -15,8 +15,9 @@ use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Event\AvatarDeleting;
 use Flarum\User\UserRepository;
+use Flarum\Core\AvatarUploader;
+use Flarum\Event\AvatarWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
-use League\Flysystem\FilesystemInterface;
 
 class DeleteAvatarHandler
 {
@@ -29,20 +30,20 @@ class DeleteAvatarHandler
     protected $users;
 
     /**
-     * @var FilesystemInterface
+     * @var AvatarUploader
      */
-    protected $uploadDir;
+    protected $uploader;
 
     /**
      * @param Dispatcher $events
      * @param UserRepository $users
-     * @param FilesystemInterface $uploadDir
+     * @param AvatarUploader $uploader
      */
-    public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir)
+    public function __construct(Dispatcher $events, UserRepository $users, AvatarUploader $uploader)
     {
         $this->events = $events;
         $this->users = $users;
-        $this->uploadDir = $uploadDir;
+        $this->uploader = $uploader;
     }
 
     /**
@@ -60,8 +61,7 @@ class DeleteAvatarHandler
             $this->assertCan($actor, 'edit', $user);
         }
 
-        $avatarPath = $user->avatar_path;
-        $user->changeAvatarPath(null);
+        $this->uploader->remove($user);
 
         $this->events->fire(
             new AvatarDeleting($user, $actor)
@@ -69,10 +69,6 @@ class DeleteAvatarHandler
 
         $user->save();
 
-        if ($this->uploadDir->has($avatarPath)) {
-            $this->uploadDir->delete($avatarPath);
-        }
-
         $this->dispatchEventsFor($user, $actor);
 
         return $user;

src/User/Command/EditUserHandler.php

@@ -11,6 +11,8 @@
 
 namespace Flarum\User\Command;
 
+use Exception;
+use Flarum\Core\AvatarUploader;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Event\GroupsChanged;
@@ -19,6 +21,9 @@ use Flarum\User\User;
 use Flarum\User\UserRepository;
 use Flarum\User\UserValidator;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\Validation\Factory;
+use Illuminate\Validation\ValidationException;
+use Intervention\Image\ImageManager;
 
 class EditUserHandler
 {
@@ -35,16 +40,30 @@ class EditUserHandler
      */
     protected $validator;
 
+    /**
+     * @var AvatarUploader
+     */
+    protected $avatarUploader;
+
+    /**
+     * @var Factory
+     */
+    private $validatorFactory;
+
     /**
      * @param Dispatcher $events
      * @param \Flarum\User\UserRepository $users
      * @param UserValidator $validator
+     * @param AvatarUploader $avatarUploader
+     * @param Factory $validatorFactory
      */
-    public function __construct(Dispatcher $events, UserRepository $users, UserValidator $validator)
+    public function __construct(Dispatcher $events, UserRepository $users, UserValidator $validator, AvatarUploader $avatarUploader, Factory $validatorFactory)
     {
         $this->events = $events;
         $this->users = $users;
         $this->validator = $validator;
+        $this->avatarUploader = $avatarUploader;
+        $this->validatorFactory = $validatorFactory;
     }
 
     /**
@@ -95,14 +114,6 @@ class EditUserHandler
             $validate['password'] = $attributes['password'];
         }
 
-        if (isset($attributes['bio'])) {
-            if (! $isSelf) {
-                $this->assertPermission($canEdit);
-            }
-
-            $user->changeBio($attributes['bio']);
-        }
-
         if (! empty($attributes['readTime'])) {
             $this->assertPermission($isSelf);
             $user->markAllAsRead();
@@ -135,6 +146,24 @@ class EditUserHandler
             });
         }
 
+        if ($avatarUrl = array_get($attributes, 'avatarUrl')) {
+            $validation = $this->validatorFactory->make(compact('avatarUrl'), ['avatarUrl' => 'url']);
+
+            if ($validation->fails()) {
+                throw new ValidationException($validation);
+            }
+
+            try {
+                $image = (new ImageManager)->make($avatarUrl);
+
+                $this->avatarUploader->upload($user, $image);
+            } catch (Exception $e) {
+                //
+            }
+        } elseif (array_key_exists('avatarUrl', $attributes)) {
+            $this->avatarUploader->remove($user);
+        }
+
         $this->events->fire(
             new Saving($user, $actor, $data)
         );

src/User/Command/RegisterUserHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\User\Command;
 
 use Exception;
-use Flarum\Foundation\Application;
+use Flarum\Core\AvatarUploader;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AssertPermissionTrait;
@@ -23,13 +23,8 @@ use Flarum\User\User;
 use Flarum\User\UserValidator;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Validation\Factory;
-use Illuminate\Contracts\Validation\ValidationException;
-use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
 use Intervention\Image\ImageManager;
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\Filesystem;
-use League\Flysystem\FilesystemInterface;
-use League\Flysystem\MountManager;
 
 class RegisterUserHandler
 {
@@ -47,14 +42,9 @@ class RegisterUserHandler
     protected $validator;
 
     /**
-     * @var Application
+     * @var AvatarUploader
      */
-    protected $app;
-
-    /**
-     * @var FilesystemInterface
-     */
-    protected $uploadDir;
+    protected $avatarUploader;
 
     /**
      * @var Factory
@@ -65,17 +55,15 @@ class RegisterUserHandler
      * @param Dispatcher $events
      * @param SettingsRepositoryInterface $settings
      * @param UserValidator $validator
-     * @param Application $app
-     * @param FilesystemInterface $uploadDir
+     * @param AvatarUploader $avatarUploader
      * @param Factory $validatorFactory
      */
-    public function __construct(Dispatcher $events, SettingsRepositoryInterface $settings, UserValidator $validator, Application $app, FilesystemInterface $uploadDir, Factory $validatorFactory)
+    public function __construct(Dispatcher $events, SettingsRepositoryInterface $settings, UserValidator $validator, AvatarUploader $avatarUploader, Factory $validatorFactory)
     {
         $this->events = $events;
         $this->settings = $settings;
         $this->validator = $validator;
-        $this->app = $app;
-        $this->uploadDir = $uploadDir;
+        $this->avatarUploader = $avatarUploader;
         $this->validatorFactory = $validatorFactory;
     }
 
@@ -144,7 +132,9 @@ class RegisterUserHandler
             }
 
             try {
-                $this->saveAvatarFromUrl($user, $avatarUrl);
+                $image = (new ImageManager)->make($avatarUrl);
+
+                $this->avatarUploader->upload($user, $image);
             } catch (Exception $e) {
                 //
             }
@@ -160,23 +150,4 @@ class RegisterUserHandler
 
         return $user;
     }
-
-    private function saveAvatarFromUrl(User $user, $url)
-    {
-        $tmpFile = tempnam($this->app->storagePath().'/tmp', 'avatar');
-
-        $manager = new ImageManager;
-        $manager->make($url)->fit(100, 100)->save($tmpFile);
-
-        $mount = new MountManager([
-            'source' => new Filesystem(new Local(pathinfo($tmpFile, PATHINFO_DIRNAME))),
-            'target' => $this->uploadDir,
-        ]);
-
-        $uploadName = Str::lower(Str::quickRandom()).'.png';
-
-        $user->changeAvatarPath($uploadName);
-
-        $mount->move('source://'.pathinfo($tmpFile, PATHINFO_BASENAME), "target://$uploadName");
-    }
 }

src/User/Command/RequestPasswordResetHandler.php

@@ -18,9 +18,9 @@ use Flarum\User\UserRepository;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\Validation\Factory;
-use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Mail\Message;
+use Illuminate\Validation\ValidationException;
 
 class RequestPasswordResetHandler
 {
@@ -55,7 +55,7 @@ class RequestPasswordResetHandler
     protected $validatorFactory;
 
     /**
-     * @param \Flarum\User\UserRepository $users
+     * @param UserRepository $users
      * @param SettingsRepositoryInterface $settings
      * @param Mailer $mailer
      * @param UrlGenerator $url
@@ -106,7 +106,7 @@ class RequestPasswordResetHandler
         $token->save();
 
         $data = [
-            '{username}' => $user->username,
+            '{username}' => $user->display_name,
             '{url}' => $this->url->to('forum')->route('resetPassword', ['token' => $token->id]),
             '{forum}' => $this->settings->get('forum_title'),
         ];

src/User/Command/UploadAvatarHandler.php

@@ -12,6 +12,7 @@
 namespace Flarum\User\Command;
 
 use Exception;
+use Flarum\Core\AvatarUploader;
 use Flarum\Foundation\Application;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
@@ -19,12 +20,7 @@ use Flarum\User\AvatarValidator;
 use Flarum\User\Event\AvatarSaving;
 use Flarum\User\UserRepository;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Support\Str;
 use Intervention\Image\ImageManager;
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\Filesystem;
-use League\Flysystem\FilesystemInterface;
-use League\Flysystem\MountManager;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class UploadAvatarHandler
@@ -37,16 +33,16 @@ class UploadAvatarHandler
      */
     protected $users;
 
-    /**
-     * @var FilesystemInterface
-     */
-    protected $uploadDir;
-
     /**
      * @var Application
      */
     protected $app;
 
+    /**
+     * @var AvatarUploader
+     */
+    protected $uploader;
+
     /**
      * @var \Flarum\User\AvatarValidator
      */
@@ -55,16 +51,16 @@ class UploadAvatarHandler
     /**
      * @param Dispatcher $events
      * @param UserRepository $users
-     * @param FilesystemInterface $uploadDir
      * @param Application $app
-     * @param \Flarum\User\AvatarValidator $validator
+     * @param AvatarUploader $uploader
+     * @param AvatarValidator $validator
      */
-    public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir, Application $app, AvatarValidator $validator)
+    public function __construct(Dispatcher $events, UserRepository $users, Application $app, AvatarUploader $uploader, AvatarValidator $validator)
     {
         $this->events = $events;
         $this->users = $users;
-        $this->uploadDir = $uploadDir;
         $this->app = $app;
+        $this->uploader = $uploader;
         $this->validator = $validator;
     }
 
@@ -83,60 +79,36 @@ class UploadAvatarHandler
             $this->assertCan($actor, 'edit', $user);
         }
 
+        $file = $command->file;
+
         $tmpFile = tempnam($this->app->storagePath().'/tmp', 'avatar');
-        $command->file->moveTo($tmpFile);
+        $file->moveTo($tmpFile);
 
         try {
             $file = new UploadedFile(
                 $tmpFile,
-                $command->file->getClientFilename(),
-                $command->file->getClientMediaType(),
-                $command->file->getSize(),
-                $command->file->getError(),
+                $file->getClientFilename(),
+                $file->getClientMediaType(),
+                $file->getSize(),
+                $file->getError(),
                 true
             );
 
             $this->validator->assertValid(['avatar' => $file]);
 
-            $manager = new ImageManager;
-
-            // Explicitly tell Intervention to encode the image as PNG (instead of having to guess from the extension)
-            // Read exif data to orientate avatar only if EXIF extension is enabled
-            if (extension_loaded('exif')) {
-                $encodedImage = $manager->make($tmpFile)->orientate()->fit(100, 100)->encode('png', 100);
-            } else {
-                $encodedImage = $manager->make($tmpFile)->fit(100, 100)->encode('png', 100);
-            }
-            file_put_contents($tmpFile, $encodedImage);
+            $image = (new ImageManager)->make($tmpFile);
 
             $this->events->fire(
                 new AvatarSaving($user, $actor, $tmpFile)
             );
 
-            $mount = new MountManager([
-                'source' => new Filesystem(new Local(pathinfo($tmpFile, PATHINFO_DIRNAME))),
-                'target' => $this->uploadDir,
-            ]);
-
-            if ($user->avatar_path && $mount->has($file = "target://$user->avatar_path")) {
-                $mount->delete($file);
-            }
-
-            $uploadName = Str::lower(Str::quickRandom()).'.png';
-
-            $user->changeAvatarPath($uploadName);
-
-            $mount->move('source://'.pathinfo($tmpFile, PATHINFO_BASENAME), "target://$uploadName");
+            $this->uploader->upload($user, $image);
 
             $user->save();
-
-            $this->dispatchEventsFor($user, $actor);
-
-            return $user;
-        } catch (Exception $e) {
+        } finally {
             @unlink($tmpFile);
-
-            throw $e;
         }
+
+        return $user;
     }
 }

src/User/EmailConfirmationMailer.php

@@ -127,7 +127,7 @@ class EmailConfirmationMailer
         $token = $this->generateToken($user, $email);
 
         return [
-            '{username}' => $user->username,
+            '{username}' => $user->display_name,
             '{url}' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->id]),
             '{forum}' => $this->settings->get('forum_title')
         ];

src/User/Event/AvatarSaving.php

@@ -12,6 +12,7 @@
 namespace Flarum\User\Event;
 
 use Flarum\User\User;
+use Intervention\Image\Image;
 
 class AvatarSaving
 {
@@ -30,21 +31,21 @@ class AvatarSaving
     public $actor;
 
     /**
-     * The path to the avatar that will be saved.
+     * The image that will be saved.
      *
-     * @var string
+     * @var Image
      */
-    public $path;
+    public $image;
 
     /**
      * @param User $user The user whose avatar will be saved.
      * @param User $actor The user performing the action.
-     * @param string $path The path to the avatar that will be saved.
+     * @param Image $image The image that will be saved.
      */
-    public function __construct(User $user, User $actor, $path)
+    public function __construct(User $user, User $actor, Image $image)
     {
         $this->user = $user;
         $this->actor = $actor;
-        $this->path = $path;
+        $this->image = $image;
     }
 }

src/User/Search/Gambit/EmailGambit.php

@@ -42,7 +42,7 @@ class EmailGambit extends AbstractRegexGambit
      */
     public function apply(AbstractSearch $search, $bit)
     {
-        if (! $search->getActor()->isAdmin()) {
+        if (! $search->getActor()->hasPermission('user.edit')) {
             return false;
         }
 
@@ -60,8 +60,6 @@ class EmailGambit extends AbstractRegexGambit
 
         $email = trim($matches[1], '"');
 
-        $user = $this->users->findByEmail($email);
-
-        $search->getQuery()->where('id', $negate ? '!=' : '=', $user->id);
+        $search->getQuery()->where('email', $negate ? '!=' : '=', $email);
     }
 }

src/User/User.php

@@ -15,16 +15,26 @@ use DomainException;
 use Flarum\Database\AbstractModel;
 use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Event\ConfigureUserPreferences;
+use Flarum\Event\GetDisplayName;
+use Flarum\Event\PostWasDeleted;
 use Flarum\Event\PrepareUserGroups;
+use Flarum\Event\UserAvatarWasChanged;
+use Flarum\Event\UserEmailChangeWasRequested;
+use Flarum\Event\UserEmailWasChanged;
+use Flarum\Event\UserPasswordWasChanged;
+use Flarum\Event\UserWasActivated;
+use Flarum\Event\UserWasDeleted;
+use Flarum\Event\UserWasRegistered;
+use Flarum\Event\UserWasRenamed;
 use Flarum\Foundation\Application;
 use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Group\Group;
 use Flarum\Group\Permission;
+use Flarum\Http\UrlGenerator;
 use Flarum\Notification\Notification;
 use Flarum\Post\Event\Deleted as PostDeleted;
 use Flarum\User\Event\Activated;
 use Flarum\User\Event\AvatarChanged;
-use Flarum\User\Event\BioChanged;
 use Flarum\User\Event\CheckingPassword;
 use Flarum\User\Event\Deleted;
 use Flarum\User\Event\EmailChanged;
@@ -42,7 +52,6 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
  * @property bool $is_activated
  * @property string $password
  * @property string $locale
- * @property string $bio
  * @property string|null $avatar_path
  * @property string $avatar_url
  * @property array $preferences
@@ -263,21 +272,6 @@ class User extends AbstractModel
         $this->attributes['password'] = $value ? static::$hasher->make($value) : '';
     }
 
-    /**
-     * Change the user's bio.
-     *
-     * @param string $bio
-     * @return $this
-     */
-    public function changeBio($bio)
-    {
-        $this->bio = $bio;
-
-        $this->raise(new BioChanged($this));
-
-        return $this;
-    }
-
     /**
      * Mark all discussions as read.
      *
@@ -325,9 +319,23 @@ class User extends AbstractModel
      */
     public function getAvatarUrlAttribute()
     {
-        $urlGenerator = app('Flarum\Http\UrlGenerator');
+        if ($this->avatar_path) {
+            if (strpos($this->avatar_path, '://') !== false) {
+                return $this->avatar_path;
+            }
 
-        return $this->avatar_path ? $urlGenerator->to('forum')->path('assets/avatars/'.$this->avatar_path) : null;
+            return app(UrlGenerator::class)->toPath('assets/avatars/'.$this->avatar_path);
+        }
+    }
+
+    /**
+     * Get the user's display name.
+     *
+     * @return string
+     */
+    public function getDisplayNameAttribute()
+    {
+        return static::$dispatcher->until(new GetDisplayName($this)) ?: $this->username;
     }
 
     /**