Update Inbox handler, fix missing object_url and uri fields for direct statuses

This commit is contained in:
Daniel Supernault 2023-12-08 01:13:04 -07:00
parent dec061f5ae
commit a0157fce0c
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
2 changed files with 44 additions and 4 deletions

View file

@ -282,8 +282,8 @@ class Inbox
} }
if($actor->followers_count == 0) { if($actor->followers_count == 0) {
if(config('federation.activitypub.ingest.store_notes_without_followers')) { if(config('federation.activitypub.ingest.store_notes_without_followers')) {
} else if(FollowerService::followerCount($actor->id, true) == 0) { } else if(FollowerService::followerCount($actor->id, true) == 0) {
return; return;
} }
} }
@ -401,6 +401,8 @@ class Inbox
$status->visibility = 'direct'; $status->visibility = 'direct';
$status->scope = 'direct'; $status->scope = 'direct';
$status->url = $activity['id']; $status->url = $activity['id'];
$status->uri = $activity['id'];
$status->object_url = $activity['id'];
$status->in_reply_to_profile_id = $profile->id; $status->in_reply_to_profile_id = $profile->id;
$status->save(); $status->save();
@ -703,12 +705,17 @@ class Inbox
return; return;
} }
$status = Status::whereProfileId($profile->id) $status = Status::whereProfileId($profile->id)
->whereObjectUrl($id) ->where(function($q) use($id) {
return $q->where('object_url', $id)
->orWhere('url', $id);
})
->first(); ->first();
if(!$status) { if(!$status) {
return; return;
} }
FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed'); if($status->scope && $status->scope != 'direct') {
FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
}
RemoteStatusDelete::dispatch($status)->onQueue('high'); RemoteStatusDelete::dispatch($status)->onQueue('high');
return; return;
break; break;

View file

@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use App\Status;
use Illuminate\Database\UniqueConstraintViolationException;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
foreach(Status::whereScope('direct')->whereNotNull('url')->whereNull('object_url')->lazyById(50, 'id') as $status) {
try {
$status->object_url = $status->url;
$status->uri = $status->url;
$status->save();
} catch (Exception | UniqueConstraintViolationException $e) {
continue;
}
}
}
/**
* Reverse the migrations.
*/
public function down(): void
{
}
};