mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 22:41:27 +00:00
Update Profile, fix status count
This commit is contained in:
parent
b74e14c4e5
commit
6dcd472be6
5 changed files with 80 additions and 15 deletions
56
app/Console/Commands/FixStatusCount.php
Normal file
56
app/Console/Commands/FixStatusCount.php
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use App\Profile;
|
||||||
|
|
||||||
|
class FixStatusCount extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The name and signature of the console command.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'fix:statuscount';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The console command description.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'fix profile status count';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new command instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the console command.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
Profile::whereNull('domain')
|
||||||
|
->chunk(50, function($profiles) {
|
||||||
|
foreach($profiles as $profile) {
|
||||||
|
$profile->status_count = $profile->statuses()
|
||||||
|
->getQuery()
|
||||||
|
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
|
||||||
|
->whereNull('in_reply_to_id')
|
||||||
|
->whereNull('reblog_of_id')
|
||||||
|
->count();
|
||||||
|
$profile->save();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
|
@ -210,6 +210,7 @@ class StatusController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
|
Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
|
||||||
|
Cache::forget('profile:status_count:' . $status->profile_id);
|
||||||
if ($status->profile_id == $user->profile->id || $user->is_admin == true) {
|
if ($status->profile_id == $user->profile->id || $user->is_admin == true) {
|
||||||
Cache::forget('profile:status_count:'.$status->profile_id);
|
Cache::forget('profile:status_count:'.$status->profile_id);
|
||||||
StatusDelete::dispatch($status);
|
StatusDelete::dispatch($status);
|
||||||
|
|
|
@ -56,6 +56,17 @@ class StatusDelete implements ShouldQueue
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$status = $this->status;
|
$status = $this->status;
|
||||||
|
$profile = $this->status->profile;
|
||||||
|
|
||||||
|
$count = $profile->statuses()
|
||||||
|
->getQuery()
|
||||||
|
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
|
||||||
|
->whereNull('in_reply_to_id')
|
||||||
|
->whereNull('reblog_of_id')
|
||||||
|
->count();
|
||||||
|
|
||||||
|
$profile->status_count = ($count - 1);
|
||||||
|
$profile->save();
|
||||||
|
|
||||||
if(config('federation.activitypub.enabled') == true) {
|
if(config('federation.activitypub.enabled') == true) {
|
||||||
$this->fanoutDelete($status);
|
$this->fanoutDelete($status);
|
||||||
|
|
|
@ -52,6 +52,17 @@ class StatusEntityLexer implements ShouldQueue
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$profile = $this->status->profile;
|
$profile = $this->status->profile;
|
||||||
|
|
||||||
|
$count = $profile->statuses()
|
||||||
|
->getQuery()
|
||||||
|
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
|
||||||
|
->whereNull('in_reply_to_id')
|
||||||
|
->whereNull('reblog_of_id')
|
||||||
|
->count();
|
||||||
|
|
||||||
|
$profile->status_count = $count;
|
||||||
|
$profile->save();
|
||||||
|
|
||||||
if($profile->no_autolink == false) {
|
if($profile->no_autolink == false) {
|
||||||
$this->parseEntities();
|
$this->parseEntities();
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,21 +91,7 @@ class Profile extends Model
|
||||||
|
|
||||||
public function statusCount()
|
public function statusCount()
|
||||||
{
|
{
|
||||||
return Cache::remember('profile:status_count:'.$this->id, now()->addMonths(1), function() {
|
return $this->status_count;
|
||||||
$count = $this->status_count;
|
|
||||||
if($count) {
|
|
||||||
return $count;
|
|
||||||
}
|
|
||||||
$count = $this->statuses()
|
|
||||||
->getQuery()
|
|
||||||
->whereHas('media')
|
|
||||||
->whereNull('in_reply_to_id')
|
|
||||||
->whereNull('reblog_of_id')
|
|
||||||
->count();
|
|
||||||
$this->status_count = $count;
|
|
||||||
$this->save();
|
|
||||||
return $count;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function following()
|
public function following()
|
||||||
|
|
Loading…
Reference in a new issue