mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-29 09:43:16 +00:00
Update AccountService, cache object and observe changes
This commit is contained in:
parent
61c71e8905
commit
b299da9311
4 changed files with 89 additions and 11 deletions
|
@ -5,6 +5,7 @@ namespace App\Observers;
|
||||||
use App\Avatar;
|
use App\Avatar;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
use App\Services\AccountService;
|
||||||
|
|
||||||
class AvatarObserver
|
class AvatarObserver
|
||||||
{
|
{
|
||||||
|
@ -27,7 +28,7 @@ class AvatarObserver
|
||||||
*/
|
*/
|
||||||
public function updated(Avatar $avatar)
|
public function updated(Avatar $avatar)
|
||||||
{
|
{
|
||||||
//
|
AccountService::del($avatar->profile_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -64,6 +65,7 @@ class AvatarObserver
|
||||||
$disk->delete($avatar->media_path);
|
$disk->delete($avatar->media_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
AccountService::del($avatar->profile_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
64
app/Observers/ProfileObserver.php
Normal file
64
app/Observers/ProfileObserver.php
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Observers;
|
||||||
|
|
||||||
|
use App\Profile;
|
||||||
|
use App\Services\AccountService;
|
||||||
|
|
||||||
|
class ProfileObserver
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Handle the Profile "created" event.
|
||||||
|
*
|
||||||
|
* @param \App\Profile $profile
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function created(Profile $profile)
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle the Profile "updated" event.
|
||||||
|
*
|
||||||
|
* @param \App\Profile $profile
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function updated(Profile $profile)
|
||||||
|
{
|
||||||
|
AccountService::del($profile->id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle the Profile "deleted" event.
|
||||||
|
*
|
||||||
|
* @param \App\Profile $profile
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function deleted(Profile $profile)
|
||||||
|
{
|
||||||
|
AccountService::del($profile->id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle the Profile "restored" event.
|
||||||
|
*
|
||||||
|
* @param \App\Profile $profile
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function restored(Profile $profile)
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle the Profile "force deleted" event.
|
||||||
|
*
|
||||||
|
* @param \App\Profile $profile
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function forceDeleted(Profile $profile)
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,6 +6,7 @@ use App\Observers\{
|
||||||
AvatarObserver,
|
AvatarObserver,
|
||||||
NotificationObserver,
|
NotificationObserver,
|
||||||
ModLogObserver,
|
ModLogObserver,
|
||||||
|
ProfileObserver,
|
||||||
StatusHashtagObserver,
|
StatusHashtagObserver,
|
||||||
UserObserver,
|
UserObserver,
|
||||||
UserFilterObserver,
|
UserFilterObserver,
|
||||||
|
@ -14,6 +15,7 @@ use App\{
|
||||||
Avatar,
|
Avatar,
|
||||||
Notification,
|
Notification,
|
||||||
ModLog,
|
ModLog,
|
||||||
|
Profile,
|
||||||
StatusHashtag,
|
StatusHashtag,
|
||||||
User,
|
User,
|
||||||
UserFilter
|
UserFilter
|
||||||
|
@ -41,6 +43,7 @@ class AppServiceProvider extends ServiceProvider
|
||||||
Avatar::observe(AvatarObserver::class);
|
Avatar::observe(AvatarObserver::class);
|
||||||
Notification::observe(NotificationObserver::class);
|
Notification::observe(NotificationObserver::class);
|
||||||
ModLog::observe(ModLogObserver::class);
|
ModLog::observe(ModLogObserver::class);
|
||||||
|
Profile::observe(ProfileObserver::class);
|
||||||
StatusHashtag::observe(StatusHashtagObserver::class);
|
StatusHashtag::observe(StatusHashtagObserver::class);
|
||||||
User::observe(UserObserver::class);
|
User::observe(UserObserver::class);
|
||||||
UserFilter::observe(UserFilterObserver::class);
|
UserFilter::observe(UserFilterObserver::class);
|
||||||
|
|
|
@ -14,16 +14,25 @@ class AccountService {
|
||||||
|
|
||||||
public static function get($id)
|
public static function get($id)
|
||||||
{
|
{
|
||||||
// $key = self::CACHE_KEY . ':' . $id;
|
if($id > PHP_INT_MAX || $id < 1) {
|
||||||
// $ttl = now()->addSeconds(10);
|
return [];
|
||||||
// return Cache::remember($key, $ttl, function() use($id) {
|
}
|
||||||
// });
|
|
||||||
|
|
||||||
|
$key = self::CACHE_KEY . $id;
|
||||||
|
$ttl = now()->addMinutes(15);
|
||||||
|
|
||||||
|
return Cache::remember($key, $ttl, function() use($id) {
|
||||||
$fractal = new Fractal\Manager();
|
$fractal = new Fractal\Manager();
|
||||||
$fractal->setSerializer(new ArraySerializer());
|
$fractal->setSerializer(new ArraySerializer());
|
||||||
$profile = Profile::whereNull('status')->findOrFail($id);
|
$profile = Profile::whereNull('status')->findOrFail($id);
|
||||||
$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
|
$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
|
||||||
return $fractal->createData($resource)->toArray();
|
return $fractal->createData($resource)->toArray();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function del($id)
|
||||||
|
{
|
||||||
|
return Cache::forget(self::CACHE_KEY . $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue