mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-10 00:34:50 +00:00
Fix remote account post counts
This commit is contained in:
parent
76edd2063d
commit
149cf9dc29
5 changed files with 176 additions and 0 deletions
53
app/Console/Commands/FixRemotePostCount.php
Normal file
53
app/Console/Commands/FixRemotePostCount.php
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use App\Profile;
|
||||||
|
use App\Status;
|
||||||
|
|
||||||
|
class FixRemotePostCount extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The name and signature of the console command.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'fix:rpc';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The console command description.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'Fix remote accounts post count';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new command instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the console command.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
Profile::whereNotNull('domain')->chunk(50, function($profiles) {
|
||||||
|
foreach($profiles as $profile) {
|
||||||
|
$count = Status::whereNull(['in_reply_to_id', 'reblog_of_id'])->whereProfileId($profile->id)->count();
|
||||||
|
$this->info("Checking {$profile->id} {$profile->username} - found {$count} statuses");
|
||||||
|
$profile->status_count = $count;
|
||||||
|
$profile->save();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
58
app/Jobs/ProfilePipeline/DecrementPostCount.php
Normal file
58
app/Jobs/ProfilePipeline/DecrementPostCount.php
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Jobs\ProfilePipeline;
|
||||||
|
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Foundation\Bus\Dispatchable;
|
||||||
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use App\Profile;
|
||||||
|
use App\Status;
|
||||||
|
use App\Services\AccountService;
|
||||||
|
|
||||||
|
class DecrementPostCount implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||||
|
|
||||||
|
public $id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new job instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct($id)
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the job.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
$id = $this->id;
|
||||||
|
|
||||||
|
$profile = Profile::find($id);
|
||||||
|
|
||||||
|
if(!$profile) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($profile->updated_at && $profile->updated_at->lt(now()->subDays(30))) {
|
||||||
|
$profile->status_count = Status::whereProfileId($id)->whereNull(['in_reply_to_id', 'reblog_of_id'])->count();
|
||||||
|
$profile->save();
|
||||||
|
AccountService::del($id);
|
||||||
|
} else {
|
||||||
|
$profile->status_count = $profile->status_count ? $profile->status_count - 1 : 0;
|
||||||
|
$profile->save();
|
||||||
|
AccountService::del($id);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
58
app/Jobs/ProfilePipeline/IncrementPostCount.php
Normal file
58
app/Jobs/ProfilePipeline/IncrementPostCount.php
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Jobs\ProfilePipeline;
|
||||||
|
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Foundation\Bus\Dispatchable;
|
||||||
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use App\Profile;
|
||||||
|
use App\Status;
|
||||||
|
use App\Services\AccountService;
|
||||||
|
|
||||||
|
class IncrementPostCount implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||||
|
|
||||||
|
public $id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new job instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct($id)
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the job.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
$id = $this->id;
|
||||||
|
|
||||||
|
$profile = Profile::find($id);
|
||||||
|
|
||||||
|
if(!$profile) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($profile->updated_at && $profile->updated_at->lt(now()->subDays(30))) {
|
||||||
|
$profile->status_count = Status::whereProfileId($id)->whereNull(['in_reply_to_id', 'reblog_of_id'])->count();
|
||||||
|
$profile->save();
|
||||||
|
AccountService::del($id);
|
||||||
|
} else {
|
||||||
|
$profile->status_count = $profile->status_count + 1;
|
||||||
|
$profile->save();
|
||||||
|
AccountService::del($id);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
|
@ -38,6 +38,8 @@ use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
|
||||||
use App\Util\Media\License;
|
use App\Util\Media\License;
|
||||||
use App\Models\Poll;
|
use App\Models\Poll;
|
||||||
use Illuminate\Contracts\Cache\LockTimeoutException;
|
use Illuminate\Contracts\Cache\LockTimeoutException;
|
||||||
|
use App\Jobs\ProfilePipeline\IncrementPostCount;
|
||||||
|
use App\Jobs\ProfilePipeline\DecrementPostCount;
|
||||||
|
|
||||||
class Helpers {
|
class Helpers {
|
||||||
|
|
||||||
|
@ -501,6 +503,8 @@ class Helpers {
|
||||||
NetworkTimelineService::add($status->id);
|
NetworkTimelineService::add($status->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IncrementPostCount::dispatch($pid)->onQueue('low');
|
||||||
|
|
||||||
return $status;
|
return $status;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,6 +38,8 @@ use App\Services\PollService;
|
||||||
use App\Services\FollowerService;
|
use App\Services\FollowerService;
|
||||||
use App\Services\StatusService;
|
use App\Services\StatusService;
|
||||||
use App\Models\Conversation;
|
use App\Models\Conversation;
|
||||||
|
use App\Jobs\ProfilePipeline\IncrementPostCount;
|
||||||
|
use App\Jobs\ProfilePipeline\DecrementPostCount;
|
||||||
|
|
||||||
class Inbox
|
class Inbox
|
||||||
{
|
{
|
||||||
|
@ -655,6 +657,7 @@ class Inbox
|
||||||
$status->likes()->delete();
|
$status->likes()->delete();
|
||||||
$status->shares()->delete();
|
$status->shares()->delete();
|
||||||
$status->delete();
|
$status->delete();
|
||||||
|
DecrementPostCount::dispatch($profile->id)->onQueue('low');
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue