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 CreateAvatar job

Browse source
This commit is contained in:
Daniel Supernault 2018-05-31 16:04:15 -06:00
parent ab6079f2fe
commit dde1e19d55
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Jobs/AvatarPipeline/CreateAvatar.php
View file

@ -2,7 +2,7 @@
namespace App\Jobs\AvatarPipeline; namespace App\Jobs\AvatarPipeline;
use App\{Avatar, User}; use App\{Avatar, Profile};
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
@ -18,15 +18,15 @@ class CreateAvatar implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $user; protected $profile;
/** /**
* Create a new job instance. * Create a new job instance.
* *
* @return void * @return void
*/ */
public function __construct(User $user) public function __construct(Profile $profile)
{ {
$this->user = $user; $this->profile = $profile;
} }
/** /**
@ -36,19 +36,19 @@ class CreateAvatar implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
$username = $this->user->profile->username; $profile = $this->profile;
$email = $this->user->email; $username = $profile->username;
$generator = new RingsGenerator(); $generator = new RingsGenerator();
$generator->setBackgroundColor(Color::parseHex('#FFFFFF')); $generator->setBackgroundColor(Color::parseHex('#FFFFFF'));
$identicon = new Identicon(new HashPreprocessor('sha1'), $generator); $identicon = new Identicon(new HashPreprocessor('sha256'), $generator);
$hash = $username . str_random(12) . $email; $hash = $username . str_random(12);
$icon = $identicon->getIcon($hash); $icon = $identicon->getIcon($hash);
try { try {
$prefix = $this->user->profile->id; $prefix = $profile->id;
$padded = str_pad($prefix, 12, 0, STR_PAD_LEFT); $padded = str_pad($prefix, 12, 0, STR_PAD_LEFT);
$parts = str_split($padded, 3); $parts = str_split($padded, 3);
foreach($parts as $k => $part) { foreach($parts as $k => $part) {
@ -92,7 +92,7 @@ class CreateAvatar implements ShouldQueue
} }
$avatar = new Avatar; $avatar = new Avatar;
$avatar->profile_id = $this->user->profile->id; $avatar->profile_id = $profile->id;
$avatar->media_path = $path; $avatar->media_path = $path;
$avatar->thumb_path = $path; $avatar->thumb_path = $path;
$avatar->change_count = 0; $avatar->change_count = 0;